Skip to content

Commit

Permalink
释出
Browse files Browse the repository at this point in the history
  • Loading branch information
@pea3nut
pea3nut committed Mar 31, 2017
1 parent 5c90342 commit 344fd6f
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 58 deletions.
2 changes: 1 addition & 1 deletion build/pxer-utility.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const Babel = require('babel-core');

module.exports.pxerURL ='http://pxer-app.pea3nut.org/';
module.exports.rootPath ='../';
module.exports.pxerVersion ='7.0.1';
module.exports.pxerVersion ='7.0.2';

module.exports.path2URL =function(path){
var url =module.exports.pxerURL;
Expand Down
2 changes: 1 addition & 1 deletion dist/launcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
~function () {
var libURL = /**/"dist/lib.js"; //*/'';
var supportURL = /**/"dist/support.js"; //*/'';
window['PXER_VERSION'] = /**/"7.0.1"; //*/'';
window['PXER_VERSION'] = /**/"7.0.2"; //*/'';

Promise.resolve().then(function () {
var script = document.createElement('script');
Expand Down
47 changes: 26 additions & 21 deletions dist/pxer-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var PxerWorks = function PxerWorks() {
id = _ref5.id,
type = _ref5.type,
date = _ref5.date,
server = _ref5.server,
domain = _ref5.domain,
tagList = _ref5.tagList,
viewCount = _ref5.viewCount,
ratedCount = _ref5.ratedCount,
Expand All @@ -145,8 +145,8 @@ var PxerWorks = function PxerWorks() {
* */
this.date = date;
this.type = type; //[manga|ugoira|illust]
/**作品存放的P站服务器*/
this.server = server; //i\d
/**作品存放的域名*/
this.domain = domain;
/**
* 作品标签列表
* @type {Array}
Expand Down Expand Up @@ -675,7 +675,8 @@ PxerHtmlParser.parseMangaBigHtml = function (_ref9) {
pw = _ref9.pw;

var src = dom.getElementsByTagName('img')[0].src;
pw.server = src.match(/(i\d+)\.pixiv\.net/)[1];
var URLObj = parseURL(src);
pw.domain = URLObj.domain;
pw.date = src.match(PxerHtmlParser.REGEXP['getDate'])[1];
pw.fileFormat = src.match(/\.(jpg|gif|png)$/)[1];
};
Expand All @@ -701,23 +702,27 @@ PxerHtmlParser.parseMediumHtml = function (_ref10) {
})[0].innerHTML;
var exp = /"src":"([^"<>]*?600x600\.zip)"[^<>]*?"frames":(\[.*?\])/mi;
var arr = script.match(exp);
var src = arr[1].replace(/\\\//g, '\/');
var URLObj = parseURL(src);

pw.server = arr[1].replace(/\\\//g, '\/').match(/(i\d+)\.pixiv\.net/)[1];
pw.date = arr[1].replace(/\\\//g, '\/').match(PxerHtmlParser.REGEXP['getDate'])[1];
pw.domain = URLObj.domain;
pw.date = src.match(PxerHtmlParser.REGEXP['getDate'])[1];
pw.frames = JSON.parse(arr[2]);
};

if (task.type === 'illust' && !task.isMultiple) {
var src = dom.querySelector(".ui-modal-close-box img.original-image").getAttribute("data-src");
pw.server = src.match(/(i\d+)\.pixiv\.net/)[1];
pw.date = src.match(PxerHtmlParser.REGEXP['getDate'])[1];
pw.fileFormat = src.match(/\.(jpg|gif|png)$/)[1];
var _src = dom.querySelector(".ui-modal-close-box img.original-image").getAttribute("data-src");
var _URLObj = parseURL(_src);
pw.domain = _URLObj.domain;
pw.date = _src.match(PxerHtmlParser.REGEXP['getDate'])[1];
pw.fileFormat = _src.match(/\.(jpg|gif|png)$/)[1];
}

if (task.type === 'manga' && !task.isMultiple) {
var _src = dom.querySelector("a._work.manga img").src;
pw.server = _src.match(/(i\d+)\.pixiv\.net/)[1];
pw.date = _src.match(PxerHtmlParser.REGEXP['getDate'])[1];
var _src2 = dom.querySelector("a._work.manga img").src;
var _URLObj2 = parseURL(_src2);
pw.domain = _URLObj2.domain;
pw.date = _src2.match(PxerHtmlParser.REGEXP['getDate'])[1];
}
};

Expand Down Expand Up @@ -951,8 +956,8 @@ PxerPrinter.getUgoira = function (works) {
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'max';

var tpl = {
"max": "http://#server#.pixiv.net/img-zip-ugoira/img/#date#/#id#_ugoira1920x1080.zip",
"600p": "http://#server#.pixiv.net/img-zip-ugoira/img/#date#/#id#_ugoira600x600.zip"
"max": "http://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira1920x1080.zip",
"600p": "http://#domain#/img-zip-ugoira/img/#date#/#id#_ugoira600x600.zip"
};

var address = tpl[type];
Expand All @@ -974,9 +979,9 @@ PxerPrinter.getMultiple = function (works) {
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'max';

var tpl = {
"max": "http://#server#.pixiv.net/img-original/img/#date#/#id#_p#index#.#fileFormat#",
"1200p": "http://#server#.pixiv.net/c/1200x1200/img-master/img/#date#/#id#_p#index#_master1200.jpg",
"cover_600p": "http://#server#.pixiv.net/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg"
"max": "http://#domain#/img-original/img/#date#/#id#_p#index#.#fileFormat#",
"1200p": "http://#domain#/c/1200x1200/img-master/img/#date#/#id#_p#index#_master1200.jpg",
"cover_600p": "http://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg"
};

var address = tpl[type];
Expand Down Expand Up @@ -1004,8 +1009,8 @@ PxerPrinter.getWorks = function (works) {
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'max';

var tpl = {
"max": "http://#server#.pixiv.net/img-original/img/#date#/#id#_p0.#fileFormat#",
"600p": "http://#server#.pixiv.net/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg"
"max": "http://#domain#/img-original/img/#date#/#id#_p0.#fileFormat#",
"600p": "http://#domain#/c/600x600/img-master/img/#date#/#id#_p0_master1200.jpg"
};

var address = tpl[type];
Expand Down Expand Up @@ -1181,7 +1186,7 @@ PxerThread.prototype['run'] = function _self() {
var retry = 0;
XHR.addEventListener('timeout', function () {
if (++retry > _this6.config.retry) {
_this6.state = 'timeout';
_this6.state = 'fail';
_this6.dispatch('fail', new PxerFailInfo({
task: _this6.task,
url: URL,
Expand Down
54 changes: 24 additions & 30 deletions dist/view/style.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions dist/view/template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
</div>
<div class="form-group ptp-buttons">
<button class="btn btn-outline-success" @click="useTaskOption">Use it</button>
<button class="btn btn-outline-danger" @click="showPxerFailWindow=false">Cancel</button>
</div>
</div>

Expand Down Expand Up @@ -107,7 +106,7 @@
</tr>
<tr>
<td>下载数量：</td>
<td v-text="pxer.worksNum"></td>
<td v-text="worksNum"></td>
</tr>
<tr>
<td colspan="2" class="text-right"><button
Expand Down
7 changes: 5 additions & 2 deletions dist/view/vm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,11 @@ afterLoad(function () {
var runState = ['page', 'works'];
return runState.indexOf(this.state) !== -1;
},
worksNum: function worksNum() {
return this.pxer.taskOption.limit || this.pxer.worksNum;
},
taskCount: function taskCount() {
return Math.ceil(this.pxer.worksNum / 20) + this.pxer.worksNum;
return Math.ceil(this.worksNum / 20) + +this.worksNum;
},
finishCount: function finishCount() {
if (this.state === 'page') {
Expand All @@ -80,7 +83,7 @@ afterLoad(function () {
} else if (this.state === 'works') {
return this.pxer.taskList.filter(function (pr) {
return pr.completed;
}).length + ~~(this.pxer.worksNum / 20) + this.pxer.failList.length;
}).length + ~~(this.worksNum / 20) + this.pxer.failList.length;
} else {
return -1;
};
Expand Down
2 changes: 1 addition & 1 deletion src/launcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
~function(){
var libURL =/**/"src/app/lib.js";//*/'';
var supportURL =/**/"src/app/support.js";//*/'';
window['PXER_VERSION'] =/**/"7.0.1";//*/'';
window['PXER_VERSION'] =/**/"7.0.2";//*/'';

Promise.resolve().then(function(){
var script = document.createElement('script');
Expand Down

0 comments on commit 344fd6f

Please sign in to comment.