v2.6.4

* Fixes Tautulli/Tautulli-Issues#294

.github/workflows/publish-installers.yml

@@ -91,33 +91,6 @@ jobs:
           name: Tautulli-${{ matrix.os }}-installer
           path: Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.${{ matrix.ext }}
 
-  discord:
-    name: Discord Notification
-    needs: build-installer
-    if: always() && github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v1
-
-      - name: Combine Job Status
-        id: status
-        run: |
-          failures=(neutral, skipped, timed_out, action_required)
-          if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
-            echo ::set-output name=status::failure
-          else
-            echo ::set-output name=status::$WORKFLOW_CONCLUSION
-          fi
-
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ steps.status.outputs.status }}
-          title: ${{ github.workflow }}
-          nofail: true
-
   release:
     name: Release Installers
     needs: build-installer
@@ -142,9 +115,8 @@ jobs:
       - name: Get Changelog
         id: get_changelog
         run: |
-          changelog=$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md \
+          echo ::set-output name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md \
-            | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )
+            | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )"
-          echo ::set-output name=CHANGELOG::$changelog
 
       - name: Create Release
         uses: actions/create-release@v1
@@ -168,7 +140,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Tautulli-windows-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.exe
+          asset_path: Tautulli-windows-installer/Tautulli-windows-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.exe
           asset_name: Tautulli-windows-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.exe
           asset_content_type: application/vnd.microsoft.portable-executable
 
@@ -179,6 +151,33 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Tautulli-macos-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.pkg
+          asset_path: Tautulli-macos-installer/Tautulli-macos-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.pkg
           asset_name: Tautulli-macos-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.pkg
           asset_content_type: application/vnd.apple.installer+xml
+
+  discord:
+    name: Discord Notification
+    needs: [build-installer, release]
+    if: always() && github.event_name != 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get Build Job Status
+        uses: technote-space/workflow-conclusion-action@v1
+
+      - name: Combine Job Status
+        id: status
+        run: |
+          failures=(neutral, skipped, timed_out, action_required)
+          if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
+            echo ::set-output name=status::failure
+          else
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
+          fi
+
+      - name: Post Status to Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}
+          status: ${{ steps.status.outputs.status }}
+          title: ${{ github.workflow }}
+          nofail: true

.github/workflows/publish-snap.yml

@@ -66,16 +66,6 @@ jobs:
           snap: ${{ steps.build.outputs.snap }}
           release: ${{ steps.prepare.outputs.RELEASE }}
 
-      - name: Publish Snap Package (beta)
-        uses: snapcore/action-publish@v1
-        if: >
-          github.event_name != 'pull_request' &&
-          startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-beta')
-        with:
-          store_login: ${{ secrets.SNAP_LOGIN }}
-          snap: ${{ steps.build.outputs.snap }}
-          release: beta
-
   discord:
     name: Discord Notification
     needs: build-snap

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.6.4 (2020-12-20)
+
+* Other:
+  * Fix: Restore Snap data folder from previous installs.
+
+
 ## v2.6.3 (2020-12-19)
 
 * Announcements:

plexpy/version.py

@@ -18,4 +18,4 @@
 from __future__ import unicode_literals
 
 PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v2.6.3"
+PLEXPY_RELEASE_VERSION = "v2.6.4"

snap/snapcraft.yaml

@@ -51,8 +51,8 @@ apps:
   tautulli:
     command: >
       usr/bin/python3 $SNAP/Tautulli.py
-        --datadir $SNAP_USER_COMMON/Tautulli
+        --datadir $SNAP_COMMON/Tautulli
-        --config $SNAP_USER_COMMON/Tautulli/config.ini
+        --config $SNAP_COMMON/Tautulli/config.ini
         --quiet
         --nolaunch
     daemon: simple