feat: add option for transient import from file managers, closes #456 (#709)

2025-03-26 14:11:47 +08:00
parent b7f4a3503f
commit 06a7a8ea82
25 changed files with 64 additions and 22 deletions
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "التمييزات والتعليقات",
  "Note": "ملاحظة",
  "Copied to clipboard": "تم النسخ إلى الحافظة",
-  "Export Annotations": "تصدير التعليقات"
+  "Export Annotations": "تصدير التعليقات",
+  "Auto Import on File Open": "استيراد تلقائي عند فتح الملف"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Hervorhebungen & Anmerkungen",
  "Note": "Notiz",
  "Copied to clipboard": "In die Zwischenablage kopiert",
-  "Export Annotations": "Anmerkungen exportieren"
+  "Export Annotations": "Anmerkungen exportieren",
+  "Auto Import on File Open": "Automatischer Import beim Öffnen einer Datei"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Επισημάνσεις & Σχολιασμοί",
  "Note": "Σημείωση",
  "Copied to clipboard": "Αντιγράφηκε στο πρόχειρο",
-  "Export Annotations": "Εξαγωγή σχολιασμών"
+  "Export Annotations": "Εξαγωγή σχολιασμών",
+  "Auto Import on File Open": "Αυτόματη εισαγωγή κατά το άνοιγμα αρχείου"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Resaltados y anotaciones",
  "Note": "Nota",
  "Copied to clipboard": "Copiado al portapapeles",
-  "Export Annotations": "Exportar anotaciones"
+  "Export Annotations": "Exportar anotaciones",
+  "Auto Import on File Open": "Importación automática al abrir archivo"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Surlignages et annotations",
  "Note": "Note",
  "Copied to clipboard": "Copié dans le presse-papiers",
-  "Export Annotations": "Exporter les annotations"
+  "Export Annotations": "Exporter les annotations",
+  "Auto Import on File Open": "Importation automatique à l'ouverture du fichier"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "हाइलाइट और टिप्पणियाँ",
  "Note": "टिप्पणी",
  "Copied to clipboard": "क्लिपबोर्ड पर कॉपी किया गया",
-  "Export Annotations": "टिप्पणियाँ निर्यात करें"
+  "Export Annotations": "टिप्पणियाँ निर्यात करें",
+  "Auto Import on File Open": "फ़ाइल खोलने पर स्वचालित आयात"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Sorotan & Anotasi",
  "Note": "Catatan",
  "Copied to clipboard": "Disalin ke papan klip",
-  "Export Annotations": "Ekspor Anotasi"
+  "Export Annotations": "Ekspor Anotasi",
+  "Auto Import on File Open": "Impor Otomatis saat File Dibuka"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Evidenziazioni e annotazioni",
  "Note": "Nota",
  "Copied to clipboard": "Copiato negli appunti",
-  "Export Annotations": "Esporta annotazioni"
+  "Export Annotations": "Esporta annotazioni",
+  "Auto Import on File Open": "Importazione automatica all'apertura del file"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "ハイライトと注釈",
  "Note": "メモ",
  "Copied to clipboard": "クリップボードにコピー",
-  "Export Annotations": "注釈をエクスポート"
+  "Export Annotations": "注釈をエクスポート",
+  "Auto Import on File Open": "ファイルを開くと自動インポート"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "하이라이트 및 주석",
  "Note": "노트",
  "Copied to clipboard": "클립보드에 복사",
-  "Export Annotations": "주석 내보내기"
+  "Export Annotations": "주석 내보내기",
+  "Auto Import on File Open": "파일 열 때 자동 가져오기"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Zaznaczenia i adnotacje",
  "Note": "Notatka",
  "Copied to clipboard": "Skopiowano do schowka",
-  "Export Annotations": "Eksportuj adnotacje"
+  "Export Annotations": "Eksportuj adnotacje",
+  "Auto Import on File Open": "Automatyczne importowanie przy otwieraniu pliku"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Destaques e Anotações",
  "Note": "Nota",
  "Copied to clipboard": "Copiado para a área de transferência",
