This commit is contained in:
z4yx 2020-03-10 11:22:06 +08:00
parent f917883a2d
commit 2be14a267c
No known key found for this signature in database
GPG Key ID: 8D451F061C0FF61B
2 changed files with 31 additions and 14 deletions

View File

@ -388,24 +388,15 @@ unlisted_mirrors:
url: 'https://aur.tuna.tsinghua.edu.cn/'
upstream: 'https://aur.archlinux.org/'
is_master: true
- status: 'success'
last_update: '-'
- link_to: 'osdn'
name: "manjaro-cd"
url: '/osdn/storage/g/m/ma/manjaro/'
upstrame: '-'
is_master: true
- status: 'success'
last_update: '-'
- link_to: 'osdn'
name: "manjaro-arm-cd"
url: '/osdn/storage/g/m/ma/manjaro-arm/'
upstrame: '-'
is_master: true
- status: 'success'
last_update: '-'
- link_to: 'osdn'
name: "mxlinux-isos"
url: '/osdn/storage/g/m/mx/mx-linux/ISOs/'
upstrame: '-'
is_master: true
force_help_mirrors:
- AOSP

View File

@ -74,6 +74,7 @@ var vmMirList = new Vue({
var unlisted_mir = unlisted.map(d => processMirrorItem(d))
status_data = status_data.map(d => processMirrorItem(d));
var mir_data = $.merge(unlisted_mir, status_data);
processLinkItem(mir_data);
status_data = sortAndUniqMirrors(status_data);
mir_data = sortAndUniqMirrors(mir_data).filter(d => !(d.status == "disabled"));
self.mirrorList = mir_data;
@ -117,18 +118,43 @@ var sortAndUniqMirrors = function(mirs){
}, []);
}
var processLinkItem = function(mirrors) {
for (let d of mirrors) {
if (d.link_to === undefined)
continue;
for (const target of mirrors) {
if (d.link_to === target.name) {
d.status = target.status;
d.label = target.label;
d.upstream = target.upstream;
d.show_status = target.show_status;
d.last_update = target.last_update;
d.last_update_ago = target.last_update_ago;
d.last_ended = target.last_ended;
d.last_ended_ago = target.last_ended_ago;
d.last_schedule = target.last_schedule;
d.last_schedule_ago = target.last_schedule_ago;
break;
}
}
}
};
var processMirrorItem = function(d){
if (options[d.name] != undefined ) {
d = $.extend(d, options[d.name]);
}
d.label = label_map[d.status];
d.help_url = help_url[d.name];
d.is_new = new_mirrors[d.name];
d.description = descriptions[d.name];
d.show_status = (d.status != "success");
if (d.is_master === undefined) {
d.is_master = true;
}
if (d.link_to !== undefined) {
return d;
}
d.label = label_map[d.status];
d.show_status = (d.status != "success");
// Strip the second component of last_update
[d.last_update, d.last_update_ago] = stringifyTime(d.last_update_ts);
[d.last_ended, d.last_ended_ago] = stringifyTime(d.last_ended_ts);