feat: download by page range supports -end

close #52
Tsuk1ko · Aug 17, 2024 · 2564e56 · 2564e56
1 parent 27de7d6
commit 2564e56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
@@ -81,7 +81,7 @@ export default {
     unignore: 'Ignore this',
   },
   input: {
-    downloadSpecifiedPages: 'Download specified pages (e.g. 1-10,12,14,18-)',
+    downloadSpecifiedPages: 'Download specified pages (e.g. -5,7-10,12,14,18-)',
   },
   confirmPopup: {
     title: 'Are you sure?',

diff --git a/src/i18n/locales/zh.ts b/src/i18n/locales/zh.ts
@@ -79,7 +79,7 @@ export default {
     unignore: '不再忽略',
   },
   input: {
-    downloadSpecifiedPages: '下载指定页面（例：1-10,12,14,18-）',
+    downloadSpecifiedPages: '下载指定页面（例：-5,7-10,12,14,18-）',
   },
   confirmPopup: {
     title: '真的吗？',

diff --git a/src/utils/initPage/detail.tsx b/src/utils/initPage/detail.tsx
@@ -48,12 +48,17 @@ export const initDetailPage = async (): Promise<void> => {
     const gallery = await getGalleryInfo();
     const rangeCheckers: RangeChecker[] = pagesInput.value
       .split(',')
-      .filter(range => !Number.isNaN(parseInt(range)))
+      .filter(range => /^(?:\d+-?\d*|-\d+)$/.test(range))
       .map(range => {
         const [start, end] = range.split('-').map(num => parseInt(num));
-        if (typeof end === 'undefined') return page => page === start;
-        else if (Number.isNaN(end)) return page => page >= start;
-        else return page => start <= page && page <= end;
+        // -end
+        if (Number.isNaN(start)) return page => page <= end;
+        // start
+        if (end === undefined) return page => page === start;
+        // start-
+        if (Number.isNaN(end)) return page => page >= start;
+        // start-end
+        return page => start <= page && page <= end;
       });
 
     progressDisplayController.lockBtn();