diff --git a/resource/i18n/en.json b/resource/i18n/en.json
index 65ca24cbd..e88e3096d 100644
--- a/resource/i18n/en.json
+++ b/resource/i18n/en.json
@@ -829,6 +829,8 @@
"user": {
"notSupported": "Not Supported",
"notLogged": "Not logged",
+ "needLogin": "Not logged",
+ "unknown": "Unknown",
"getUserInfoFailed": "Failed to get username and id",
"abortGetUserInfoFailed": "Cancel request to get user information failed"
}
diff --git a/resource/i18n/zh-CN.json b/resource/i18n/zh-CN.json
index 628d016ca..de34b0bb3 100644
--- a/resource/i18n/zh-CN.json
+++ b/resource/i18n/zh-CN.json
@@ -825,6 +825,8 @@
"user": {
"notSupported": "暂不支持",
"notLogged": "未登录",
+ "needLogin": "未登录",
+ "unknown": "未知错误",
"getUserInfoFailed": "获取用户名和编号失败",
"abortGetUserInfoFailed": "取消获取用户信息请求失败"
}
diff --git a/resource/schemas/IPTorrents/getSearchResult.js b/resource/schemas/IPTorrents/getSearchResult.js
index 1db071e2b..dee2d70ea 100644
--- a/resource/schemas/IPTorrents/getSearchResult.js
+++ b/resource/schemas/IPTorrents/getSearchResult.js
@@ -177,7 +177,7 @@
comments:
fieldIndex.comments == -1
? ""
- : cells.eq(fieldIndex.comments).text() || 0,
+ : cells.eq(fieldIndex.comments).text().replace("Go to comments","") || 0,
site: site,
tags: Searcher.getRowTags(site, row),
entryName: options.entry.name,
@@ -202,10 +202,13 @@
}
getTime(row) {
- let text = row.find(".t_ctime").text();
+ let text = row.find("td.al div.sub").text();
if (text) {
if (text.indexOf("|") > 0) {
- return text.split("|")[1].trim();
+ text=text.split("|")[1];
+ if (text.indexOf("by") > 0) {
+ return text.split("|")[0].trim();
+ }
}
}
return text;
diff --git a/resource/schemas/NexusPHP/getSearchResult.js b/resource/schemas/NexusPHP/getSearchResult.js
index ca7d65407..a18af3654 100644
--- a/resource/schemas/NexusPHP/getSearchResult.js
+++ b/resource/schemas/NexusPHP/getSearchResult.js
@@ -208,8 +208,8 @@
? null
: this.getFieldValue(row, cells, fieldIndex, "category") ||
this.getCategory(cells.eq(fieldIndex.category)),
- progress: this.getFieldValue(row, cells, fieldIndex, "progress"),
- status: this.getFieldValue(row, cells, fieldIndex, "status")
+ progress: Searcher.getFieldValue(site, row, "progress"),
+ status: Searcher.getFieldValue(site, row, "status")
};
results.push(data);
diff --git a/resource/sites/passthepopcorn.me/config.json b/resource/sites/passthepopcorn.me/config.json
index 05224986d..e7b132bb5 100644
--- a/resource/sites/passthepopcorn.me/config.json
+++ b/resource/sites/passthepopcorn.me/config.json
@@ -12,11 +12,17 @@
"page": "/torrents.php",
"resultType": "json",
"parseScriptFile": "getSearchResult.js",
- "queryString": "searchstr=$key$&grouping=0&json=noredirect"
+ "queryString": "searchstr=$key$&grouping=0&inallakas=1&json=noredirect"
},
"searchEntry": [{
- "name": "全部",
+ "name": "Normal",
"enabled": true
+ },
+ {
+ "name": "filelist",
+ "skipIMDbId": true,
+ "queryString":"filelist=$key$&grouping=0&json=noredirect",
+ "enabled": false
}],
"selectors": {
"userBaseInfo": {
diff --git a/resource/sites/ptsbao.club/config.json b/resource/sites/ptsbao.club/config.json
index a13a1b965..5ca11408b 100644
--- a/resource/sites/ptsbao.club/config.json
+++ b/resource/sites/ptsbao.club/config.json
@@ -8,6 +8,22 @@
"tags": ["影视", "综合"],
"host": "ptsbao.club",
"collaborator": ["laizony", "ted423"],
+ "searchEntryConfig": {
+ "merge": true,
+ "fieldSelector": {
+ "progress": {
+ "selector": ["tr.finished,tr.seeders"],
+ "filters": ["query.length?100:null"]
+ },
+ "status": {
+ "selector": ["tr.finished", "tr.seeders"],
+ "switchFilters": [
+ ["255"],
+ ["2"]
+ ]
+ }
+ }
+ },
"selectors": {
"userBaseInfo": {
"merge": true,
diff --git a/src/background/infoParser.ts b/src/background/infoParser.ts
index 8aa6ad518..e90305efe 100644
--- a/src/background/infoParser.ts
+++ b/src/background/infoParser.ts
@@ -85,6 +85,7 @@ export class InfoParser {
query = content;
} else {
query = content.find(selector);
+ if (query.length == 0)query = content.filter(selector)
}
if (query.length > 0) {
diff --git a/src/options/components/Navigation.vue b/src/options/components/Navigation.vue
index 14278d6d8..2deb5b9a1 100644
--- a/src/options/components/Navigation.vue
+++ b/src/options/components/Navigation.vue
@@ -125,7 +125,7 @@ export default Vue.extend({
{
title: "navigation.settings.permissions",
icon: "verified_user",
- key: "set-permissions"
+ key: "/set-permissions"
}
]
},
diff --git a/src/options/views/Home.vue b/src/options/views/Home.vue
index 065357652..ba89d390e 100644
--- a/src/options/views/Home.vue
+++ b/src/options/views/Home.vue
@@ -166,8 +166,8 @@
target="_blank"
rel="noopener noreferrer nofollow"
class="nodecoration"
- >{{ props.item.user.lastErrorMsg }}
- {{ props.item.user.lastErrorMsg }}
+ >{{ formatError(props.item.user) }}
+ {{ formatError(props.item.user) }}
@@ -446,7 +446,17 @@ export default Vue.extend({
showWeek: this.showWeek
}
});
- }
+ },
+
+ formatError(user: any) {
+ if (user.lastErrorMsg) {
+ return user.lastErrorMsg;
+ }
+ if (user.lastUpdateStatus && user.lastUpdateStatus !== EUserDataRequestStatus.success) {
+ return this.$t(`service.user.${user.lastUpdateStatus}`);
+ }
+ return '';
+ },
},
filters: {
@@ -517,7 +527,7 @@ export default Vue.extend({
align: "right",
value: "user.lastUpdateTime"
},
- { text: this.$t("home.headers.status"), align: "center", value: "" }
+ { text: this.$t("home.headers.status"), align: "center", value: "user.lastUpdateStatus" }
];
}
}