-  "Export Annotations": "Exportar Anotações"
+  "Export Annotations": "Exportar Anotações",
+  "Auto Import on File Open": "Importação Automática ao Abrir Arquivo"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Выделения и аннотации",
  "Note": "Заметка",
  "Copied to clipboard": "Скопировано в буфер обмена",
-  "Export Annotations": "Экспортировать аннотации"
+  "Export Annotations": "Экспортировать аннотации",
+  "Auto Import on File Open": "Автоматический импорт при открытии файла"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Vurgular ve Notlar",
  "Note": "Not",
  "Copied to clipboard": "Panoya kopyalandı",
-  "Export Annotations": "Notları Dışa Aktar"
+  "Export Annotations": "Notları Dışa Aktar",
+  "Auto Import on File Open": "Dosya Açıldığında Otomatik İçe Aktar"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Виділення та анотації",
  "Note": "Примітка",
  "Copied to clipboard": "Скопійовано в буфер обміну",
-  "Export Annotations": "Експортувати анотації"
+  "Export Annotations": "Експортувати анотації",
+  "Auto Import on File Open": "Автоматичний імпорт при відкритті файлу"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "Điểm nổi bật & Chú thích",
  "Note": "Ghi chú",
  "Copied to clipboard": "Đã sao chép vào bảng ghi",
-  "Export Annotations": "Xuất chú thích"
+  "Export Annotations": "Xuất chú thích",
+  "Auto Import on File Open": "Tự động nhập khi mở tệp"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "划线和笔记",
  "Note": "笔记",
  "Copied to clipboard": "已复制到剪贴板",
-  "Export Annotations": "导出笔记"
+  "Export Annotations": "导出笔记",
+  "Auto Import on File Open": "打开文件时自动导入"
 }
@@ -258,5 +258,6 @@
  "Highlights & Annotations": "高亮和筆記",
  "Note": "筆記",
  "Copied to clipboard": "已複製到剪貼板",
-  "Export Annotations": "匯出筆記"
+  "Export Annotations": "匯出筆記",
+  "Auto Import on File Open": "打開文件時自動導入"
 }
@@ -6,7 +6,7 @@ import { PiUserCircleCheck } from 'react-icons/pi';
 import { MdCheck } from 'react-icons/md';

 import { setAboutDialogVisible } from '@/components/AboutWindow';
-import { hasUpdater, isWebAppPlatform } from '@/services/environment';
+import { hasUpdater, isTauriAppPlatform, isWebAppPlatform } from '@/services/environment';
 import { DOWNLOAD_READEST_URL } from '@/services/constants';
 import { useAuth } from '@/context/AuthContext';
 import { useEnv } from '@/context/EnvContext';
@@ -33,6 +33,9 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
  const [isAutoUpload, setIsAutoUpload] = useState(settings.autoUpload);
  const [isAutoCheckUpdates, setIsAutoCheckUpdates] = useState(settings.autoCheckUpdates);
  const [isScreenWakeLock, setIsScreenWakeLock] = useState(settings.screenWakeLock);
+  const [isAutoImportBooksOnOpen, setIsAutoImportBooksOnOpen] = useState(
+    settings.autoImportBooksOnOpen,
+  );

  const showAboutReadest = () => {
    setAboutDialogVisible(true);
@@ -74,6 +77,13 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
    }
  };

