@soga/task 0.2.15 → 0.2.22

package/dist/upload-task/single-runner.d.ts

@@ -1,14 +1,13 @@
-import { FileCache } from '@soga/file-cache';
 import { DataSource } from 'typeorm';
+import { FileMeta, MediaMeta, SubtitleMeta } from './types';
+import { LowType } from '@soga/bridge';
 export declare class SingleRunner {
-    protected fc: FileCache;
+    db: LowType<DbDataType>;
     private file_id;
     private cache_file;
     private dataSource;
     private fileRepository;
-    private PARSED_FILES_KEY;
-    private INSERT_FOLDERS_KEY;
-    private INSERT_FILES_KEY;
+    private calculateMd5;
     constructor({ dataSource, file_id, }: {
         dataSource: DataSource;
         file_id: number;
@@ -21,3 +20,14 @@ export declare class SingleRunner {
     private destroy;
     private init;
 }
+type DbDataType = {
+    raw_files_parsed: boolean;
+    folders_inserted: boolean;
+    files_inserted: boolean;
+    folders: string[];
+    subtitles: SubtitleMeta[];
+    medias: MediaMeta[];
+    files: FileMeta[];
+    status: Record<string, boolean>;
+};
+export {};

package/dist/upload-task/single-runner.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleRunner = void 0;
 const entities_1 = require("@soga/entities");
-const file_cache_1 = require("@soga/file-cache");
 const types_1 = require("@soga/types");
 const fs_extra_1 = require("fs-extra");
 const glob_1 = require("glob");
@@ -11,15 +10,19 @@ const path_1 = require("path");
 const typeorm_1 = require("typeorm");
 const fileinfo_1 = require("../utils/fileinfo");
 const utils_1 = require("./utils");
+const bridge_1 = require("@soga/bridge");
+const crypto_1 = require("crypto");
 class SingleRunner {
-    fc;
+    db;
     file_id;
     cache_file;
     dataSource;
     fileRepository;
-    PARSED_FILES_KEY = 'parsed_files';
-    INSERT_FOLDERS_KEY = 'insert_folders';
-    INSERT_FILES_KEY = 'insert_files';
+    calculateMd5(text) {
+        const hash = (0, crypto_1.createHash)('md5');
+        hash.update(`${text}`);
+        return hash.digest('hex');
+    }
     constructor({ dataSource, file_id, }) {
         this.dataSource = dataSource;
         this.fileRepository = dataSource.getRepository(entities_1.UploadFile);
@@ -48,12 +51,8 @@ class SingleRunner {
         await this.fileRepository.save(fileitem);
     }
     async insertFiles() {
-        const key = this.INSERT_FILES_KEY;
-        const cache = await this.fc.get(key);
-        if (cache)
-            return cache;
-        const data = await this.fc.get(this.PARSED_FILES_KEY);
-        if (!data)
+        const { files_inserted, files: normal_files, medias, subtitles, } = this.db.data;
+        if (files_inserted)
             return;
         const fileitem = await this.fileRepository.findOneBy({
             id: this.file_id,
@@ -63,7 +62,6 @@ class SingleRunner {
         const { config } = fileitem;
         const keep_source = config.file_keeps == types_1.RecordFileKeep.SOURCE ||
             config.file_keeps == types_1.RecordFileKeep.BOTH;
-        const { subtitles, medias, files: normal_files } = data;
         const match_map = {};
         let subs = [...subtitles];
         medias.forEach((media) => {
@@ -162,17 +160,13 @@ class SingleRunner {
         finally {
             await queryRunner.release();
         }
-        await this.fc.set(key, true);
+        this.db.data.files_inserted = true;
+        await this.db.write();
     }
     async insertFolders() {
-        const key = this.INSERT_FOLDERS_KEY;
-        const cache = await this.fc.get(key);
-        if (cache)
-            return cache;
-        const data = await this.fc.get(this.PARSED_FILES_KEY);
-        if (!data)
+        const { folders, folders_inserted } = this.db.data;
+        if (folders_inserted)
             return;
-        const { folders } = data;
         const { length } = folders;
         const fileitem = await this.fileRepository.findOneBy({
             id: this.file_id,
@@ -230,13 +224,13 @@ class SingleRunner {
             };
             await this.fileRepository.save(this.fileRepository.create(info));
         }
-        await this.fc.set(key, true);
+        this.db.data.folders_inserted = true;
+        await this.db.write();
     }
     async parseRawFiles() {
-        const key = this.PARSED_FILES_KEY;
-        const cache = await this.fc.get(key);
-        if (cache)
-            return cache;
+        if (this.db.data.raw_files_parsed) {
+            return;
+        }
         const fileitem = await this.fileRepository.findOneBy({
             id: this.file_id,
         });
@@ -308,19 +302,15 @@ class SingleRunner {
                 }
             }
         }
-        await this.fc.set(key, {
-            files,
-            folders,
-            medias,
-            subtitles,
-        });
-        return {
-            files,
-            folders,
-        };
+        this.db.data.folders = folders;
+        this.db.data.files = files;
+        this.db.data.medias = medias;
+        this.db.data.subtitles = subtitles;
+        this.db.data.raw_files_parsed = true;
+        await this.db.write();
     }
     async destroy() {
-        await this.fc?.destroy();
+        delete this.db;
         await (0, fs_extra_1.remove)(this.cache_file);
     }
     async init() {
@@ -329,9 +319,18 @@ class SingleRunner {
         });
         if (!fileitem)
             return;
-        const { id } = fileitem;
-        this.cache_file = (0, path_1.resolve)((0, os_1.homedir)(), '.dpan', 'desktop', 'json_files', `upload_task_single_${id}.json`);
-        this.fc = await (0, file_cache_1.getFileCache)(this.cache_file);
+        const { id, inputs } = fileitem;
+        const input = inputs[0];
+        const md5 = this.calculateMd5(`${input.filepath}_${input.filesize}`);
+        this.cache_file = (0, path_1.resolve)((0, os_1.homedir)(), '.dpan', 'desktop', 'json_files', `${id}_${md5}.json`);
+        const defaultData = {
+            folders: [],
+            subtitles: [],
+            medias: [],
+            files: [],
+            status: {},
+        };
+        this.db = await (0, bridge_1.getDb)(this.cache_file, defaultData);
     }
 }
 exports.SingleRunner = SingleRunner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soga/task",
-  "version": "0.2.15",
+  "version": "0.2.22",
   "publishConfig": {
     "access": "public"
   },
@@ -47,17 +47,16 @@
   "author": "",
   "license": "ISC",
   "peerDependencies": {
-    "level": "*",
     "typeorm": "*"
   },
   "dependencies": {
-    "@soga/entities": "^0.2.15",
-    "@soga/file-cache": "^0.2.13",
-    "@soga/sdk": "^0.2.15",
-    "@soga/types": "^0.2.15",
-    "@soga/utils": "^0.2.15",
+    "@soga/bridge": "^0.2.22",
+    "@soga/entities": "^0.2.22",
+    "@soga/sdk": "^0.2.22",
+    "@soga/types": "^0.2.22",
+    "@soga/utils": "^0.2.22",
     "axios": "^1.8.4",
     "mime": "^3.0.0"
   },
-  "gitHead": "2592173a0ca38f6ff55cbbc8e29d7b1ac4bb4072"
+  "gitHead": "6a9ab21995f575fd1325a2b5fa7eea4fd50564db"
 }