improvement: 改进下载页进度条

fix: 安装时默认 UserAgent 错误
f4team-cn · Aug 7, 2024 · f81419c · f81419c
1 parent e3f9454
commit f81419c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/pages/Install.vue b/src/pages/Install.vue
@@ -74,7 +74,7 @@ const systemConfig = reactive<InstallSystemConfig>({
 	fixed_key: '',
 	key_last_time: '300',
 	normal_cookie: '',
-	parse_ua: 'netdisk',
+	parse_ua: 'netdisk;',
 	real_url_last_time: '1800',
 	requires_key: 'dynamic'
 });

diff --git a/src/pages/Parsed.vue b/src/pages/Parsed.vue
@@ -137,6 +137,7 @@ const stop = () => {
 	blocked.value = false;
 	starting.value = false;
 	dialogStore.interceptUnload = false;
+	progress.value = 0;
 };
 
 const onWorkerMessage = async (m: WorkerResponse) => {
@@ -152,9 +153,9 @@ const onWorkerMessage = async (m: WorkerResponse) => {
 		return;
 	}
 	if (m.type === 'progress') {
-		const low = (m.max ? m.max : 1) - (m.n ? m.n : 0) + 1;
-		const single = 100 / low;
-		progress.value = Math.floor(single);
+		const max = m.max || 1;
+		const n = m.n || 0
+		progress.value = Math.round(n / max * 100);
 		return;
 	}
 	if (m.type === 'success') {
@@ -282,7 +283,7 @@ worker.setCallback(onWorkerMessage);
 						</template>
 					</Fieldset>
 					<Fieldset legend="准备下载">
-						<ProgressBar :mode="!starting ? 'indeterminate' : 'determinate'"
+						<ProgressBar :mode="starting && progress === 0 ? 'indeterminate' : 'determinate'" v-if="starting"
 						             :value="progress"></ProgressBar>
 						<Divider/>
 						<ButtonGroup>