fix flatpak

Author: arch

README.md

@@ -17,19 +17,3 @@ If you want to contribute to the project and make it better, your help is very w
 ## License
 
 Distributed under the MIT License. See `LICENSE` for more information.
-
-## Flatpak
-
-```bash
-sudo sysctl kernel.unprivileged_userns_clone=1
-flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
-flatpak-builder build-dir org.flatpak.PythonFunscriptEditor.json --force-clean
-flatpak-builder --run build-dir org.flatpak.PythonFunscriptEditor.json runner.sh
-```
-
-### Debugging
-
-```bash
-flatpak-builder --run build-dir org.flatpak.PythonFunscriptEditor.json /bin/bash
-```

build_flatpak.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+sudo sysctl kernel.unprivileged_userns_clone=1
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak install flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
+flatpak install org.gnome.Platform//3.38 org.gnome.Sdk//3.38
+flatpak-builder build-dir org.flatpak.PythonFunscriptEditor.json --force-clean

contrib/flatpak/README.md

@@ -0,0 +1,9 @@
+# Flatpak
+
+## Cheatsheet
+
+```bash
+./build_flatpak.sh
+flatpak-builder --run build-dir org.flatpak.PythonFunscriptEditor.json /bin/bash
+flatpak-builder --run build-dir org.flatpak.PythonFunscriptEditor.json runner.sh
+```

contrib/flatpak/runner.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-# /app/bin/conda/bin/activate
+/app/bin/conda/bin/activate
 /app/bin/conda/bin/python /app/bin/main.py "$@"

funscript_editor/ui/funscript_editor_window.py

@@ -276,7 +276,8 @@ def __open_video(self):
         file_name = QtWidgets.QFileDialog.getOpenFileName(
                 None,
                 caption="Select Video File",
-                directory=QtCore.QDir.currentPath())
+                options=QtWidgets.QFileDialog.DontUseNativeDialog # required to get correct path in flatpak
+        )
         if len(file_name) < 1: return
         if not any(file_name[0].lower().endswith(x) for x in ['.mkv', '.mp4']): return
 
@@ -294,6 +295,7 @@ def __open_video(self):
         self.ui.seekBar.setMaximum(max((0, self.video_player.get_length-2)))
         self.ui.seekBar.setValue(0)
         self.ui.timestamp.setText(FFmpegStream.millisec_to_timestamp(0)+' ')
+        self.__logger.info("Load Video: %s (%s)" , file_name[0], "True" if os.path.exists(file_name[0]) else "False")
 
     def __new_funscript(self):
         self.funscript = Funscript(fps=self.video_player.get_fps)

org.flatpak.PythonFunscriptEditor.json

@@ -1,17 +1,22 @@
 {
   "app-id": "org.flatpak.PythonFunscriptEditor",
-  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "21.08",
-  "sdk": "org.freedesktop.Sdk",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "3.38",
+  "sdk": "org.gnome.Sdk",
   "command": "runner.sh",
   "finish-args": [
-    "--device=all",
-    "--share=network",
     "--share=ipc",
-    "--socket=x11",
+    "--socket=fallback-x11",
     "--socket=wayland",
+    "--device=all",
+    "--share=network",
     "--socket=pulseaudio",
-    "--filesystem=home:rw"
+    "--filesystem=xdg-pictures",
+    "--filesystem=home:rw",
+    "--talk-name=org.gtk.vfs",
+    "--talk-name=org.gtk.vfs.*",
+    "--talk-name=org.gnome.SettingsDaemon.MediaKeys",
+    "--env=LC_NUMERIC=C"
   ],
   "modules": [
     {
@@ -22,14 +27,15 @@
       },
       "build-commands": [
         "export CONDA_ALWAYS_YES=\"true\"",
-        "bash Miniconda3-latest-Linux-x86_64.sh -b -p /app/bin/conda -f",
+        "bash Miniconda3-py38_4.10.3-Linux-x86_64.sh -b -p /app/bin/conda -f",
         "/app/bin/conda/bin/activate",
         "/app/bin/conda/bin/conda env update -f environment_flatpak.yaml"
       ],
       "sources": [
         {
           "type": "file",
-          "path": "Miniconda3-latest-Linux-x86_64.sh"
+          "url": "https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh",
+          "sha256": "935d72deb16e42739d69644977290395561b7a6db059b316958d97939e9bdf3d"
         },
         {
           "type": "file",