Merge branch 'master' of https://git.yasue.org/ken/RandomVideoMaker

src/generateImage.ts

@@ -14,17 +14,17 @@ interface VideoRecord {
 }
 
 const servers = [
-    {
+    /*{
-        baseUrl: process.env.SERVER1_COMFY_BASE_URL,
+     baseUrl: process.env.SERVER1_COMFY_BASE_URL,
-        outputDir: process.env.SERVER1_COMFY_OUTPUT_DIR,
+     outputDir: process.env.SERVER1_COMFY_OUTPUT_DIR,
-    },
+ },*/
+
 
-    /*
     {
         baseUrl: process.env.SERVER2_COMFY_BASE_URL,
         outputDir: process.env.SERVER2_COMFY_OUTPUT_DIR,
     },
-    */
+
 ];
 
 const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
@@ -63,7 +63,7 @@ async function worker(server: any) {
     while (true) {
         await sleep(Math.random() * 3000); // Random delay
         const videosToProcess = (await query(
-            "SELECT * FROM video WHERE image_prompt IS NOT NULL AND (image_path IS NULL OR image_path = '') LIMIT 1"
+            "SELECT * FROM video WHERE image_prompt IS NOT NULL AND (video_path IS NULL OR image_path = '') LIMIT 1"
         )) as any[];
 
         if (videosToProcess.length === 0) {

src/lib/image-generator.ts

@@ -62,10 +62,15 @@ async function generateImage(
     const newFilePath = path.resolve('./generated', newFileName);
 
     await fs.mkdir('./generated', { recursive: true });
-    
+
     const sourcePath = path.join(COMFY_OUTPUT_DIR!, latestFile);
+    try {
+        await fs.unlink(sourcePath);
+    } catch (err) {
+        // ignore if not exists
+    }
+
     await fs.copyFile(sourcePath, newFilePath);
-    //await fs.unlink(sourcePath);
 
     return newFilePath;
 }