Merge remote-tracking branch 'upstream/main' into feat-uninstall-button

Author: ctrlaltf24

.github/workflows/autobuild-main.yml

@@ -11,26 +11,32 @@ jobs:
       branch: main
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: x86_64
+          - runner: ubuntu-24.04-arm
+            arch: arm
+
     needs: build
     permissions:
       contents: write
     steps:
     - name: Download artifact from build job
       uses: actions/download-artifact@v4
       with:
-        name: ${{ needs.build.outputs.bin_name }}
-    - name: Run shell tasks
-      run: |
-        find -name oudedetai -type f -exec chmod +x {} \;
+        name: oudedetai-${{ matrix.arch }}
+
+    - name: Make binary executable
+      run: chmod +x oudedetai-${{ matrix.arch }}
+
     - name: Upload release to test repo
       uses: softprops/action-gh-release@v1
       with:
         tag_name: main-latest
-        # target_commitish: ${{ needs.build.outputs.sha }}
-        body: ''
         prerelease: true
-        files: ${{ needs.build.outputs.bin_name }}
+        files: oudedetai-${{ matrix.arch }}
         repository: FaithLife-Community/test-builds
         token: ${{ secrets.N8MARTI_ACCESS_TOKEN }}
-        

.github/workflows/build-branch.yml

@@ -6,9 +6,12 @@ on:
         required: true
         type: string
     outputs:
-      bin_name:
-        description: "name of built binary"
-        value: ${{ jobs.build.outputs.bin_name }}
+      bin_name_x86_64:
+        description: "name of x86_64 built binary"
+        value: ${{ jobs.build.outputs.bin_name_x86_64 }}
+      bin_name_arm:
+        description: "name of ARM built binary"
+        value: ${{ jobs.build.outputs.bin_name_arm }}
       sha:
         value: ${{ github.sha }}
       sha_short:
@@ -26,9 +29,17 @@ jobs:
     uses: ./.github/workflows/run-tests.yml
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: x86_64
+          - runner: ubuntu-24.04-arm
+            arch: arm
     outputs:
-      bin_name: ${{ steps.pyinstaller.outputs.bin_name }}
+      bin_name_x86_64: ${{ steps.pyinstaller.outputs.bin_name_x86_64 }}
+      bin_name_arm: ${{ steps.pyinstaller.outputs.bin_name_arm }}
       sha_short: ${{ steps.sha.outputs.sha_short }}
     steps:
     - uses: actions/checkout@v4
@@ -57,12 +68,15 @@ jobs:
     - name: Build with pyinstaller
       id: pyinstaller
       run: |
-        ./scripts/build-binary.sh
-        echo "bin_name=oudedetai" >> $GITHUB_OUTPUT
+        ARCH=${{ matrix.arch }}
+        ./scripts/build-binary.sh $ARCH
+        BIN_NAME="oudedetai-${ARCH}"
+        echo "bin_name_${ARCH}=$BIN_NAME" >> $GITHUB_OUTPUT
+        mv dist/oudedetai "dist/$BIN_NAME"
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: oudedetai
-        path: dist/oudedetai
+        name: ${{ steps.pyinstaller.outputs.bin_name_x86_64 || steps.pyinstaller.outputs.bin_name_arm }}
+        path: dist/${{ steps.pyinstaller.outputs.bin_name_x86_64 || steps.pyinstaller.outputs.bin_name_arm }}
         compression-level: 0

.github/workflows/build-release.yml

@@ -21,21 +21,32 @@ jobs:
       branch: main
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: x86_64
+          - runner: ubuntu-24.04-arm
+            arch: arm
     needs: build
     permissions:
       contents: write
     steps:
-    - name: download
+    - name: Download artifact from build job
       uses: actions/download-artifact@v4
       with:
-        name: oudedetai
-    - name: release
+        name: oudedetai-${{ matrix.arch }}
+
+    - name: Make binary executable
+      run: chmod +x oudedetai-${{ matrix.arch }}
+
+    - name: Upload release to GitHub
       uses: softprops/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ inputs.tag }}
         draft: true
         prerelease: ${{ inputs.prerelease }}
-        files: ${{ needs.build.outputs.bin_name }}
+        files: oudedetai-${{ matrix.arch }}

.github/workflows/build-snap.yml

