Merge branch 'dev' of github.com:allanpk716/ChineseSubFinder into dev

frontend/src/pages/library/BtnIgnoreVideo.vue

@@ -32,7 +32,7 @@ const getIsSkipped = async () => {
 const skip = async () => {
   $q.dialog({
     title: '提示',
-    message: `确定要在任务中${isSkipped.value ? '取消' : ''}忽略该视频吗？`,
+    message: isSkipped.value ? '确定要解锁该视频吗？' : `确定要锁定该视频，不进行字幕下载吗？`,
     cancel: true,
     persistent: true,
   }).onOk(async () => {

frontend/src/pages/library/BtnUploadSubtitle.vue

@@ -50,7 +50,9 @@ const upload = async () => {
   formData.append('file', uploadFile.value[0]);
   isInQueue.value = true;
   await LibraryApi.uploadSubtitle(formData);
-  SystemMessage.success('字幕上传成功');
+  SystemMessage.success('字幕上传成功。如果设置开启了“自动校正时间轴”，处理需要一些时间，请耐心等待', {
+    timeout: 3000,
+  });
   await getSubtitleUploadList();
   eventBus.emit('subtitle-uploaded');
 };

frontend/src/pages/library/tvs/DialogTVDetail.vue

@@ -42,7 +42,8 @@
           <q-btn
             class="btn-download"
             color="primary"
-            label="忽略选中"
+            icon="lock"
+            title="锁定选中视频，不进行字幕下载"
             flat
             :disable="selection.length === 0"
             @click="skipAll(true)"
@@ -51,7 +52,8 @@
           <q-btn
             class="btn-download"
             color="primary"
-            label="取消忽略"
+            icon="lock_open"
+            title="解锁选中视频"
             flat
             :disable="selection.length === 0"
             @click="skipAll(false)"
@@ -231,8 +233,8 @@ const downloadSubtitle = async (items) => {
 
 const skipAll = async (isSkip) => {
   $q.dialog({
-    title: `${isSkip ? '忽略' : '取消忽略'}全部视频`,
-    message: `确定要${isSkip ? '忽略' : '取消忽略'}全部视频吗？`,
+    title: `${isSkip ? '锁定' : '解锁'}选中视频`,
+    message: `确定要${isSkip ? '锁定' : '解锁'}选中视频吗？`,
     cancel: true,
     persistent: true,
   }).onOk(async () => {
@@ -255,9 +257,7 @@ const skipAll = async (isSkip) => {
     const successCount = result.filter((item) => item.status === 'fulfilled').length;
     const errorCount = result.filter((item) => item.status === 'rejected').length;
 
-    const msg = `成功${isSkip ? '忽略' : '取消忽略'} ${successCount} 个视频${
-      errorCount ? `，失败 ${errorCount} 个` : ''
-    }`;
+    const msg = `成功${isSkip ? '锁定' : '解锁'} ${successCount} 个视频${errorCount ? `，失败 ${errorCount} 个` : ''}`;
     SystemMessage.success(msg);
   });
 };

frontend/src/pages/settings/AdvancedSettings.vue

@@ -355,9 +355,6 @@
         </q-item>
         <q-item class="q-mt-md" dense>
           <q-item-section>
-            <q-item-label>APIKey</q-item-label>
-          </q-item-section>
-          <q-item-section avatar>
             <q-input
               v-model="form.tmdb_api_settings.api_key"
               standout

frontend/src/utils/Message.js

@@ -6,7 +6,8 @@ import { Notify } from 'quasar';
 const MESSAGE_DURATION = 500;
 
 export const SystemMessage = {
-  success(message, ...options) {
+  success(message, options = {}) {
+    console.log(options);
     Notify.create({
       message,
       icon: 'check_circle',
@@ -17,7 +18,7 @@ export const SystemMessage = {
     });
   },
 
-  warn(message, ...options) {
+  warn(message, options = {}) {
     Notify.create({
       message,
       icon: 'warning',
@@ -28,7 +29,7 @@ export const SystemMessage = {
     });
   },
 
-  info(message, ...options) {
+  info(message, options = {}) {
     Notify.create({
       message,
       icon: 'info',
@@ -39,7 +40,7 @@ export const SystemMessage = {
     });
   },
 
-  error(message, ...options) {
+  error(message, options = {}) {
     Notify.create({
       message,
       icon: 'error',