naming + readme

README.md

@@ -1,5 +1,4 @@
 
-
 resolve-flatpak
 ===============
 
@@ -13,26 +12,10 @@ Usage
 -----
 
 1. Clone this repo with: `git clone -b unified-patches https://github.com/RobotRoss/resolve-flatpak.git --recursive`
-By default, com.blackmagic.Resolve.Free.yaml is configured to package the latest version of Resolve (18.5 Beta 3 at the time of writing).
-
-2. Build your package, and export to a distributable single file installer:
-
-#### Free
-```
-flatpak-builder --force-clean --repo=repo build-dir com.blackmagicdesign.Resolve.Free.yaml
-flatpak build-bundle repo ResolveFree.flatpak com.blackmagicdesign.Resolve.Free
-```
-#### Studio
-```
-flatpak-builder --force-clean --repo=repo build-dir com.blackmagicdesign.Resolve.Studio.yaml
-flatpak build-bundle repo ResolveStudio.flatpak com.blackmagicdesign.Resolve.Studio
-```
 
-4. Enjoy.
+2. Learn download ID of the desired version:
 
-   IF YOU ENCOUNTER ISSUES: If you have appimagelauncherd (the AppImage Launcher daemon) installed and enabled, you NEED to temporarely disable it (either through systemctl or through the AppImage Launcher GUI) as it conflicts with flatpak-builder during the .run file repackaging process.
-
-## Finding explicit Download IDs (for download_resolve.sh)
+## Finding explicit Download IDs (for resolve_download.py)
 #### Studio:
 
 ```
@@ -55,5 +38,26 @@ curl -o- https://www.blackmagicdesign.com/api/support/nz/downloads.json |
             | @tsv'
 ```
 
