Merge pull request #95 from mifi/master

[pull] master from mifi:master

.github/workflows/build.yml

@@ -70,13 +70,6 @@ jobs:
         uses: samuelmeuli/action-snapcraft@v2
         if: startsWith(matrix.os, 'ubuntu')
       
-      - name: (Linux) Setup flatpak
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y flatpak flatpak-builder
-          flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-
       - name: Save provisioning profile
         if: startsWith(matrix.os, 'macos')
         env:
@@ -168,6 +161,5 @@ jobs:
             dist/LosslessCut-linux-arm64.tar.bz2
             dist/LosslessCut-linux-armv7l.tar.bz2
             dist/LosslessCut-linux-x64.tar.bz2
-            dist/LosslessCut-linux-x86_64.flatpak
             screenshot.jpeg
 

README.md

@@ -165,6 +165,7 @@ LosslessCut uses the Chromium browser's HTML5 video player, and not all formats/
 - Hacker News [2024](https://news.ycombinator.com/item?id=40829494) [2022](https://news.ycombinator.com/item?id=33969490) [2020-10](https://news.ycombinator.com/item?id=24883030) [2020-01](https://news.ycombinator.com/item?id=22026412) [2016](https://news.ycombinator.com/item?id=12885585)
 - [Wikipedia](https://en.m.wikipedia.org/wiki/LosslessCut)
 - Your link here?
+- theo (YouTube) [1](https://youtu.be/FI5ba4RRE8U?t=246) [2](https://youtu.be/uaCypXEJjes?t=381)
 
 <img src="https://api.star-history.com/svg?repos=mifi/lossless-cut&type=Date" alt="Star History Chart" width="400px" />
 

package.json

@@ -452,10 +452,6 @@
           "arch": "x64",
           "target": "snap"
         },
-        {
-          "arch": "x64",
-          "target": "flatpak"
-        },
         {
           "arch": "arm64",
           "target": "tar.bz2"
@@ -471,22 +467,6 @@
         "default",
         "removable-media"
       ]
-    },
-    "flatpak": {
-      "runtime": "org.freedesktop.Platform",
-      "runtimeVersion": "23.08",
-      "sdk": "org.freedesktop.Sdk",
-      "base": "org.electronjs.Electron2.BaseApp",
-      "baseVersion": "23.08",
-      "finishArgs": [
-        "--share=network",
-        "--socket=x11",
-        "--socket=wayland",
-        "--device=dri",
-        "--socket=pulseaudio",
-        "--filesystem=home",
-        "--talk-name=org.freedesktop.Notifications"
-      ]
     }
   },
   "packageManager": "yarn@4.11.0"

src/main/index.ts

@@ -233,7 +233,7 @@ function parseCliArgs(rawArgv = process.argv) {
   const argsWithoutAppName = rawArgv.length > ignoreFirstArgs ? rawArgv.slice(ignoreFirstArgs) : [];
 
   return yargsParser(argsWithoutAppName, {
-    boolean: ['allow-multiple-instances', 'disable-networking'],
+    boolean: ['disable-networking'],
     string: ['settings-json', 'config-dir', 'lossy-mode'],
   });
 }
@@ -251,7 +251,7 @@ if (argv['localesPath'] != null) i18nCommon.setCustomLocalesPath(argv['localesPa
 
 
 function safeRequestSingleInstanceLock(additionalData: Record<string, unknown>) {
-  if (process.mas) return true; // todo remove when fixed https://github.com/electron/electron/issues/35540
+  if (process.mas) return true; // todo remove when dropping support for MacOS 13 https://github.com/electron/electron/issues/35540#issuecomment-2173130321
 
   // using additionalData because the built in "argv" passing is a bit broken:
   // https://github.com/electron/electron/issues/20322

src/renderer/src/components/BatchFile.tsx

@@ -59,6 +59,12 @@ function BatchFile({ path, index, isOpen, isSelected, name, onSelect, onDelete,
     e.currentTarget.blur();
   }, [onSelect, path]);
 
+  const handleDeleteClick = useCallback<MouseEventHandler<SVGElement>>((e) => {
+    e.stopPropagation();
+    onDelete?.(path);
+    e.currentTarget.blur();
+  }, [onDelete, path]);
+
   return (
     <div
       // eslint-disable-next-line react/jsx-props-no-spreading
@@ -78,7 +84,7 @@ function BatchFile({ path, index, isOpen, isSelected, name, onSelect, onDelete,
         <span style={{ direction: 'ltr', unicodeBidi: 'isolate', display: 'inline-block' }}>{name}</span>
       </div>
       <div style={{ flexGrow: 1 }} />
-      {onDelete && <FaTimes style={{ color: dangerColor, fontSize: '.9em', marginRight: '-.3em', flexShrink: 0, cursor: 'pointer', padding: '.3em' }} role="button" onClick={() => onDelete(path)} />}
+      {onDelete && <FaTimes style={{ color: dangerColor, fontSize: '.9em', marginRight: '-.3em', flexShrink: 0, cursor: 'pointer', padding: '.3em' }} role="button" onClick={handleDeleteClick} />}
     </div>
   );
 }