Merge pull request #91 from mifi/master

[pull] master from mifi:master

src/main/httpServer.ts

@@ -39,12 +39,11 @@ export default ({ port, onKeyboardAction }: {
 
   server.on('error', (err) => logger.error('http server error', err));
 
-  const startHttpServer = async () => new Promise((resolve, reject) => {
+  const startHttpServer = async () => new Promise<void>((resolve, reject) => {
     // force ipv4
     const host = '127.0.0.1';
     server.listen(port, host, () => {
       logger.info('HTTP API listening on', `http://${host}:${port}/`);
-      // @ts-expect-error tod
       resolve();
     });
 

src/main/index.ts

@@ -317,8 +317,7 @@ function initApp() {
     try {
       await stat(path);
     } catch (err) {
-      // @ts-expect-error todo
-      if (err.code === 'ENOENT') return;
+      if (err instanceof Error && 'code' in err && err.code === 'ENOENT') return;
     }
     await shell.trashItem(path);
   });

src/main/updateChecker.ts

@@ -37,8 +37,7 @@ export async function checkNewVersion() {
     if (semver.lt(currentVersion, newestVersion)) return newestVersion;
     return undefined;
   } catch (err) {
-    // @ts-expect-error todo
-    logger.error('Failed to check github version', err.message);
+    logger.error('Failed to check github version', err instanceof Error ? err.message : String(err));
     return undefined;
   }
 }

src/renderer/src/App.tsx

@@ -632,6 +632,7 @@ function App() {
     playingRef.current = false;
     setPlaybackMode(undefined);
     setFileDuration(undefined);
+    cutSegmentsHistory.history[0] = []; // in case we have exceeded capacity
     cutSegmentsHistory.go(0);
     setDetectedFileFormat(undefined);
     setRotation(360);
@@ -1045,11 +1046,20 @@ function App() {
       const notices = new Set<string>();
       const warnings = new Set<string>();
 
-      const { fileNames: cutFileNames, problems: cutFilesProblems } = await generateCutFileNames(cutFileTemplateOrDefault);
-      if (cutFilesProblems.error != null) {
-        console.warn('Output segments file name invalid, using default instead', cutFileNames);
-        warnings.add(cutFilesProblems.error);
-        warnings.add(t('Fell back to default output file name'));
+      let cutFileNames: string[];
+      // When deleting merged segments, use the default template so that we e.g. don't risk creating a folder structure
+      // https://github.com/mifi/lossless-cut/issues/2637
+      if (willMerge && autoDeleteMergedSegments) {
+        const generated = await generateCutFileNames(defaultCutFileTemplate);
+        cutFileNames = generated.fileNames;
+      } else {
+        const generated = await generateCutFileNames(cutFileTemplateOrDefault);
+        cutFileNames = generated.fileNames;
+        if (generated.problems.error != null) {
+          console.warn('Output segments file name invalid, using default instead', generated.fileNames);
+          warnings.add(generated.problems.error);
+          warnings.add(t('Fell back to default output file name'));
+        }
       }
 
       // throw (() => { const err = new Error('test'); err.code = 'ENOENT'; return err; })();

src/renderer/src/components/ExportModeButton.tsx

@@ -64,7 +64,6 @@ function ExportModeButton({ selectedSegments, style }: { selectedSegments: unkno
           merge: t('Merge cuts'),
           'merge+separate': t('Merge & Separate'),
           separate: t('Separate files'),
-          description: t('Export to separate files'),
         };
 
         const title = titles[mode];

src/renderer/src/util/outputNameTemplate.ts

@@ -230,7 +230,8 @@ async function generateWithFallback({ generate, desiredTemplate, defaultTemplate
     };
   }
 
-  if (problems.error != null) {
+  // Try again with default template if there was an error
+  if (problems.error != null && desiredTemplate !== defaultTemplate) {
     const fileNames = await generate({ template: defaultTemplate, sanitizeName: (name: string) => sanitizeName(name, true), safeOutputFileName: true });
     return { fileNames, originalFileNames, problems };
   }