+  const toggleAutoImportBooksOnOpen = () => {
+    settings.autoImportBooksOnOpen = !settings.autoImportBooksOnOpen;
+    setSettings(settings);
+    saveSettings(envConfig, settings);
+    setIsAutoImportBooksOnOpen(settings.autoImportBooksOnOpen);
+  };
+
  const toggleAutoCheckUpdates = () => {
    settings.autoCheckUpdates = !settings.autoCheckUpdates;
    setSettings(settings);
@@ -150,6 +160,13 @@ const SettingsMenu: React.FC<BookMenuProps> = ({ setIsDropdownOpen }) => {
        icon={isAutoUpload ? <MdCheck className='text-base-content' /> : undefined}
        onClick={toggleAutoUploadBooks}
      />
+      {isTauriAppPlatform() && !appService?.isMobile && (
+        <MenuItem
+          label={_('Auto Import on File Open')}
+          icon={isAutoImportBooksOnOpen ? <MdCheck className='text-base-content' /> : undefined}
+          onClick={toggleAutoImportBooksOnOpen}
+        />
+      )}
      {hasUpdater() && (
        <MenuItem
          label={_('Check Updates on Start')}
@@ -191,11 +191,13 @@ const LibraryPageContent = ({ searchParams }: { searchParams: ReadonlyURLSearchP

  const processOpenWithFiles = React.useCallback(
    async (appService: AppService, openWithFiles: string[], libraryBooks: Book[]) => {
+      const settings = await appService.loadSettings();
      const bookIds: string[] = [];
      for (const file of openWithFiles) {
        console.log('Open with book:', file);
        try {
-          const book = await appService.importBook(file, libraryBooks);
+          const temp = !settings.autoImportBooksOnOpen;
+          const book = await appService.importBook(file, libraryBooks, true, true, false, temp);
          if (book) {
            bookIds.push(book.hash);
          }
@@ -12,7 +12,7 @@ export const useUICSS = (bookKey: string, viewSettings: ViewSettings) => {
      styleElement.remove();
    }

-    const rawCSS = viewSettings.userStylesheet;
+    const rawCSS = viewSettings.userStylesheet || '';
    const newStyleEl = document.createElement('style');
    newStyleEl.textContent = rawCSS.replace('foliate-view', `#foliate-view-${bookKey}`);
    document.head.appendChild(newStyleEl);
@@ -132,6 +132,7 @@ export abstract class BaseAppService implements AppService {
    saveBook: boolean = true,
    saveCover: boolean = true,
    overwrite: boolean = false,
+    transient: boolean = false,
  ): Promise<Book | null> {
    try {
      let loadedBook: BookDoc;
@@ -163,7 +164,7 @@ export abstract class BaseAppService implements AppService {
      const hash = await partialMD5(fileobj);
      const existingBook = books.filter((b) => b.hash === hash)[0];
      if (existingBook) {
-        if (existingBook.deletedAt) {
+        if (!transient) {
          existingBook.deletedAt = null;
        }
        existingBook.updatedAt = Date.now();
@@ -176,6 +177,7 @@ export abstract class BaseAppService implements AppService {
        author: formatAuthors(loadedBook.metadata.author, loadedBook.metadata.language),
        createdAt: existingBook ? existingBook.createdAt : Date.now(),
        uploadedAt: existingBook ? existingBook.uploadedAt : null,
+        deletedAt: transient ? Date.now() : null,
        downloadedAt: Date.now(),
        updatedAt: Date.now(),
      };
@@ -35,6 +35,7 @@ export const DEFAULT_SYSTEM_SETTINGS: Partial<SystemSettings> = {
  autoUpload: true,
  autoCheckUpdates: true,
  screenWakeLock: true,
+  autoImportBooksOnOpen: false,

  lastSyncedAtBooks: 0,
  lastSyncedAtConfigs: 0,
@@ -24,6 +24,7 @@ export interface SystemSettings {
  autoUpload: boolean;
  autoCheckUpdates: boolean;
  screenWakeLock: boolean;
+  autoImportBooksOnOpen: boolean;

  lastSyncedAtBooks: number;
  lastSyncedAtConfigs: number;
@@ -48,6 +48,7 @@ export interface AppService {
    saveBook?: boolean,
    saveCover?: boolean,
    overwrite?: boolean,
+    transient?: boolean,
  ): Promise<Book | null>;
  deleteBook(book: Book, includingUploaded?: boolean): Promise<void>;
  uploadBook(book: Book, onProgress?: ProgressHandler): Promise<void>;