+3. Overwrite the strings in python/resolve_download.py file. The file is currently configured to download:
+DaVinci Resolve 18.6.6
+
+4. 3. Build your package, and export to a distributable single file installer:
+
+#### Free
+```
+flatpak-builder --force-clean --repo=repo build-dir com.blackmagicdesign.DaVinciResolve.Free.yaml
+flatpak build-bundle repo DaVinciResolve.Free.flatpak com.blackmagicdesign.DaVinciResolve.Free
+```
+#### Studio
+```
+flatpak-builder --force-clean --repo=repo build-dir com.blackmagicdesign.DaVinciResolve.Studio.yaml
+flatpak build-bundle repo DaVinciResolve.Studio.flatpak com.blackmagicdesign.DaVinciResolve.Studio
+```
+
+5. Enjoy.
+
+   IF YOU ENCOUNTER ISSUES: If you have appimagelauncherd (the AppImage Launcher daemon) installed and enabled, you NEED to temporarely disable it (either through systemctl or through the AppImage Launcher GUI) as it conflicts with flatpak-builder during the .run file repackaging process.
+
+
 ## Licensing
 The icon in logo.png is licensed under the Creative [Commons Attribution-Share Alike 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/deed.en) and fetched from [Wikimedia Commons](https://commons.wikimedia.org/wiki/File:DaVinci_Resolve_Studio.png). It was only cropped afterwards.

com.blackmagicdesign.Resolve.Free.desktop → com.blackmagicdesign.DaVinciResolve.Free.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Davinci Resolve
-Icon=com.blackmagicdesign.Resolve.Free
+Name=DaVinci Resolve
+Icon=com.blackmagicdesign.DaVinciResolve.Free
 Exec=/app/bin/resolve.sh
 Categories=AudioVideo;
 PrefersNonDefaultGPU=true

com.blackmagicdesign.Resolve.Free.yaml → com.blackmagicdesign.DaVinciResolve.Free.yaml

@@ -2,7 +2,7 @@
 # Flatpak Configuration for building DaVinci Resolve
 #
 ####
-app-id: com.blackmagicdesign.Resolve.Free
+app-id: com.blackmagicdesign.DaVinciResolve.Free
 runtime: org.freedesktop.Platform
 runtime-version: &runtime-version '23.08'
 sdk: org.freedesktop.Sdk
@@ -17,8 +17,8 @@ finish-args:
   - --filesystem=xdg-cache
   - --filesystem=xdg-data
   - --filesystem=xdg-videos
+  - --filesystem=xdg-desktop
   - --filesystem=~/.local/share/DaVinciResolve
-  - --filesystem=~/Desktop
   - --env=LD_PRELOAD=/lib/x86_64-linux-gnu/libglib-2.0.so.0 /lib/x86_64-linux-gnu/libgio-2.0.so.0 /lib/x86_64-linux-gnu/libgmodule-2.0.so.0 /lib/x86_64-linux-gnu/libgobject-2.0.so.0
   - --env=RUSTICL_ENABLE=radeonsi,iris,nouveau
   - --env=OCL_ICD_VENDORS=rusticl.icd
@@ -67,7 +67,7 @@ modules:
         - --share=network
     build-commands:
       - install -Dm644 logo.png /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.png
-      - install -Dm644 com.blackmagic.Resolve.Free.desktop /app/share/applications/${FLATPAK_ID}.desktop
+      - install -Dm644 com.blackmagicdesign.DaVinciResolve.Free.desktop /app/share/applications/${FLATPAK_ID}.desktop
       - |
         ./run_complete_installation.sh
     sources:
@@ -92,4 +92,4 @@ modules:
       - type: file
         path: logo.png
       - type: file
-        path: com.blackmagic.Resolve.Free.desktop
+        path: com.blackmagicdesign.DaVinciResolve.Free.desktop

com.blackmagicdesign.Resolve.Studio.desktop → com.blackmagicdesign.DaVinciResolve.Studio.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Davinci Resolve Studio
-Icon=com.blackmagicdesign.Resolve.Studio
+Name=DaVinci Resolve Studio
+Icon=com.blackmagicdesign.DaVinciResolve.Studio
 Exec=/app/bin/resolve.sh
 Categories=AudioVideo;
 PrefersNonDefaultGPU=true

com.blackmagicdesign.Resolve.Studio.yaml → com.blackmagicdesign.DaVinciResolve.Studio.yaml

@@ -2,7 +2,7 @@
 # Flatpak Configuration for building DaVinci Resolve
 #
 ####
-app-id: com.blackmagicdesign.Resolve.Studio
+app-id: com.blackmagicdesign.DaVinciResolve.Studio
 runtime: org.freedesktop.Platform
 runtime-version: &runtime-version '23.08'
 sdk: org.freedesktop.Sdk
@@ -17,8 +17,8 @@ finish-args:
   - --filesystem=xdg-cache
   - --filesystem=xdg-data
   - --filesystem=xdg-videos
+  - --filesystem=xdg-desktop
   - --filesystem=~/.local/share/DaVinciResolve
-  - --filesystem=~/Desktop
   - --env=LD_PRELOAD=/lib/x86_64-linux-gnu/libglib-2.0.so.0 /lib/x86_64-linux-gnu/libgio-2.0.so.0 /lib/x86_64-linux-gnu/libgmodule-2.0.so.0 /lib/x86_64-linux-gnu/libgobject-2.0.so.0
   - --env=RUSTICL_ENABLE=radeonsi,iris,nouveau
   - --env=OCL_ICD_VENDORS=rusticl.icd
@@ -67,7 +67,7 @@ modules:
         - --share=network
     build-commands:
       - install -Dm644 logo.png /app/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.png
-      - install -Dm644 com.blackmagicdesign.Resolve.Studio.desktop /app/share/applications/${FLATPAK_ID}.desktop
+      - install -Dm644 com.blackmagicdesign.DaVinciResolve.Studio.desktop /app/share/applications/${FLATPAK_ID}.desktop
       - |
         ./run_complete_installation.sh --studio
     sources:
@@ -92,4 +92,4 @@ modules:
       - type: file
         path: logo.png
       - type: file
-        path: com.blackmagicdesign.Resolve.Studio.desktop
+        path: com.blackmagicdesign.DaVinciResolve.Studio.desktop

python/main.py

@@ -20,7 +20,7 @@
     download_using_id(download_id)
     print(f"Building meta info...")
     build_metainfo(
-        app_id='com.blackmagicdesign.Resolve.Studio' if is_studio else 'com.blackmagicdesign.Resolve.Free',
+        app_id='com.blackmagicdesign.DaVinciResolve.Studio' if is_studio else 'com.blackmagicdesign.DaVinciResolve.Free',
         app_description="DaVinci Resolve Studio" if is_studio else 'DaVinci Resolve',
         app_tag=app_tag,
     )

python/resolve_download.py

@@ -26,7 +26,7 @@
 }
 
 
-def get_latest_version_information(app_tag: str, refer_id: str = '77ef91f67a9e411bbbe299e595b4cfcc', stable=True):
+def get_latest_version_information(app_tag: str, refer_id: str = 'dfd43085ef224766b06b579ce8a6d097', stable=True):
     response: requests.Response = requests.get(
         f"https://www.blackmagicdesign.com/api/support/latest-stable-version/{app_tag}/linux"
         if stable else
@@ -49,7 +49,7 @@ def get_latest_version_information(app_tag: str, refer_id: str = '77ef91f67a9e41
     ), parsed_response["linux"]["releaseId"], parsed_response["linux"]["downloadId"])
 
 
-def download_using_id(download_id: str, refer_id: str = "77ef91f67a9e411bbbe299e595b4cfcc"):
+def download_using_id(download_id: str, refer_id: str = "dfd43085ef224766b06b579ce8a6d097"):
     download_url_data = {
         "firstname": "Flatpak",
         "lastname": "Builder",