Skip to content

Commit

Permalink
feat: 增加站点离线选项
Browse files Browse the repository at this point in the history
离线后,不再参与搜索和信息获取
  • Loading branch information
ronggang committed May 21, 2019
1 parent fb9c271 commit e88c4a9
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/background/user.ts
Expand Up @@ -28,7 +28,7 @@ export class User {
return new Promise<any>((resolve?: any, reject?: any) => {
let requests: any[] = [];
this.service.options.sites.forEach((site: Site) => {
if (!site.allowGetUserInfo) {
if (!site.allowGetUserInfo || site.offline) {
return false;
}

Expand Down
3 changes: 3 additions & 0 deletions src/interface/common.ts
Expand Up @@ -194,6 +194,9 @@ export interface Site {
path?: string;
// 曾用域名列表,用于数据升级
formerHosts?: string[];
// 离线,设置为true时,不再进行搜索和个人信息获取,保存原数据统计
// todo: 后续可根据站点返回的状态码自动设置为离线
offline?: boolean;
}

export interface Request {
Expand Down
5 changes: 4 additions & 1 deletion src/options/views/search/SearchTorrent.ts
Expand Up @@ -348,7 +348,7 @@ export default Vue.extend({
// 是否指定了站点
if (this.host) {
let site = this.options.sites.find((item: Site) => {
return item.host === this.host;
return item.host === this.host && !item.offline;
});
if (site) {
sites.push(this.clone(site));
Expand All @@ -361,6 +361,7 @@ export default Vue.extend({
) {
let _sites: Site[] = [];
this.options.sites.forEach((item: Site) => {
if (item.offline) return false;
_sites.push(this.clone(item));
});

Expand Down Expand Up @@ -404,6 +405,8 @@ export default Vue.extend({
}
} else {
this.options.sites.forEach((item: Site) => {
if (item.offline) return false;

if (
item.allowSearch ||
this.options.defaultSearchSolutionId == "all"
Expand Down
6 changes: 5 additions & 1 deletion src/options/views/settings/Sites/Editor.vue
Expand Up @@ -141,6 +141,9 @@
</v-layout>
</v-container>
</template>

<!-- 站点已离线(停机/关闭) -->
<v-switch :label="words.offline" v-model="site.offline"></v-switch>
</v-form>
</v-card-text>
</v-card>
Expand Down Expand Up @@ -170,7 +173,8 @@ export default Vue.extend({
cdnTip:
"如您使用的网址和系统定义的不同,可在此填写当前使用的网站地址,每行填写一个地址,第一个将做为搜索时使用的地址",
priority: "优先级",
priorityTip: "可用于搜索排序"
priorityTip: "可用于搜索排序",
offline: "站点已离线(停机/关闭)"
},
showPasskey: false,
rules: {
Expand Down
23 changes: 21 additions & 2 deletions src/options/views/settings/Sites/Index.vue
Expand Up @@ -62,6 +62,15 @@
@click.stop="updateAllowGetUserInfo(props.item)"
></v-switch>
</td>
<td>
<v-switch
true-value="true"
false-value="false"
:input-value="props.item.offline?'true':'false'"
hide-details
@click.stop="updateOfflineStatus(props.item)"
></v-switch>
</td>
<td>
<a
:href="props.item.activeURL"
Expand Down Expand Up @@ -121,7 +130,9 @@
</v-card>
</v-dialog>

<v-alert :value="true" color="grey">{{ words.subTitle }}</v-alert>
<v-alert :value="true" color="grey">
<div v-html="words.subTitle"></div>
</v-alert>

<v-snackbar v-model="siteDuplicate" top :timeout="3000" color="error">{{ siteDuplicateText }}</v-snackbar>
</div>
Expand Down Expand Up @@ -154,7 +165,8 @@ export default Vue.extend({
removeSelectedConfirm: "确认要删除已选中的站点吗?",
plugins: "插件",
title: "站点设置",
subTitle: "只有配置过的站点才会显示插件图标及相应的功能。",
subTitle:
"只有配置过的站点才会显示插件图标及相应的功能;<br/>已离线的站点的不再参与搜索和信息获取;",
searchEntry: "搜索入口",
importedText: "已成功导入"
},
Expand All @@ -171,6 +183,7 @@ export default Vue.extend({
{ text: "标签", align: "left", value: "tags" },
{ text: "允许搜索", align: "left", value: "allowSearch" },
{ text: "个人信息(Beta)", align: "left", value: "allowGetUserInfo" },
{ text: "已离线", align: "left", value: "offline" },
{ text: "URL", align: "left", value: "activeURL" },
{ text: "操作", value: "name", sortable: false }
],
Expand Down Expand Up @@ -226,6 +239,12 @@ export default Vue.extend({
this.pagination.rowsPerPage = 0;
this.pagination.rowsPerPage = -1;
},
updateOfflineStatus(item: any) {
item.offline = !(<boolean>item.offline);
this.$store.commit("updateSite", item);
this.pagination.rowsPerPage = 0;
this.pagination.rowsPerPage = -1;
},
updateSite(item: any) {
// this.selectedSite = item;
this.$store.commit("updateSite", item);
Expand Down

0 comments on commit e88c4a9

Please sign in to comment.