@@ -0,0 +1,37 @@
+name: Build snap
+on:
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: |
+        sudo apt install -y snapd
+        sudo snap install --classic snapcraft
+        # It would be ideal to add current user to the lxd group, but that's not easy in GHA
+        sudo lxd init --auto
+        sudo chmod -R o+r ${{github.workspace}}
+        sudo chown -R :lxd ${{github.workspace}}
+    - name: Patch snapcraft.yaml
+      run: |
+        echo We want to build from the current branch not re-pull from git.
+        sed -i 's#source: https://github.com/FaithLife-Community/LogosLinuxInstaller.git#source: https://github.com/FaithLife-Community/LogosLinuxInstaller.git\n    source-commit: ${{ github.sha }}#' snap/snapcraft.yaml
+        sed -zi 's#override-pull: |\n      craftctl default\n      craftctl set version=$(git describe --tag)#override-pull: |\n      craftctl default\n      craftctl set version=dev-$(git rev-parse --short HEAD)#' snap/snapcraft.yaml
+    - name: Debug information
+      run: |
+        sudo ls -al ${{github.workspace}}
+        sudo ls -al ${{github.workspace}}/ou_dedetai/assets
+        cat snap/snapcraft.yaml
+    - name: Build snap
+      working-directory: snap
+      run: |
+        sudo snapcraft || (echo "dumping failure log:";sudo bash -c 'cat /root/.local/state/snapcraft/log/*.log'; exit 1)
+        ls -al
+    - name: Upload snap
+      uses: actions/upload-artifact@v4
+      with:
+        name: oudedetai-${{ github.sha }}.snap
+        path: snap/*.snap

.github/workflows/build-test.yml

@@ -14,25 +14,31 @@ jobs:
       branch: ${{ inputs.branch }}
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            arch: x86_64
+          - runner: ubuntu-24.04-arm
+            arch: arm
     needs: build
     permissions:
       contents: write
     steps:
     - name: Download artifact from build job
       uses: actions/download-artifact@v4
       with:
-        name: ${{ needs.build.outputs.bin_name }}
+        name: oudedetai-${{ matrix.arch }}
+
     - name: Fix file permissions
-      run: |
-        find -name oudedetai -type f
-        find -name oudedetai -type f -exec chmod +x {} \;
+      run: chmod +x oudedetai-${{ matrix.arch }}
+
     - name: Upload release to test repo
       uses: softprops/action-gh-release@v1
       with:
         tag_name: ${{ inputs.branch }}-${{ needs.build.outputs.sha_short }}
         prerelease: true
-        files: ${{ needs.build.outputs.bin_name }}
+        files: oudedetai-${{ matrix.arch }}
         repository: FaithLife-Community/test-builds
         token: ${{ secrets.N8MARTI_ACCESS_TOKEN }}
-        

ou_dedetai/app.py

@@ -136,7 +136,7 @@ def approve_or_exit(self, question: str, context: Optional[str] = None) -> bool:
 
     def approve(self, question: str, context: Optional[str] = None) -> bool:
         """Asks the user a y/n question"""
-        question = (f"{context}\n" if context else "") + question
+        question = (f"{context}\n\n" if context else "") + question
         options = ["Yes", "No"]
         return self.ask(question, options) == "Yes"
 

ou_dedetai/config.py

@@ -490,6 +490,18 @@ def get_logos_appdata_dir(
     return f'{wine_prefix}/drive_c/users/{wine_user}/AppData/Local/{faithlife_product}'
 
 
+def get_logos_user_id(
+    logos_appdata_dir: str
+) -> Optional[str]:
+    logos_data_path = Path(logos_appdata_dir) / "Data"
+    contents = os.listdir(logos_data_path)
+    children = [logos_data_path / child for child in contents]
+    file_children = [child for child in children if child.is_dir()]
+    if file_children and len(file_children) > 0:
+        return file_children[0].name
+    else:
+        return None
+
 class Config:
     """Set of configuration values. 
     
@@ -792,6 +804,14 @@ def _logos_appdata_dir(self) -> Optional[str]:
             self.faithlife_product
         )
 
+    @property
+    def _logos_user_id(self) -> Optional[str]:
+        """Name of the Logos user id throughout the app"""
+        logos_appdata_dir = self._logos_appdata_dir
+        if logos_appdata_dir is None:
+            return None
+        return get_logos_user_id(logos_appdata_dir)
+
     @property
     # This used to be called WINEPREFIX
     def wine_prefix(self) -> str:
@@ -814,7 +834,16 @@ def wine_binary(self) -> str:
         # Return the full path so we the callee doesn't need to think about it
         if self._raw.wine_binary is not None and not Path(self._raw.wine_binary).exists() and (Path(self.install_dir) / self._raw.wine_binary).exists(): # noqa: E501
             return str(Path(self.install_dir) / self._raw.wine_binary)
-        if not Path(output).exists():
+        # Output a warning if the path doesn't exist and isn't relative to
+        # the install dir.
+        # In the case of appimage, this won't exist for part of the 
+        # installation, but still is valid. And the appimage uses a relative
+        # path or an absolute that's relative to the install dir
+        if (
+            not Path(output).exists()
+            and Path(output).is_absolute()
+            and not Path(output).is_relative_to(self.install_dir)
+        ):
             logging.warning(f"Wine binary {output} doesn't exist")
         return output
 

ou_dedetai/constants.py

@@ -61,7 +61,7 @@ def get_runmode() -> str:
 else:
     CACHE_DIR = str(Path(os.getenv('XDG_CACHE_HOME', Path.home() / '.cache' / 'FaithLife-Community'))) #noqa: E501
 
-DATA_HOME = str(Path(os.getenv('XDG_DATA_HOME', Path.home() / '.local/share') / 'FaithLife-Community')) #noqa: E501
+DATA_HOME = str(Path(os.getenv('XDG_DATA_HOME', str(Path.home() / '.local/share'))) / 'FaithLife-Community') #noqa: E501
 CONFIG_DIR = os.getenv("XDG_CONFIG_HOME", "~/.config") + "/FaithLife-Community"
 STATE_DIR = os.getenv("XDG_STATE_HOME", "~/.local/state") + "/FaithLife-Community"
 
@@ -91,7 +91,7 @@ def get_runmode() -> str:
 FAITHLIFE_PRODUCTS = ["Logos", "Verbum"]
 FAITHLIFE_PRODUCT_VERSIONS = ["10"] # This used to include 9
 
-SUPPORT_MESSAGE = f"If you need help, please consult:\n{WIKI_LINK}\nIf that doesn't answer your question, please use the \"Get Support\" option"  # noqa: E501
+SUPPORT_MESSAGE = f"If you need help, please consult:\n{WIKI_LINK}\nIf the install failed, use the \"Get Support\" operation"  # noqa: E501
 DEFAULT_SUPPORT_FILE_NAME = "FaithlifeCommunitySupport.zip"
 
 # Strings for choosing a follow up file or directory