Skip to content

Commit 6cd6dd9

Browse files
xreamxream
committed
chore: 同步正式到 beta; 格式化代码
1 parent 2d69abf commit 6cd6dd9

4 files changed

Lines changed: 126 additions & 114 deletions

File tree

‎Rewrite-Parser.beta.js‎

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,13 @@ if (binaryInfo != null && binaryInfo.length > 0) {
281281
}
282282

283283
!(async () => {
284-
285284
if (evUrlori) {
286285
evUrlori = (await $.http.get(evUrlori)).body
287286
}
288287
if (evUrlmodi) {
289288
evUrlmodi = (await $.http.get(evUrlmodi)).body
290289
}
291-
290+
292291
if (req == 'http://local.text') {
293292
body = localText
294293
} else {
@@ -558,27 +557,27 @@ if (binaryInfo != null && binaryInfo.length > 0) {
558557
tilescolor = jstype == 'generic' && /icon-color=/.test(x) ? x.split('icon-color=')[1].split('&')[0] : ''
559558
if (nCron != null && jstype != 'cron') {
560559
for (let i = 0; i < nCron.length; i++) {
561-
let elem = nCron[i].trim()
562-
if (x.indexOf(elem) != -1) {
563-
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
564-
jsBox.push({
565-
mark,
566-
noteK,
567-
jsname,
568-
img,
569-
jstype:'cron',
570-
jsptn:'',
571-
jsurl,
572-
updatetime,
573-
wakesys: '1',
574-
timeout:'120',
575-
ori: x,
576-
num: y,
577-
})
578-
}
579-
} //for
560+
let elem = nCron[i].trim()
561+
if (x.indexOf(elem) != -1) {
562+
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
563+
jsBox.push({
564+
mark,
565+
noteK,
566+
jsname,
567+
img,
568+
jstype: 'cron',
569+
jsptn: '',
570+
jsurl,
571+
updatetime,
572+
wakesys: '1',
573+
timeout: '120',
574+
ori: x,
575+
num: y,
576+
})
577+
}
578+
} //for
580579
}
581-
580+
582581
jsBox.push({
583582
mark,
584583
noteK,
@@ -621,28 +620,28 @@ if (binaryInfo != null && binaryInfo.length > 0) {
621620
jsurl = toJsc(jsurl, jscStatus, jsc2Status, jsfrom)
622621
rebody = /\sscript[^\s]*(-body|-analyze)/.test(x) ? 'true' : ''
623622
size = rebody == 'true' ? '-1' : ''
624-
623+
625624
if (nCron != null) {
626625
for (let i = 0; i < nCron.length; i++) {
627-
let elem = nCron[i].trim()
628-
if (x.indexOf(elem) != -1) {
629-
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
630-
jsBox.push({
631-
mark,
632-
noteK,
633-
jsname,
634-
jstype:'cron',
635-
jsptn:'',
636-
jsurl,
637-
wakesys: '1',
638-
timeout: '120',
639-
ori: x,
640-
num: y,
641-
})
642-
}
643-
} //for
626+
let elem = nCron[i].trim()
627+
if (x.indexOf(elem) != -1) {
628+
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
629+
jsBox.push({
630+
mark,
631+
noteK,
632+
jsname,
633+
jstype: 'cron',
634+
jsptn: '',
635+
jsurl,
636+
wakesys: '1',
637+
timeout: '120',
638+
ori: x,
639+
num: y,
640+
})
641+
}
642+
} //for
644643
}
645-
644+
646645
jsBox.push({
647646
mark,
648647
noteK,
@@ -689,7 +688,7 @@ if (binaryInfo != null && binaryInfo.length > 0) {
689688
jsname,
690689
img,
691690
jstype: 'cron',
692-
jsptn:'',
691+
jsptn: '',
693692
cronexp,
694693
jsurl,
695694
wakesys: '1',
@@ -749,7 +748,9 @@ if (binaryInfo != null && binaryInfo.length > 0) {
749748

750749
jsBox = jsBox.reduce((curr, next) => {
751750
/*判断对象中是否已经有该属性 没有的话 push 到 curr数组*/
752-
obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] ? '' : (obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] = curr.push(next))
751+
obj[next.jstype + next.jsptn + next.jsurl + next.jsarg]
752+
? ''
753+
: (obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] = curr.push(next))
753754
return curr
754755
}, [])
755756

@@ -800,10 +801,11 @@ if (binaryInfo != null && binaryInfo.length > 0) {
800801

801802
for (let key in modInfoObj) {
802803
if (modInfoObj[key]) {
803-
let value = modInfoObj[key], delsystem = false
804-
if (key == 'system' && isSurgeiOS ) {
804+
let value = modInfoObj[key],
805+
delsystem = false
806+
if (key == 'system' && isSurgeiOS) {
805807
value = value.toLowerCase()
806-
value = value.includes('mac') ? (value.includes('ios') ? (delsystem = true, 'mac') : 'mac') : 'ios'
808+
value = value.includes('mac') ? (value.includes('ios') ? ((delsystem = true), 'mac') : 'mac') : 'ios'
807809
} else if (isLooniOS && key == 'category') {
808810
key = 'keyword'
809811
} else if (!isLooniOS && key == 'keyword') {
@@ -1026,7 +1028,11 @@ if (binaryInfo != null && binaryInfo.length > 0) {
10261028
mark = mockBox[i].mark ? mockBox[i].mark : ''
10271029
mockptn = mockBox[i].mockptn
10281030
mocktype = mockBox[i].mocktype ? ' data-type=' + mockBox[i].mocktype : ''
1029-
mockurl = mockBox[i].mockurl ? ' data="' + mockBox[i].mockurl + '"' : mocktype == ' data-type=text' ? ' data=""' : ''
1031+
mockurl = mockBox[i].mockurl
1032+
? ' data="' + mockBox[i].mockurl + '"'
1033+
: mocktype == ' data-type=text'
1034+
? ' data=""'
1035+
: ''
10301036
mockstatus = mockBox[i].mockstatus ? ' status-code=' + mockBox[i].mockstatus : ''
10311037

10321038
switch (targetApp) {

‎Rewrite-Parser.js‎

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,13 @@ if (binaryInfo != null && binaryInfo.length > 0) {
281281
}
282282

283283
!(async () => {
284-
285284
if (evUrlori) {
286285
evUrlori = (await $.http.get(evUrlori)).body
287286
}
288287
if (evUrlmodi) {
289288
evUrlmodi = (await $.http.get(evUrlmodi)).body
290289
}
291-
290+
292291
if (req == 'http://local.text') {
293292
body = localText
294293
} else {
@@ -558,27 +557,27 @@ if (binaryInfo != null && binaryInfo.length > 0) {
558557
tilescolor = jstype == 'generic' && /icon-color=/.test(x) ? x.split('icon-color=')[1].split('&')[0] : ''
559558
if (nCron != null && jstype != 'cron') {
560559
for (let i = 0; i < nCron.length; i++) {
561-
let elem = nCron[i].trim()
562-
if (x.indexOf(elem) != -1) {
563-
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
564-
jsBox.push({
565-
mark,
566-
noteK,
567-
jsname,
568-
img,
569-
jstype:'cron',
570-
jsptn:'',
571-
jsurl,
572-
updatetime,
573-
wakesys: '1',
574-
timeout:'120',
575-
ori: x,
576-
num: y,
577-
})
578-
}
579-
} //for
560+
let elem = nCron[i].trim()
561+
if (x.indexOf(elem) != -1) {
562+
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
563+
jsBox.push({
564+
mark,
565+
noteK,
566+
jsname,
567+
img,
568+
jstype: 'cron',
569+
jsptn: '',
570+
jsurl,
571+
updatetime,
572+
wakesys: '1',
573+
timeout: '120',
574+
ori: x,
575+
num: y,
576+
})
577+
}
578+
} //for
580579
}
581-
580+
582581
jsBox.push({
583582
mark,
584583
noteK,
@@ -621,28 +620,28 @@ if (binaryInfo != null && binaryInfo.length > 0) {
621620
jsurl = toJsc(jsurl, jscStatus, jsc2Status, jsfrom)
622621
rebody = /\sscript[^\s]*(-body|-analyze)/.test(x) ? 'true' : ''
623622
size = rebody == 'true' ? '-1' : ''
624-
623+
625624
if (nCron != null) {
626625
for (let i = 0; i < nCron.length; i++) {
627-
let elem = nCron[i].trim()
628-
if (x.indexOf(elem) != -1) {
629-
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
630-
jsBox.push({
631-
mark,
632-
noteK,
633-
jsname,
634-
jstype:'cron',
635-
jsptn:'',
636-
jsurl,
637-
wakesys: '1',
638-
timeout: '120',
639-
ori: x,
640-
num: y,
641-
})
642-
}
643-
} //for
626+
let elem = nCron[i].trim()
627+
if (x.indexOf(elem) != -1) {
628+
let jsname = jsurl.substring(jsurl.lastIndexOf('/') + 1, jsurl.lastIndexOf('.')) + '-cron'
629+
jsBox.push({
630+
mark,
631+
noteK,
632+
jsname,
633+
jstype: 'cron',
634+
jsptn: '',
635+
jsurl,
636+
wakesys: '1',
637+
timeout: '120',
638+
ori: x,
639+
num: y,
640+
})
641+
}
642+
} //for
644643
}
645-
644+
646645
jsBox.push({
647646
mark,
648647
noteK,
@@ -689,7 +688,7 @@ if (binaryInfo != null && binaryInfo.length > 0) {
689688
jsname,
690689
img,
691690
jstype: 'cron',
692-
jsptn:'',
691+
jsptn: '',
693692
cronexp,
694693
jsurl,
695694
wakesys: '1',
@@ -749,7 +748,9 @@ if (binaryInfo != null && binaryInfo.length > 0) {
749748

750749
jsBox = jsBox.reduce((curr, next) => {
751750
/*判断对象中是否已经有该属性 没有的话 push 到 curr数组*/
752-
obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] ? '' : (obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] = curr.push(next))
751+
obj[next.jstype + next.jsptn + next.jsurl + next.jsarg]
752+
? ''
753+
: (obj[next.jstype + next.jsptn + next.jsurl + next.jsarg] = curr.push(next))
753754
return curr
754755
}, [])
755756

@@ -800,10 +801,11 @@ if (binaryInfo != null && binaryInfo.length > 0) {
800801

801802
for (let key in modInfoObj) {
802803
if (modInfoObj[key]) {
803-
let value = modInfoObj[key], delsystem = false
804-
if (key == 'system' && isSurgeiOS ) {
804+
let value = modInfoObj[key],
805+
delsystem = false
806+
if (key == 'system' && isSurgeiOS) {
805807
value = value.toLowerCase()
806-
value = value.includes('mac') ? (value.includes('ios') ? (delsystem = true, 'mac') : 'mac') : 'ios'
808+
value = value.includes('mac') ? (value.includes('ios') ? ((delsystem = true), 'mac') : 'mac') : 'ios'
807809
} else if (isLooniOS && key == 'category') {
808810
key = 'keyword'
809811
} else if (!isLooniOS && key == 'keyword') {
@@ -1026,7 +1028,11 @@ if (binaryInfo != null && binaryInfo.length > 0) {
10261028
mark = mockBox[i].mark ? mockBox[i].mark : ''
10271029
mockptn = mockBox[i].mockptn
10281030
mocktype = mockBox[i].mocktype ? ' data-type=' + mockBox[i].mocktype : ''
1029-
mockurl = mockBox[i].mockurl ? ' data="' + mockBox[i].mockurl + '"' : mocktype == ' data-type=text' ? ' data=""' : ''
1031+
mockurl = mockBox[i].mockurl
1032+
? ' data="' + mockBox[i].mockurl + '"'
1033+
: mocktype == ' data-type=text'
1034+
? ' data=""'
1035+
: ''
10301036
mockstatus = mockBox[i].mockstatus ? ' status-code=' + mockBox[i].mockstatus : ''
10311037

10321038
switch (targetApp) {

0 commit comments

Comments
 (0)