Commit 8ecd3290 authored by nanahira's avatar nanahira

fix fillUrl

parent cdc3e853
Pipeline #40132 passed with stages
in 6 minutes and 46 seconds
...@@ -53,14 +53,14 @@ export class Archive extends TimeBase { ...@@ -53,14 +53,14 @@ export class Archive extends TimeBase {
url: string; url: string;
backupUrl: string; backupUrl: string;
fillUrl(cdnUrl: string, cdnUrlOversize: string, addBackup = false) { fillUrl(urls: { cdnUrl: string; cdnUrlOversize: string; cdnUrlBackup?: string }) {
const overSize = this.size > 536870912; const overSize = this.size > 536870912;
if (overSize) { if (overSize) {
this.url = `${cdnUrlOversize}/${this.archiveFullPath}`; this.url = `${urls.cdnUrlOversize}/${this.archiveFullPath}`;
} else { } else {
this.url = `${cdnUrl}/${this.archiveFullPath}`; this.url = `${urls.cdnUrl}/${this.archiveFullPath}`;
if (addBackup) { if (urls.cdnUrlBackup) {
this.backupUrl = `${cdnUrlOversize}/${this.archiveFullPath}`; this.backupUrl = `${urls.cdnUrlBackup}/${this.archiveFullPath}`;
} }
} }
} }
......
...@@ -146,7 +146,12 @@ export class UpdateService extends ConsoleLogger { ...@@ -146,7 +146,12 @@ export class UpdateService extends ConsoleLogger {
private async prepareUrl(archives: Archive[], ip: string) { private async prepareUrl(archives: Archive[], ip: string) {
await this.mirror.lookForArchivesMirror(archives, ip); await this.mirror.lookForArchivesMirror(archives, ip);
const isChina = this.chnroute.isChina(ip); const isChina = this.chnroute.isChina(ip);
archives.forEach((a) => a.fillUrl(isChina ? this.cdnUrlCn : this.cdnUrl, this.cdnUrlOversize, false)); archives.forEach((a) =>
a.fillUrl({
cdnUrlOversize: this.cdnUrlOversize,
...(isChina ? { cdnUrl: this.cdnUrlCn, cdnUrlBackup: this.cdnUrl } : { cdnUrl: this.cdnUrl }),
})
);
return archives; return archives;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment