.dockerignore

@@ -3,9 +3,6 @@
 .gitignore
 contrib
 init-scripts
-package
 pylintrc
-snap
 *.md
 !CHANGELOG*.md
-start.bat

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 github: JonnyWong16 
 patreon: Tautulli
-custom: ["https://bit.ly/2InPp15", "https://bit.ly/2WTq83m"]
+custom: ["https://bit.ly/2InPp15"]

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -1,103 +0,0 @@
-name: Bug Report
-description: Please do not use bug reports for support issues.
-labels: ['status:awaiting-triage', 'type:bug']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!** Please use [Discord](https://tautulli.com/discord) for support issues.
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the Bug
-      description: A clear and concise description of the bug.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to Reproduce
-      description: List each action required in order to reproduce the issue.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: Provide screenshots to help explain your problem.
-  - type: textarea
-    id: relevant
-    attributes:
-      label: Relevant Settings
-      description: Include all settings/configuration that are relevant to your issue. For example, Plex Media Server, newsletter, or notification settings.
-      placeholder: |
-        - eg. Plex Media Server IP address/port/checkboxes/proxy/etc.
-        - eg. Notification agent configuration/triggers/conditions/text/delay/grouping/etc.
-        - eg. Newsletter agent configuration/checkboxes/template/etc.
-        - Other settings
-  - type: input
-    id: version
-    attributes:
-      label: Tautulli Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. v2.7.5
-    validations:
-      required: true
-  - type: input
-    id: branch
-    attributes:
-      label: Git Branch
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. master
-    validations:
-      required: true
-  - type: input
-    id: hash
-    attributes:
-      label: Git Commit Hash
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. 2cc5bf812fe05e0666aeaeb37ed550c59816fb4c
-    validations:
-      required: true
-  - type: input
-    id: platform
-    attributes:
-      label: Platform and Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. Windows 10
-    validations:
-      required: true
-  - type: input
-    id: python
-    attributes:
-      label: Python Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. 3.8.10
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: Browser and Version
-      placeholder: eg. Chrome 88
-    validations:
-      required: true
-  - type: input
-    id: logs
-    attributes:
-      label: Link to Logs
-      description: Include a link to your **FULL** logs (not just a few lines) on [Gist](http://gist.github.com).
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        Make sure to close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.

.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml

@@ -1,31 +0,0 @@
-name: Feature Request
-description: Suggest a new feature for Tautulli.
-labels: ['status:awaiting-triage', 'type:enhancement']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to help improve Tautulli!
-  - type: textarea
-    id: problem
-    attributes:
-      label: Is your feature request related to a problem?
-      description: If so, please provide clear and concise description of the problem.
-      placeholder: eg. I'm always frustrated when '...'
-  - type: textarea
-    id: feature
-    attributes:
-      label: What is your feature request?
-      description: A clear and concise description of the feature.
-    validations:
-      required: true
-  - type: textarea
-    id: workaround
-    attributes:
-      label: Are there any workarounds?
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional Context
-      description: Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Tautulli Wiki
-    url: https://github.com/Tautulli/Tautulli/wiki
-    about: Please check the wiki to see if your question has already been answered.
-  - name: Discord
-    url: https://tautulli.com/discord
-    about: Please use Discord to ask for support.

.github/codeql-config.yml

@@ -1,4 +0,0 @@
-name: CodeQL Config
-
-paths-ignore:
-  - lib

.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    target-branch: "nightly"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    target-branch: "nightly"
-    open-pull-requests-limit: 20

.github/label-actions.yml

@@ -1,48 +0,0 @@
-# Configuration for Label Actions - https://github.com/dessant/label-actions
-
-added:
-  comment: >
-    This feature has been added and will be available in the next release of Tautulli.
-    This issue will be automatically closed once the update is available.
-
-fixed:
-  comment: >
-    This bug has been fixed and will be available in the next release of Tautulli.
-    This issue will be automatically closed once the update is available.
-
-invalid:duplicate:
-  comment: >
-    :wave: @{issue-author}, this appears to be a duplicate of a pre-existing issue.
-  close: true
-  lock: true
-  unlabel: 'status:awaiting-triage'
-
--invalid:duplicate:
-  reopen: true
-  unlock: true
-
-invalid:support:
-  comment: >
-    :wave: @{issue-author}, we use the issue tracker exclusively for bug reports.
-    However, this issue appears to be a support request. Please use our
-    [Discord Server](https://tautulli.com/discord) to get help with Tautulli. Thanks.
-  close: true
-  lock: true
-  lock-reason: 'off-topic'
-  unlabel: 'status:awaiting-triage'
-
--invalid:support:
-  reopen: true
-  unlock: true
-
-invalid:template-incomplete:
-  issues:
-    comment: >
-      :wave: @{issue-author}, please edit your issue to complete the template with
-      all the required info. Your issue will be automatically closed in 5 days if
-      the template is not completed. Thanks.
-  prs:
-    comment: >
-      :wave: @{issue-author}, please edit your PR to complete the template with
-      all the required info. Your PR will be automatically closed in 5 days if
-      the template is not completed. Thanks.

.github/pull_request_template.md

@@ -1,26 +0,0 @@
-## Description
-
-Please include a summary of the changes.
-
-### Screenshot
-
-Include screenshots if the changes are UI-related.
-
-### Issues Fixed or Closed
-
-- Fixes #(issue)
-
-## Type of Change
-
-Please delete options that are not relevant.
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-
-## Checklist
-
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have added or updated the docstring for new or existing methods

.github/workflows/codeql.yml

@@ -1,38 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches: [nightly]
-  pull_request:
-    branches: [nightly]
-  schedule:
-    - cron: '05 10 * * 1'
-
-jobs:
-  codeql-analysis:
-    name: CodeQL Analysis
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript', 'python']
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        config-file: ./.github/codeql-config.yml
-        languages: ${{ matrix.language }}
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/issues-stale.yml

@@ -1,48 +0,0 @@
-name: Stale Issues / PRs
-
-on:
-  schedule:
-    - cron: '00 19 * * *'
-
-jobs:
-  stale:
-    name: Check Issues / PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Stale
-        uses: actions/stale@v9
-        with:
-          stale-issue-message: >
-            This issue is stale because it has been open for 30 days with no activity.
-            Remove the stale label or comment, otherwise this will be closed in 5 days.
-          close-issue-message: >
-            This issue was closed because it has been stalled for 5 days with no activity.
-          stale-issue-label: 'stale'
-          exempt-issue-labels: 'added,fixed,type:enhancement,status:awaiting-triage,status:in-progress'
-          stale-pr-message: >
-            This PR is stale because it has been open for 30 days with no activity.
-            Remove the stale label or comment, otherwise this will be closed in 5 days.
-          close-pr-message: >
-            This PR was closed because it has been stalled for 5 days with no activity.
-          stale-pr-label: 'stale'
-          exempt-pr-labels: 'status:in-progress,status:in-review,dependencies'
-          days-before-stale: 30
-          days-before-close: 5
-
-      - name: Invalid Template
-        uses: actions/stale@v9
-        with:
-          stale-issue-message: >
-            Invalid issues template.
-          close-issue-message: >
-            This issue was closed because the the template was not completed after 5 days.
-          stale-issue-label: 'invalid:template-incomplete'
-          stale-pr-message: >
-            Invalid PR template.
-          close-pr-message: >
-            This PR was closed because the the template was not completed after 5 days.
-          stale-pr-label: 'invalid:template-incomplete'
-          exempt-pr-labels: 'status:in-progress,status:in-review,dependencies'
-          only-labels: 'invalid:template-incomplete'
-          days-before-stale: 0
-          days-before-close: 5

.github/workflows/issues.yml

@@ -1,15 +0,0 @@
-name: Issues
-
-on:
-  issues:
-    types: [labeled, unlabeled]
-
-jobs:
-  label:
-    name: Label Issues
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label Issues
-        uses: dessant/label-actions@v4
-        with:
-          github-token: ${{ github.token }}

.github/workflows/publish-docker.yml

@@ -1,108 +1,83 @@
 name: Publish Docker
-
 on:
-  workflow_dispatch: ~
   push:
     branches: [master, beta, nightly]
     tags: [v*]
-
 jobs:
-  build-docker:
-    name: Build Docker Image
+  build:
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
       - name: Prepare
         id: prepare
         run: |
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+            echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
           elif [[ $GITHUB_REF == refs/heads/master ]]; then
-            echo "tag=latest" >> $GITHUB_OUTPUT
+            echo ::set-output name=tag::latest
           else
-            echo "tag=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+            echo ::set-output name=tag::${GITHUB_REF#refs/heads/}
           fi
-          if [[ $GITHUB_REF == refs/tags/*-beta ]]; then
-            echo "branch=beta" >> $GITHUB_OUTPUT
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "branch=master" >> $GITHUB_OUTPUT
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            echo ::set-output name=branch::master
           else
-            echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
+            echo ::set-output name=branch::${GITHUB_REF#refs/heads/}
           fi
-          echo "commit=${GITHUB_SHA}" >> $GITHUB_OUTPUT
-          echo "docker_platforms=linux/amd64,linux/arm64/v8,linux/arm/v7,linux/arm/v6" >> $GITHUB_OUTPUT
-          echo "docker_image=${{ secrets.DOCKER_REPO }}/tautulli" >> $GITHUB_OUTPUT
-
-      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
+          echo ::set-output name=commit::${GITHUB_SHA}
+          echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          echo ::set-output name=docker_platforms::linux/amd64,linux/arm64,linux/arm
+          echo ::set-output name=docker_image::tautulli/tautulli
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
         id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
         with:
           version: latest
 
-      - name: Cache Docker Layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+      - name: Checkout
+        uses: actions/checkout@v2
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
+      - name: Docker Buildx (no push)
+        run: |
+          docker buildx build \
+            --platform ${{ steps.prepare.outputs.docker_platforms }} \
+            --output "type=image,push=false" \
+            --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \
+            --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \
+            --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \
+            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \
+            --file Dockerfile .
+
+      - name: Docker Login
         if: success()
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      - name: Docker Buildx (push)
         if: success()
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+        run: |
+          docker buildx build \
+            --platform ${{ steps.prepare.outputs.docker_platforms }} \
+            --output "type=image,push=true" \
+            --build-arg "TAG=${{ steps.prepare.outputs.tag }}" \
+            --build-arg "BRANCH=${{ steps.prepare.outputs.branch }}" \
+            --build-arg "COMMIT=${{ steps.prepare.outputs.commit }}" \
+            --build-arg "BUILD_DATE=${{ steps.prepare.outputs.build_date }}" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}" \
+            --file Dockerfile .
 
-      - name: Extract Docker Metadata
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ steps.prepare.outputs.docker_image }}
+      - name: Clear
+        if: always()
+        run: |
+          rm -f ${HOME}/.docker/config.json
 
-      - name: Docker Build and Push
-        uses: docker/build-push-action@v6
-        if: success()
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: ${{ steps.prepare.outputs.docker_platforms }}
-          build-args: |
-            TAG=${{ steps.prepare.outputs.tag }}
-            BRANCH=${{ steps.prepare.outputs.branch }}
-            COMMIT=${{ steps.prepare.outputs.commit }}
-          tags: |
-            ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
-            ghcr.io/${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
-          labels: ${{ steps.metadata.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-
-  discord:
-    name: Discord Notification
-    needs: build-docker
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1
+        if: always()
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-docker.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
+          status: ${{ job.status }}
+          job: ${{ github.workflow }}
           nofail: true

.github/workflows/publish-installers.yml

@@ -1,178 +0,0 @@
-name: Publish Installers
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [master, beta, nightly]
-    tags: [v*]
-
-env:
-  PYTHON_VERSION: '3.11'
-
-jobs:
-  build-installer:
-    name: Build ${{ matrix.os_upper }} Installer
-    runs-on: ${{ matrix.os }}-${{ matrix.os_version }}
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'windows'
-            os_upper: 'Windows'
-            os_version: 'latest'
-            arch: 'x64'
-            ext: 'exe'
-          - os: 'macos'
-            os_upper: 'MacOS'
-            os_version: '14'
-            arch: 'universal'
-            ext: 'pkg'
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set Release Version
-        id: get_version
-        shell: bash
-        run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
-            VERSION_NSIS=${GITHUB_REF#refs/tags/v}.1
-            echo "VERSION_NSIS=${VERSION_NSIS/%-beta.1/.0}" >> $GITHUB_OUTPUT
-            echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=0.0.0" >> $GITHUB_ENV
-            echo "VERSION_NSIS=0.0.0.0" >> $GITHUB_OUTPUT
-            echo "VERSION=0.0.0" >> $GITHUB_OUTPUT
-            echo "RELEASE_VERSION=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
-          fi
-          if [[ $GITHUB_REF == refs/tags/*-beta ]]; then
-            echo "beta" > branch.txt
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "master" > branch.txt
-          else
-            echo ${GITHUB_REF#refs/heads/} > branch.txt
-          fi
-          echo $GITHUB_SHA > version.txt
-
-      - name: Set Up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: pip
-          cache-dependency-path: '**/requirements*.txt'
-
-      - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r package/requirements-package.txt --no-binary cffi
-
-      - name: Build Package
-        run: |
-          pyinstaller -y ./package/Tautulli-${{ matrix.os }}.spec
-
-      - name: Create Windows Installer
-        uses: joncloud/makensis-action@v4.1
-        if: matrix.os == 'windows'
-        with:
-          script-file: ./package/Tautulli.nsi
-          arguments: >
-            /DVERSION=${{ steps.get_version.outputs.VERSION_NSIS }}
-            /DINSTALLER_NAME=..\Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-          additional-plugin-paths: package/nsis-plugins
-
-      - name: Create MacOS Installer
-        if: matrix.os == 'macos'
-        run: |
-          sudo pkgbuild \
-            --install-location /Applications \
-            --version ${{ steps.get_version.outputs.VERSION }} \
-            --component ./dist/Tautulli.app \
-            --scripts ./package/macos-scripts \
-            Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-
-      - name: Upload Installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: Tautulli-${{ matrix.os }}-installer
-          path: Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-
-  virus-total:
-    name: VirusTotal Scan
-    needs: build-installer
-    if: needs.build-installer.result == 'success' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Installers
-        if: needs.build-installer.result == 'success'
-        uses: actions/download-artifact@v4
-
-      - name: Upload to VirusTotal
-        uses: crazy-max/ghaction-virustotal@v4
-        with:
-          vt_api_key: ${{ secrets.VT_API_KEY }}
-          files: |
-            Tautulli-windows-installer/Tautulli-windows-*-x64.exe
-            Tautulli-macos-installer/Tautulli-macos-*-universal.pkg
-
-  release:
-    name: Release Installers
-    needs: build-installer
-    if: always() && startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set Release Version
-        id: get_version
-        run: |
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-
-      - name: Download Installers
-        if: needs.build-installer.result == 'success'
-        uses: actions/download-artifact@v4
-
-      - name: Get Changelog
-        id: get_changelog
-        run: |
-          CHANGELOG="$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md \
-            | sed '$d' | sed '$d' | sed '$d' )"
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "CHANGELOG<<$EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "$EOF" >> $GITHUB_OUTPUT
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GHACTIONS_TOKEN }}
-        with:
-          tag_name: ${{ steps.get_version.outputs.RELEASE_VERSION }}
-          name: Tautulli ${{ steps.get_version.outputs.RELEASE_VERSION }}
-          body: |
-            ## Changelog
-            
-            ##${{ steps.get_changelog.outputs.CHANGELOG }}
-          prerelease: ${{ endsWith(steps.get_version.outputs.RELEASE_VERSION, '-beta') }}
-          files: |
-            Tautulli-windows-installer/Tautulli-windows-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.exe
-            Tautulli-macos-installer/Tautulli-macos-${{ steps.get_version.outputs.RELEASE_VERSION }}-universal.pkg
-
-  discord:
-    name: Discord Notification
-    needs: [build-installer, release]
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-installer.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
-          nofail: true

.github/workflows/publish-release.yml

@@ -0,0 +1,28 @@
+name: Publish Release
+on:
+  push:
+    tags: [v*]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@master
+      - name: Get Release Version
+        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/tags/}
+      - name: Get Changelog
+        run: echo ::set-env 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' )"
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_VERSION }}
+          release_name: Tautulli ${{ env.RELEASE_VERSION }}
+          body: |
+            ## Changelog
+            
+            ##${{ env.CHANGELOG }}
+          draft: false
+          prerelease: ${{ endsWith(env.RELEASE_VERSION, '-beta') }}

.github/workflows/publish-snap.yml

@@ -1,78 +0,0 @@
-name: Publish Snap
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [master, beta, nightly]
-    tags: [v*]
-
-jobs:
-  build-snap:
-    name: Build Snap Package (${{ matrix.architecture }})
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        architecture:
-          - amd64
-          - arm64
-          - armhf
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        id: prepare
-        run: |
-          git fetch --prune --unshallow --tags
-          if [[ $GITHUB_REF == refs/tags/*-beta || $GITHUB_REF == refs/heads/beta ]]; then
-            echo "RELEASE=beta" >> $GITHUB_OUTPUT
-          elif [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
-          else
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Build Snap Package
-        uses: diddlesnaps/snapcraft-multiarch-action@master
-        id: build
-        with:
-          architecture: ${{ matrix.architecture }}
-
-      - name: Upload Snap Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: Tautulli-snap-package-${{ matrix.architecture }}
-          path: ${{ steps.build.outputs.snap }}
-
-      - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@master
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-
-      - name: Publish Snap Package
-        uses: snapcore/action-publish@v1
-        if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly'
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-          release: ${{ steps.prepare.outputs.RELEASE }}
-
-  discord:
-    name: Discord Notification
-    needs: build-snap
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-snap.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
-          nofail: true

.github/workflows/pull-requests.yml

@@ -1,27 +0,0 @@
-name: Pull Requests
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, edited, reopened]
-
-jobs:
-  check-branch:
-    name: Check Pull Request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Comment on Pull Request
-        uses: mshick/add-pr-comment@v2
-        if: github.base_ref != 'nightly'
-        with:
-          message: Pull requests must be made to the `nightly` branch. Thanks.
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Fail Workflow
-        if: github.base_ref != 'nightly'
-        run: |
-          echo Base: "$GITHUB_BASE_REF"
-          echo Head: "$GITHUB_HEAD_REF"
-          exit 1

.github/workflows/submit-winget.yml

@@ -1,44 +0,0 @@
-name: Submit winget
-
-on:
-  workflow_dispatch: ~
-  release:
-    types: [published]
-
-jobs:
-  winget:
-    name: Submit Winget Package
-    runs-on: windows-latest
-    if: ${{ !github.event.release.prerelease }}
-    steps:
-      - name: Sync Winget Fork
-        run: gh repo sync ${{ secrets.WINGET_USERNAME }}/winget-pkgs -b master
-        env:
-          GH_TOKEN: ${{ secrets.WINGET_TOKEN }}
-
-      - name: Submit package to Windows Package Manager Community Repository
-        run: |
-          $wingetPackage = "Tautulli.Tautulli"
-          $gitToken = "${{ secrets.WINGET_TOKEN }}"
-
-          $github = Invoke-RestMethod -uri "https://api.github.com/repos/Tautulli/Tautulli/releases/latest"
-          $installerUrl = $github | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match "Tautulli-windows-.*-x64.exe" | Select -ExpandProperty browser_download_url
-          $version = "$($github.tag_name.Trim('v')).1"
-          
-          # getting latest wingetcreate file
-          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          .\wingetcreate.exe update $wingetPackage -s -v $version -u $installerUrl -t $gitToken
-
-  virus-total:
-    name: VirusTotal Scan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Upload to VirusTotal
-        uses: crazy-max/ghaction-virustotal@v4
-        with:
-          vt_api_key: ${{ secrets.VT_API_KEY }}
-          github_token: ${{ secrets.GHACTIONS_TOKEN }}
-          update_release_body: true
-          files: |
-            .exe$
-            .pkg$

.gitignore

@@ -1,7 +1,6 @@
 
 # Compiled source #
 ###################
-__pycache__
 *.pyc
 *.py~
 *.pyproj
@@ -15,22 +14,11 @@ __pycache__
 *.ini
 release.lock
 version.lock
-lib/*.dist-info
-lib/*.egg-info
-lib/*.pth
-lib/*/*.pyd
-lib/_distutils_hack
-lib/pkg_resources
-lib/setuptools
 logs/*
 backups/*
 cache/*
-exports/*
 newsletters/*
 *.mmdb
-version.txt
-branch.txt
-.TEST
 
 # HTTPS Cert/Key #
 ##################
@@ -53,9 +41,6 @@ Thumbs.db
 #Ignore files generated by PyCharm
 *.idea/*
 
-#Ignore files generated by VSCode
-*.vscode/*
-
 #Ignore files generated by vi
 *.swp
 
@@ -76,6 +61,7 @@ Thumbs.db
 *.bak
 *.cache
 *.ilk
+*.log
 [Bb]in
 [Dd]ebug*/
 *.lib
@@ -88,16 +74,3 @@ _ReSharper*/
 /logs
 .project
 .pydevproject
-
-#Ignore files generated by pyinstaller
-/build
-/dist
-
-#snapcraft specifics
-/parts/
-/stage/
-/prime/
-*.snap
-.snapcraft
-*_source.tar.bz2
-snap/.snapcraft

CHANGELOG.md

@@ -1,999 +1,5 @@
 # Changelog
 
-## v2.15.3 (2025-08-03)
-
-* Exporter:
-  * New: Added hearingImpaired for subtitles and visualImpaired for audio attributes to exporter fields.
-* Graphs:
-  * Fix: Remove duplicate "Total" entry in graph tooltips. (Thanks @zdimension) (#2534)
-* UI:
-  * Fix: Failing to retrieve collections / playlists with over 1000 items.
-  * Fix: Scrollbar not showing on macosx and webkit browsers. (#2221)
-  * Fix: Incorrect rounding of minutes in global stats play duration.
-  * Fix: Disable browser autocomplete for notification agent and newsletter agent configurations. (#2557)
-* API:
-  * New: Added ability to return svg files using pms_image_proxy API command.
-* Other:
-  * New: Added ability to set config values using environment variables. (Thanks @komuw) (#2309, #2543)
-
-
-## v2.15.2 (2025-04-12)
-
-* Activity:
-  * New: Added link to library by clicking media type icon.
-  * New: Added stream count to tab title on homepage. (#2517)
-* History:
-  * Fix: Check stream watched status before stream stopped status. (#2506)
-* Notifications:
-  * Fix: ntfy notifications failing to send if provider link is blank.
-  * Fix: Check Pushover notification attachment is under 5MB limit. (#2396)
-  * Fix: Track URLs redirecting to the correct media page. (#2513)
-  * New: Added audio profile notification parameters.
-  * New: Added PATCH method for Webhook notifications.
-* Graphs:
-  * New: Added Total line to daily streams graph. (Thanks @zdimension) (#2497)
-* UI:
-  * Fix: Do not redirect API requests to the login page. (#2490)
-  * Change: Swap source and stream columns in stream info modal.
-* Other:
-  * Fix: Various typos. (Thanks @luzpaz) (#2520)
-  * Fix: CherryPy CORS response header not being set correctly. (#2279)
-
-
-## v2.15.1 (2025-01-11)
-
-* Activity:
-  * Fix: Detection of HDR transcodes. (Thanks @cdecker08) (#2412, #2466)
-* Newsletters:
-  * Fix: Disable basic authentication for /newsletter and /image endpoints. (#2472)
-* Exporter:
-  * New: Added logos to season and episode exports.
-* Other:
-  * Fix: Docker container https health check.
-
-
-## v2.15.0 (2024-11-24)
-
-* Notes:
-  * Support for Python 3.8 has been dropped. The minimum Python version is now 3.9.
-* Notifications:
-  * New: Allow Telegram blockquote and tg-emoji HTML tags. (Thanks @MythodeaLoL) (#2427)
-  * New: Added Plex slug and Plex Watch URL notification parameters. (#2420)
-  * Change: Update OneSignal API calls to use the new API endpoint for Tautulli Remote App notifications.
-* Newsletters:
-  * Fix: Dumping custom dates in raw newsletter json.
-* History:
-  * Fix: Unable to fix match for artists. (#2429)
-* Exporter:
-  * New: Added movie and episode hasVoiceActivity attribute to exporter fields.
-  * New: Added subtitle canAutoSync attribute to exporter fields.
-  * New: Added logos to the exporter fields.
-* UI:
-  * New: Add friendly name to the top bar of config modals. (Thanks @peagravel) (#2432)
-* API:
-  * New: Added plex slugs to metadata in the get_metadata API command.
-* Other:
-  * Fix: Tautulli failing to start with Python 3.13. (#2426)
-
-
-## v2.14.6 (2024-10-12)
-
-* Newsletters:
-  * Fix: Allow formatting newsletter date parameters.
-  * Change: Support apscheduler compatible cron expressions.
-* UI:
-  * Fix: Round runtime before converting to human duration.
-  * Fix: Make recently added/watched rows touch scrollable.
-* Other:
-  * Fix: Auto-updater not running.
-
-
-## v2.14.5 (2024-09-20)
-
-* Activity:
-  * Fix: Display of 2k resolution on activity card.
-* Notifications:
-  * Fix: ntfy notifications with special characters failing to send.
-* Other:
-  * Fix: Memory leak with database closing. (#2404)
-
-
-## v2.14.4 (2024-08-10)
-
-* Notifications:
-  * Fix: Update Slack notification info card.
-  * New: Added ntfy notification agent. (Thanks @nwithan8) (#2356, #2000)
-* UI:
-  * Fix: macOS platform capitalization.
-* Other:
-  * Fix: Remove deprecated getdefaultlocale. (Thanks @teodorstelian) (#2364, #2345)
-
-
-## v2.14.3 (2024-06-19)
-
-* Graphs:
-  * Fix: History table not loading when clicking on the graphs in some instances.
-* UI:
-  * Fix: Scheduled tasks table not loading when certain tasks are disabled.
-  * Removed: Unnecessary Remote Server checkbox from the settings page.
-* Other:
-  * Fix: Webserver not restarting after the setup wizard.
-  * Fix: Workaround webserver crashing in some instances.
-
-
-## v2.14.2 (2024-05-18)
-
-* History:
-  * Fix: Live TV activity not logging to history.
-  * Fix: Incorrect grouping of live TV history.
-* Notifications:
-  * Fix: Pushover configuration settings refreshing after entering a token.
-  * Fix: Plex remote access down notifications not triggering.
-  * Fix: Deleting all images from Cloudinary only deleting 1000 images.
-  * New: Added platform version and product version notification parameters. (#2244)
-  * New: Added LAN streams and WAN streams notification parameters. (#2276)
-  * New: Added Dolby Vision notification parameters. (#2240)
-  * New: Added live TV channel notification parameters.
-  * Change: Improved Tautulli Remote App notification encryption method.
-    * Note: Requires Tautulli Remote App version 3.2.4.
-* Exporter:
-  * New: Added slug attribute to exporter fields.
-  * New: Added track genres to exporter fields.
-  * New: Added playlist source URI to exporter fields.
-  * New: Added artProvider and thumbProvider to exporter fields.
-* UI:
-  * Fix: Mask deleted usernames in the logs.
-  * Fix: Live TV watch stats not showing on the media info page.
-  * Fix: Users without access to Plex server not showing as inactive.
-  * Removed: Deprecated synced item pages.
-  * Removed: Anonymous redirect settings. Links now use browser no-referrer policy instead.
-* API:
-  * New: Added Dolby Vision info to the get_metadata API command.
-  * New: Added before and after parameters to the get_home_stats API command. (#2231)
-* Packages:
-  * New: Universal binary for macOS for Apple silicon.
-  * New: Bump Snap package to core22.
-* Other:
-  * Change: Login cookie expires changed to max-age.
-  * Change: Improved key generation for login password. It is recommended to reenter your HTTP Password in the settings after upgrading.
-  * Removed: Python 2 compatibility code. (#2098, #2226) (Thanks @zdimension)
-
-
-## v2.13.4 (2023-12-07)
-
-* UI:
-  * Fix: Tautulli configuration settings page not loading when system language is None.
-  * Fix: Login cookie expiring too quickly.
-
-
-## v2.13.3 (2023-12-03)
-
-* Notifications:
-  * New: Added duration_time notification parameter.
-  * New: Added file_size_bytes notification parameter.
-  * New: Added time formats notification text modifiers.
-  * New: Added support for thetvdb_url for movies.
-* UI:
-  * Fix: Activity card overflowing due to screen scaling. (#2033)
-  * Fix: Stream duration on activity card not being updated on track changes in some cases. (#2206)
-
-
-## v2.13.2 (2023-10-26)
-
-* History:
-  * New: Added quarter values icons for history watch status. (#2179, #2156) (Thanks @herby2212)
-* Graphs:
-  * New: Added concurrent streams per day graph. (#2046) (Thanks @herby2212)
-* Exporter:
-  * New: Added metadata directory to exporter fields.
-  * Removed: Banner exporter fields for tv shows.
-* UI:
-  * New: Added last triggered time to notification agents and newsletter agent lists.
-* Other:
-  * New: Added X-Plex-Language header override to config file.
-
-
-## v2.13.1 (2023-08-25)
-
-* Notes:
-  * Support for Python 3.7 has been dropped. The minimum Python version is now 3.8.
-* Other:
-  * Fix: Tautulli failing to start on some systems.
-
-
-## v2.13.0 (2023-08-25)
-
-* Notes:
-  * Support for Python 3.7 has been dropped. The minimum Python version is now 3.8.
-* Notifications:
-  * Fix: Improved watched notification trigger description. (#2104)
-  * New: Added notification image option for iOS Tautulli Remote app.
-* Exporter:
-  * New: Added track chapter export fields.
-  * New: Added on-demand subtitle export fields.
-
-
-## v2.12.5 (2023-07-13)
-
-* Activity:
-  * New: Added d3d11va to list of hardware decoders.
-* History:
-  * Fix: Incorrect grouping of play history.
-  * New: Added button in settings to regroup play history.
-* Notifications:
-  * Fix: Incorrect concurrent streams notifications by IP addresss for IPv6 addresses (#2096) (Thanks @pooley182)
-* UI:
-  * Fix: Occasional UI crashing on Python 3.11.
-  * New: Added multiselect user filters to History and Graphs pages. (#2090) (Thanks @zdimension)
-* API:
-  * New: Added regroup_history API command.
-  * Change: Updated graph API commands to accept a comma separated list of user IDs.
-
-
-## v2.12.4 (2023-05-23)
-
-* History:
-  * Fix: Set view offset equal to duration if a stream is stopped within the last 10 sec.
-* Other:
-  * Fix: Database import may fail for some older databases.
-  * Fix: Double-quoted strings for newer versions of SQLite. (#2015, #2057)
-* API:
-  * Change: Return the ID for async API calls (export_metadata, notify, notify_newsletter).
-
-
-## v2.12.3 (2023-04-14)
-
-* Activity:
-  * Fix: Incorrect subtitle decision shown when subtitles are transcoded.
-* History:
-  * Fix: Incorrect order when sorting by the duration column in the history tables.
-* Notifications:
-  * Fix: Logging error when running scripts that use PlexAPI.
-* UI:
-  * Fix: Calculate file sizes setting causing the media info table to fail to load.
-  * Fix: Incorrect artwork and thumbnail shown for Live TV on the Most Active Libraries statistics card.
-* API:
-  * Change: Renamed duration to play_duration in the get_history API response. (Note: duration kept for backwards compatibility.)
-
-
-## v2.12.2 (2023-03-16)
-
-* Other:
-  * Fix: Tautulli not starting on FreeBSD jails.
-
-
-## v2.12.1 (2023-03-14)
-
-* Activity:
-  * Fix: Stop checking for deprecated sync items sessions.
-  * Change: Do not show audio language on activity cards for music.
-* Other:
-  * Fix: Tautulli not starting on macOS.
-
-
-## v2.12.0 (2023-03-13)
-
-* Notifications:
-  * New: Added support for Telegram group topics. (#1980)
-  * New: Added anidb_id and anidb_url notification parameters. (#1973)
-  * New: Added notification triggers for Intro Marker, Commercial Marker, and Credits Marker.
-  * New: Added various intro, commercial, and credits marker notification parameters.
-  * New: Allow setting a custom Pushover notification sound. (#2005)
-  * Change: Notification images are now uploaded directly to Discord without the need for a 3rd party image hosting service.
-  * Change: Automatically strip whitespace from notification condition values.
-  * Change: Trigger watched notifications based on the video watched completion behaviour setting.
-* Exporter:
-  * Fix: Unable to run exporter when using the Snap package. (#2007)
-  * New: Added credits marker, and audio/subtitle settings to export fields.
-* UI:
-  * Fix: Incorrect styling and missing content for collection media info pages.
-  * New: Added edition details field on movie media info pages. (#1957) (Thanks @herby2212)
-  * New: Added setting to change the video watched completion behaviour.
-  * New: Added watch time and user statistics to collection and playlist media info pages. (#1982, #2012) (Thanks @herby2212)
-  * New: Added history table to collection and playlist media info pages.
-  * New: Dynamically change watched status in the UI based on video watched completion behaviour setting.
-  * New: Added hidden setting to override server name.
-  * Change: Move track artist to a details field instead of in the title on track media info pages.
-* API:
-  * New: Added section_id and user_id parameters to get_home_stats API command. (#1944)
-  * New: Added marker info to get_metadata API command results.
-  * New: Added media_type parameter to get_item_watch_time_stats and get_item_user_stats API commands. (#1982) (Thanks @herby2212)
-  * New: Added last_refreshed timestamp to get_library_media_info API command response.
-* Other:
-  * Change: Migrate analytics to Google Analytics 4.
-
-
-## v2.11.1 (2022-12-22)
-
-* Activity:
-  * Fix: Use source language instead of stream language on activity cards.
-* Notifications:
-  * Fix: Blank start time notification parameters causing recently added notifications to fail. (#1940)
-* Other:
-  * Fix: Tautulli failing to start when using python 3.7.
-  * Fix: Snap install failing to start. (#1941)
-  * Fix: Update check crashing when git is missing. (#1943) (Thanks @Minituff)
-
-
-## v2.11.0 (2022-12-22)
-
-* Activity:
-  * New: Added audio and subtitle language to activity cards. (#1831, #1900) (Thanks @fscorrupt)
-* History:
-  * New: Log subtitle language and subtitle forced to database. (#1826)
-* Notifications:
-  * Fix: Validating condition operators would fail with a blank parameter.
-  * New: Added start time and stop time notification parameters. (#1931)
-  * New: Added session_key to LunaSea notification payload. (#1929) (Thanks @JagandeepBrar)
-* Newsletters:
-  * Fix: Allow CSS to support light and dark themes.
-* Exporter:
-  * New: Added editionTitle to movie exporter fields.
-  * Change: m3u8 export changed to .m3u file extension. File is still encoded using UTF-8.
-* UI:
-  * Fix: Link watch statistics to media page using metadata from history. (#1882)
-  * New: Show subtitle language and subtitle forced flag in stream data modal.
-* Other:
-  * Fix: Mask more user and metadata fields for guest access. (#1913)
-  * Change: Disable TLS 1.0 and 1.1 for the webserver. Minimum TLS version is 1.2. (#1870)
-  * Change: Use system language for requests to Plex Media Server.
-
-
-## v2.10.5 (2022-11-07)
-
-* Notifications:
-  * New: Added edition_title notification parameter. (#1838)
-  * Change: Track notifications link to MusicBrainz track instead of album.
-* Newsletters:
-  * New: Added months time frame for newsletters. (#1876)
-* UI:
-  * Fix: Broken link on library statistic cards. (#1852)
-  * Fix: Check for IPv6 host when generating QR code for app registration.
-  * Fix: Missing padding on condition operator dropdown on small screens.
-* Other:
-  * Fix: Launching browser when webserver is bound to IPv6.
-  * New: Tautulli can be installed via the Windows Package Manager (winget).
-  * Change: Separate stdout and stderr console logging. (#1874)
-* API:
-  * Fix: API not returning 400 response code.
-  * New: Added edition_title to get_metadata API response.
-  * New: Added collections to get_children_metadata API response.
-  * New: Added user_thumb to get_history API response.
-  * New: Validate custom notification conditions before saving notification agents. (#1846)
-  * Change: Fallback to parent_thumb for seasons in get_metadata API response.
-
-
-## v2.10.4 (2022-09-05)
-
-* Activity:
-  * New: Added tooltip for quality profile on activity cards.
-* Notifications:
-  * New: Added "does not begin with" and "does not end with" condition operators.
-* UI:
-  * Fix: Album count showing 0 on library statistics.
-  * Fix: Library statistics not showing up for libraries without any history.
-
-
-## v2.10.3 (2022-08-09)
-
-* Notifications:
-  * New: Added JSON support for MQTT notifications. (#1763)
-  * New: Added show year notification parameter.
-* Exporter:
-  * New: Added guids to artist, album, and track metadata export fields.
-  * New: Added languageTag to stream media info export fields.
-* UI:
-  * Fix: Long channel identifier overflowing activity card. (#1802) 
-  * Change: Use the last played item's artwork for library statistics cards. 
-* Other:
-  * Fix: Username log filter causing database to lock up. (#1705)
-  * Change: Username log filter only applies to usernames longer than 3 characters. (#1806)
-* API:
-  * New: Added parent_year and grandparent_year to get_metadata_details API command.
-  * New: Added last played metadata to top_libraries and top_users in get_home_stats API command.
-  * New: Allow fallback to another PMS image in pms_image_proxy API command.
-
-
-## v2.10.2 (2022-07-03)
-
-* Activity:
-  * Fix: Incorrect audio stream info shown on the activity card when playing a secondary audio track.
-* UI:
-  * Fix: Usernames not showing on the home statistics cards.
-  * Fix: Do not save a user's friendly name if it is the same as the username.
-  * Change: Update library icons to the latest Plex style.
-
-
-## v2.10.1 (2022-06-01)
-
-* Notifications:
-  * New: Added support for MusicBrainz (mbid://) guids in notification parameters without MusicBrainz lookup enabled. Requires Plex Media Server 1.27.0 or newer with refreshed Plex Music agent metadata.
-* Mobile App:
-  * Fix: OneSignal validation failing when registering a device.
-* API:
-  * New: Added grandparent_guids and parent_guids to get_metadata API command.
-  * Change: Updated continent in get_geoip_lookup API command.
-  * Change: Removed server_token from from get_users API command.
-  * Change: shared_libraries changed to a list instead of a string for get_users API command.
-
-
-## v2.10.0 (2022-05-23)
-
-* Activity:
-  * Fix: Detection of Dolby Vision missing for PMS 1.26.1.
-* Notifications:
-  * Fix: Parsing of filename notification parameter incorrect for Windows PMS.
-* Exporter:
-  * New: Added additional theme and label export fields.
-* UI:
-  * Fix: Slow loading of collections and playlists tables.
-  * Change: Update default user thumbnail image to match Plex Web.
-* API:
-  * Change: Values for get_users_table and get_libraries_table return an integer instead of "Checked". 
-
-
-## v2.9.7 (2022-04-11)
-
-* UI:
-  * Fix: Managed user missing the username in the Users table. 
-
-
-## v2.9.6 (2022-04-10)
-
-* Activity:
-  * New: Improved display of dynamic range on the activity cards. (Thanks @herby2212)
-* Notifications:
-  * Change: Make include summary option apply to all media types for Discord and Slack notifications.
-* UI:
-  * Fix: Validating Plex login in the setup wizard. (#1697)
-  * New: Added hidden username, email, and full name columns to users table. 
-* Other:
-  * Fix: Apply pms_timeout setting to websocket connection.
-  * Fix: Importing of Plex username instead of the full name. (#1710)
-
-
-## v2.9.5 (2022-03-26)
-
-* Note:
-  * Updated Snap packages are currently unavailable due to an upstream issue.
-* Activity:
-  * Change: Improve calculation for transcode progress bar percentage on the activity cards.
-* History:
-  * Fix: Live TV history filter not working. (#1691) 
-* Newsletter:
-  * Fix: Newsletter not showing different album types. (#1559) 
-* UI:
-  * Fix: Display season summary on the media info page if available with a fallback to show summary. (#1657)
-  * Change: Colour active filter buttons to improve contrast. (#1663)
-* API:
-  * New: Added transcode offset keys to get_activity command.
-* Other:
-  * Fix: Reschedule backup task after changing backup interval. (#1662)
-  * Fix: Dynamic anonymous redirect setting not being enabled by default after the setup wizard.
-  * Fix: Usernames with special characters not being filtered in the logs.
-
-
-## v2.9.4 (2022-02-12)
-
-* UI:
-  * Fix: Setup wizard appearing when restarting after saving settings.
-* Other:
-  * Fix: Stop Tautulli from starting multiple instances on Windows after a clean reinstall. Check the startup items in Windows Task Manager if it is still occurring.
-
-
-## v2.9.3 (2022-02-09)
-
-* UI:
-  * Fix: Setup wizard looping.
-* Other:
-  * Fix: Logger username masking preventing Tautulli from starting on new installs.
-
-
-## v2.9.2 (2022-02-08)
-
-* Notification:
-  * New: Added support for additional Telegram HTML tags.
-  * Removed: Revert Telegram defaulting to MarkdownV2 and only support HTML. (#1635)
-* Other:
-  * Fix: The Local user being masked in the logs.
-
-
-## v2.9.1 (2022-02-07)
-
-* Other:
-  * Fix: Incorrect changelog version number and date.
-
-
-## v2.9.0 (2022-02-07)
-
-* Notification:
-  * New: Added track disc number notification parameter. 
-  * Change: Default Telegram messages to MarkdownV2 when HTML is disabled. (#1635)
-* Exporter:
-  * Fix: Images not being included in export zip file download.
-* UI:
-  * Fix: Favicon missing from the newsletter authentication page.
-  * Fix: IPv6 details not being shown in IP address modal. (#1629)
-  * Fix: PWA not respecting device rotation settings. (#1633)
-  * New: Added intermediary login page to the Plex XML shortcuts.
-  * New: Added setting to mask usernames in logs (enabled by default).
-  * New: Added location, secure connection, and Plex Relay details to IP address modal.
-  * Change: Remove Plex token from the settings page.
-  * Change: Increase verifying server timeout to 30 seconds.
-* API:
-  * New: Added get_tautulli_info API command.
-  * New: Added location, secure, and relayed to get_history API response.
-  * Change: Null pms_token and jwt_token in the response of the get_settings API command. (#1616)
-* Other:
-  * Fix: Better validation of config when saving settings.
-  * Fix: Correct section_id and prevent rating_key collisions when updating metadata. (#1640)
-  * Change: Proxy Plex token check and Plex downloads json through the Tautulli server.
-  * Change: Remove tokens from downloaded database and config files.
-  * Change: Do not import pms_token or jwt_secret when importing a config file.
-
-
-## v2.8.1 (2022-01-04)
-
-* API:
-  * New: Added grouping and query_days parameters to the get_item_watch_time_stats API command.
-  * New: Added grouping parameter to the get_item_user_stats API command.
-  * New: Added total_time to the get_library_user_stats, get_user_player_stats, and get_item_user_stats API command responses.
-  * Removed: media_type parameter no longer required for the get_item_watch_time_stats, and get_item_user_stats API commands. The media type is determined automatically.
-* Other:
-  * Fix: Clean .pyc files automatically after updating.
-  * New: Allow Snap package to access /media and /mnt locations. Refer to the FAQ for instructions on how to enable access.
-
-
-## v2.8.0 (2021-12-15)
-
-* History:
-  * Fix: Live TV history filter not working correctly when combined with other filters.
-  * Fix: Direct Stream history filter not remembering the state when reloading the page.
-  * Fix: History table not loading when no filters are selected.
-  * New: Added watch time and user stats to media info pages. (Thanks @herby2212) (#1417, #1471)
-* Notifications:
-  * New: Added Microsoft Teams notification agent. (#1514)
-  * New: Added Gotify notification agent. (#1584)
-  * New: Add warning message that passwords are not copied when duplicating a notification or newsletter agent. (#1540)
-* Newsletters:
-  * Fix: Different album types not shown on newsletter. (#1559)
-* Exporter:
-  * New: Added album formats, subformats, and sonic analysis export fields.
-* UI:
-  * Fix: Docker config volume message overlapping modal windows. (#1567)
-  * Fix: Different album types not shown on artist media info page.
-  * New: Added show more/less toggle for summaries on media info pages. (#1546)
-  * Change: Do not save datatable page or search states when reloading the page. (#1532)
-  * Change: Improve the Plex log reader.
-* API:
-  * New: Added before and after parameters to the get_history API command.
-* Other:
-  * Fix: Updated Python dependencies. (#1499)
-  * Fix: Some websocket connections not respecting the verify SSL setting. (Thanks @nmaggioni) (#1541)
-  * New: Support for Python 3.10. (#1522)
-  * New: Added dynamic anonymous redirect service setting. (#1526)
-
-
-## v2.7.7 (2021-10-14)
-
-* Notifications:
-  * Fix: Colons and exclamation marks being replaced outside of expressions.
-  * New: Added LunaSea notification agent. Note: Requires a future LunaSea app update to function.
-* Newsletters:
-  * Fix: Star rating not showing on newsletter with the new Plex metadata agents. (#1511)
-* UI:
-  * Fix: Sorting of mobile devices table with uppercase and lowercase device names.
-  * Fix: Various dropdown menus with centered text to left-aligned text.
-* Other:
-  * Fix: Plex.tv account token not changing when fetching a new token.
-  * New: Added check and warning message for missing Docker container volume mount.
-
-
-## v2.7.6 (2021-08-31)
-
-* Notifications:
-  * Fix: Unable to parse colons (:) and exclamation marks (!) in notification text eval strings.
-* Exporter:
-  * Fix: Unable to export playlists and collections from a library. (#1484)
-  * New: Added new episode export fields.
-* Mobile App:
-  * Fix: Unable to scan QR code with dark mode enabled.
-  * New: Tautulli Remote App is out of beta for iOS and can be downloaded in the App Store.
-* Other:
-  * New: Update PlexAPI to 4.6.3.
-  * New: Added popup alert message for Windows and macOS when Tautulli fails to start.
-
-
-## v2.7.5 (2021-07-15)
-
-* History:
-  * Fix: Guest users were unable to view history.
-  * Fix: Most Active Library statistics was counting deleted libraries.
-* Newsletters:
-  * Fix: Incorrect padding on the newsletter configuration modal.
-* Mobile App:
-  * New: Tautulli Remote App is out of beta on Android. The iOS app is available for beta testing on TestFlight.
-* API:
-  * New: Added mobile device platform and version to device registration.
-* Other:
-  * Fix: Unable to remove authentication.
-  * Change: Improve API key and device token security on Python 3.
-  * Remove: Basic Authentication setting.
-
-
-## v2.7.4 (2021-06-19)
-
-* Activity:
-  * Fix: Incorrect quality profile shown on the activity card.
-* Notifications:
-  * New: Added ability to evaluate Python expressions in notification parameters.
-  * New: Added tilde (~) to represent blank notification condition values.
-* Exporter:
-  * Fix: Blank fields missing from csv and json exports. 
-  * New: Added some new exporter fields.
-* Graphs:
-  * Fix: Play counts and durations not matching the homepage statistics.
-* UI:
-  * New: Show search bar in the collapsed menu on the mobile layout. (#1446)
-  * Change: Do not show seconds for total played duration on Users and Libraries tables.
-* Other:
-  * Fix: Check the Tautulli data folder is writable on startup. (#1441)
-  * New: Update PlexAPI to 4.6.1.
-  * Change: Always hash HTTP password in config file.
-
-
-## v2.7.3 (2021-05-22)
-
-* Activity:
-  * Fix: Incorrect quality profile being shown when transcoding to a higher bitrate.
-* Notifications:
-  * New: Added notification parameters for duration values in seconds. (#1434)
-  * New: Added setting to allow repeat Tautulli update notifications. By default the Tautulli update notification will only notify once.
-  * New: Added setting to allow repeat Plex Media Server update notifications. By default the Plex Media Server update notification will only notify once.
-  * New: Added setting to configure the Tautulli update check interval.
-* UI:
-  * Fix: Prevent accidentally closing modals when dragging the mouse outside the window.
-  * Fix: Recently added queue modal not loading. (#1429)
-  * New: Show collections tab in music libraries. (#1421)
-  * New: Added method to logout of active Tautulli sessions from the login logs.
-* API:
-  * Fix: Update edit_user and edit_library doc strings for required parameters. (#1432)
-* Other:
-  * New: Added advanced hidden setting for CherryPy thread pool size. (Thanks @psaab #1425)
-
-
-## v2.7.2 (2021-04-24)
-
-* UI:
-  * New: Show smart collections in the library collections tab.
-
-
-## v2.7.1 (2021-04-22)
-
-* Notifications:
-  * Fix: Recently added single episode being sent as a show notification. (#1420)
-* Newsletters:
-  * Change: Ignore items with incorrect added at dates in the future.
-* Exporter:
-  * Fix: Exporting not working for libraries, collections, and playlists. (#1408)
-* UI:
-  * Fix: Collections and playlist tabs not loading on library and user pages. (#1408)
-  * Fix: Header overlapping graphs tabs on mobile layout. 
-  * Change: Rename "Plays by Period" graph tab to "Media Type".
-  * Removed: Clear logs button removed from main Tautulli logs.
-
-
-## v2.7.0 (2021-04-10)
-
-* History:
-  * New: Added transcode decision filter added to history tables.
-  * New: History table filters changed to allow multiple selections.
-* Notifications:
-  * Fix: Recently added notifications failing due to metadata not being available yet on the Plex server. (#1392)
-  * New: Added separate SSL/TLS support for Email notifications.
-  * New: Added notification image type setting for Tautulli Remote App notifications.
-  * New: Added guid notification parameter.
-  * New: Added a Plex server down notification threshold setting.
-* Newsletters:
-  * Fix: Newsletters would fail if an episode was missing a season number.
-* UI:
-  * Fix: Fixed spacing of rating images on the media info pages.
-  * Fix: Fixed refreshing cached image in the browser.
-  * Fix: Bootstrap tooltips logging javascript errors in some instances.
-  * Fix: Activity card progress bar not filling at 100%. (#1404)
-  * New: Added blurred background to the Most Active Users statistics card.
-  * New: Added transcode decision filter for all history tables.
-  * New: Added an error popup message if the Plex.tv token is no longer valid when visiting the settings page.
-  * New: Added Amazon Alexa platform logo.
-  * Change: Improved loading times for the homepage watch statistics.
-  * Change: Improved loading times for user and library watch time statistics.
-  * Change: Improved loading of the graph's history modal popup.
-  * Change: Automatically trim trailing slashes from the Tautulli Public Domain setting.
-  * Change: Renamed the Plex Media Server "Use SSL" setting to "Use Secure Connection".
-  * Change: Update Microsoft Edge platform logo.
-  * Change: Consider link local IP addresses as local addresses.
-  * Change: Reveal token fields if they are blank to make it easier to input new values.
-* Mobile App:
-  * New: Accept disabled OneSignal ID during device registration.
-* API:
-  * New: Added user fallback image option to the pms_image_proxy command.
-  * New: Added optional include_last_seen parameter to the get_user command.
-  * New: Added optional include_last_accessed parameter to the get_library command.
-  * New: Allow comma separated filter values for the get_history command.
-* Other:
-  * Fix: Importing the newsletter table would fail when manually repairing a corrupted database.
-  * Fix: Make fix match in Tautulli for music case-insensitive.
-  * New: Update PlexAPI to 4.5.2.
-  * Change: Migrate section_id from the session_history_metadata database table to session_history.
-  * Change: Copy the database file to the cache folder when importing a database using the browse option.
-  * Change: Delete the cached database file after successfully importing.
-
-
-## v2.6.10 (2021-03-17)
-
-* Other:
-  * Fix: Configuration upgrade would fail if the Most Active User card was disabled. (#1395)
-
-
-## v2.6.9 (2021-03-17)
-
-* Notifications:
-  * New: Added tautulli_update_exe and tautulli_update_exe notification parameters for Tautulli update notifications.
-* Exporter:
-  * New: Added new TV show export fields for the beta Plex TV agent.
-* UI:
-  * Fix: Some popover images not showing up on hover. (#1391)
-  * Remove: HTTP Host setting removed from the UI. This setting may still be changed in the config file.
-  * New: Added a Most Active Libraries statistics card to the homepage. (Thanks @herby2212) 
-  * New: Mask sensitive text fields in the settings. Settings can be revealed by clicking on the eye icon.
-* Mobile App:
-  * Change: Make OneSignal validation asynchronous to help timeout issues when registering a device.
-* API:
-  * Added top_libraries stat_id option to get_home_stats API commaand.
-* Ohter:
-  * New: Updated PlexAPI to 4.4.1.
-
-
-## v2.6.8 (2021-03-08)
-
-* Mobile App:
-  * New: An all new Tautulli Remote App 2.0. Go to the Google Play link in the settings to download the new version.
-  * Fix: Registering the new app would fail if OneSignal is blocked.
-
-
-## v2.6.7 (2021-03-07)
-
-* History:
-  * New: Added audio language to detailed stream info. (Thanks @herby2212)
-* Notifications:
-  * New: Added season_name notification parameter.
-  * New: Update notifications to support custom season titles.
-* Newsletters:
-  * New: Update recently added newsletter template to support custom season titles.
-* Exporter:
-  * New: Added originalTitle and bannerFile to TV show export fields.
-* UI:
-  * New: Added TVDB rating image to info page for the new Plex TV agent.
-  * New: Update the UI to support custom season titles.
-* API:
-  * Fix: Return rating key for collections/playlists in get_synced_items.
-  * Fix: Return error when delete_synced_item fails.
-  * New: Return sync_media_type for collections/playlist in get_synced_items.
-  * New: Update pms_image_proxy to support playlist composite images.
-* Other:
-  * Remove: Auto-updater for the Windows exe installer due to it being flagged by antivirus software.
-  * New: Updated PlexAPI to 4.4.0.
-
-
-## v2.6.6 (2021-02-06)
-
-* Exporter:
-  * Fix: Exporting failed with long file paths on Windows.
-  * New: Updated various exporter fields.
-  * Change: Renamed collection children to collection items.
-* UI:
-  * Fix: Client side login redirect changed to server side.
-  * Change: Renamed "Fix Metadata" button to "Fix Match".
-* API:
-  * New: Added get_children_metadata API command.
-  * New: Return more metadata from the get_home_stats API command.
-* Other:
-  * New: Updated PlexAPI to 4.3.1.
-
-
-## v2.6.5 (2021-01-09)
-
-* Other:
-  * Fix: Some IP addresses not being masked in the logs.
-  * New: Auto-updater for Windows exe installer.
-  * Change: Allow Snap package to access the user home directory.
-  * Change: Migrate Snap user data to a persistent location that is retained if Tautulli is reinstalled.
-
-
-## v2.6.4 (2020-12-20)
-
-* Other:
-  * Fix: Restore Snap data folder from previous installs.
-
-
-## v2.6.3 (2020-12-19)
-
-* Announcements:
-  * This is the last Tautulli version to support Python 2. Python 3 will be required to continue receiving updates. You can check your Python version on the settings page.
-* Exporter:
-  * Fix: Accessible and exists attributes were blank for media info export level 9.
-* UI:
-  * Fix: Guest usernames were not masked on mouse hover.
-* Other:
-  * Fix: macOS menu bar icon for light and dark mode.
-  * New: Tautulli can officially be installed on Linux using a Snap package. See the installation wiki for details.
-
-
-## v2.6.2 (2020-12-05)
-
-* Notifications:
-  * Change: Send a notification of a user new device for the first time only. This can be toggled off in the settings.
-* Exporter:
-  * Fix: Allow exporting child fields only without requiring the parent fields as well.
-  * Fix: Exporting individual collection would fail.
-  * Change: Remove accessible and exists fields from the default media info export levels. This prevents the Plex server from reading the media files unnecessarily. 
-* Other:
-  * Fix: Enable high resolution for the macOS system tray icon and menu.
-  * New: Added rate limiting for failed login attempts.
-  * Change: Use a white logo for the macOS system tray icon.
-* API:
-  * New: Added machine_id to the get_history API response.
-
-
-## v2.6.1 (2020-11-03)
-
-* Other:
-  * Fix: High CPU/memory usage in some instances.
-  * Fix: Logger error preventing Tautulli from starting.
-  * Fix: Database issue with non-unique image hashes.
-
-
-## v2.6.0 (2020-10-31)
-
-* Exporter:
-  * New: New exporter feature that allows you to export the metadata and images for any library, collection, playlist, or media item to csv, json, xml, or m3u8. Refer to the Exporter Guide in the wiki for more details.
-* UI:
-  * Fix: Margin on the homepage activity and statistic/library cards. (Thanks @dotsam)
-  * Fix: Movie ratings not showing on the info page for the new Plex Movie agent.
-  * New: Added ability to browse collections and playlists from the library and user pages.
-  * Change: Updated platform brand logos and colours.
-* API:
-  * New: Added export_metadata, download_export, and delete_export API commands.
-  * New: Added get_collections_table, and get_playlists_table API commands.
-  * New: Added min_version parameter to the register_device API command.
-  * New: Added include_activity parameter to the get_history API command.
-  * New: Added sync_id parameter to the get_metadata API command.
-  * New: Added delete_synced_item API command.
-  * New: Added a stat_id and stats_start parameters to the get_home_stats API command.
-  * New: Allow deleting a mobile device using the registration device_id for the delete_mobile_device API command.
-  * Change: Return Plex server info and Tautulli info from the register_device command.
-* Other:
-  * New: The Docker container is now also built for the arm32v6 architecture.
-  * New: The Docker container is also published to the GitHub Container Registry at ghcr.io/tautulli/tautulli.
-  * Change: Tautulli is now using a forked version of plexapi 3.6.0. This is to support the exporter feature while still maintaining Python 2 compatibility.
-  * Change: Updated systemd script to remove process forking. (Thanks @MichaIng)
-  * Change: Cache GitHub update check on startup.
-
-
-## v2.5.6 (2020-10-02)
-
-* Activity:
-  * Change: Renamed container "Transcode" to "Converting" on activity cards.
-* Notifications:
-  * New: Added a silent notification option for Telegram. (Thanks @JohnnyKing94)
-  * New: Added container_decision notification parameter.
-  * New: Added notification trigger for Playback Error.
-  * New: Added remote access down notification threshold setting.
-* Newsletter:
-  * Change: Stop flooring newsletter start date.
-* UI:
-  * Fix: Unable to purge history from the library edit modal.
-  * Fix: QR code not showing up for localhost address when trying to register a device.
-  * New: Added library name to the fix metadata modal.
-* API:
-  * New: Added default thumb and art to the Live TV library.
-* Other:
-  * Fix: Synced items not loading for guest access.
-  * New: Schedule some more automatic database optimizations.
-  * Change: Added automatic uninstall before installing to the Windows installer.
-
-
-## v2.5.5 (2020-09-06)
-
-* Activity:
-  * Fix: Filter out TV show background theme music sessions.
-* Notifications:
-  * New: Check Plex external guids for notification metadata provider links.
-* UI:
-  * Fix: Incorrect sorting for user/library recently played items.
-* API:
-  * Fix: get_synced_items API command returning error with empty result.
-  * Fix: Download API commands not returning the file.
-  * Fix: get_logs API command encoding error.
-  * Fix: get_user_player_stats API command returning error instead of empty result.
-  * New: Added get_server_info API command.
-  * New: Added external guids to get_metadata API command.
-  * New: Added support for multi-column sorting for datatable API commands.
-  * Change: get_activity API command return thumbnail override for clips.
-  * Change: get_libraries_table API command return custom library artwork.
-* Other:
-  * Fix: Tautulli failed to run with a stale pid file.
-  * New: Added scheduled task to optimize the Tautulli database.
-  * Change: Update plexapi to 3.6.0.
-  * Change: Update some libraries for Python 3 compatibility.
-
-
-## v2.5.4 (2020-07-31)
-
-* Monitoring:
-  * Change: Montitoring remote access changed to use websockets. Refer to Tautulli/Tautulli-Issues#251 for details.
-* Notifications:
-  * Fix: Uploading images to Cloudinary failed for titles with non-ASCII characters on Python 2.
-  * New: Added plex_id notification parameter.
-  * Remove: Running .exe files directly using script notifications is no longer supported.
-  * Remove: php, perl, and ruby prefix overrides for script notifications is no longer supported.
-  * Change: Stricter checking of file extensions for script notifications.
-  * Change: Fallback to The Movie Database lookup using title and year.
-  * Change: Fallback to TVmaze lookup using title.
-* UI:
-  * New: Added ability to import a previous Tautullli configuration file in the settings.
-  * New: Added a browse button for settings which require a folder or file input.
-  * New: Added first streamed column to user IP addresses table. (Thanks @dotsam)
-  * New: Added The Movie Database rating image to media page.
-  * Change: Different icon to represent direct stream in the history tables.
-* API:
-  * New: Updated API docs for importing a database and configuration file.
-
-
-## v2.5.3 (2020-07-10)
-
-* History:
-  * Fix: Unable to delete more than 1000 history entries at the same time.
-* Notifications:
-  * Change: Python script notifications to run using the same Python interpreter as Tautulli.
-* Newsletters:
-  * Fix: Unable to view newsletters with special characters.
-* Other:
-  * Fix: Tautulli failing to start after enabling HTTPS when installed using the Windows / macOS installers.
-  * Fix: Startup script not working on macOS.
-  * Fix: Unable to hide dock icon on macOS with the pkg install. Refer to the FAQ regarding the Python rocket dock icon.
-  * Change: Added path to Python interpreter in system startup (daemon) scripts.
-  * Change: Added Python version to Google analytics.
-
-
-## v2.5.2 (2020-07-01)
-
-* Announcements:
-  * Tautulli now supports Python 3!
-  * Python 2 is still supported for the time being, but it is recommended to upgrade to Python 3.
-* Notifications:
-  * Fix: Error uploading images to Cloudinary on Python 2.
-  * Fix: Testing browser notifications alert not disappearing.
-  * Change: Default recently added notification delay set to 300 seconds.
-* UI: 
-  * Fix: MacOS menu bar icon causing Tautulli to fail to start.
-  * Fix: Unable to login to Tautulli on Python 2.
-  * New: Windows and MacOS setting to enable Tautulli to start automatically when you login.
-  * New: Added menu bar icon for MacOS.
-  * New: Ability to import a Tautulli database in the settings.
-  * New: Added Tautulli news area on the settings page.
-  * New: Added platform icon for LG devices.
-  * Remove: Ability to login to Tautulli using a Plex username and password has been removed. Login using a Plex.tv account is only supported via OAuth.
-* Mobile App:
-  * Fix: Improved API security and validation when registering the Android app.
-* Docker:
-  * Fix: Docker container not respecting the PUID and PGID environment variables.
-* Other:
-  * Fix: Error creating self-signed certificates on Python 3.
-  * Fix: Tautulli login session cookie not set on the HTTP root path.
-  * New: Windows and MacOS app installers to install Tautulli without needing Python installed.
-
-
 ## v2.2.4 (2020-05-16)
 
 * Monitoring:

CONTRIBUTING.md

@@ -9,12 +9,12 @@ All pull requests should be based on the `nightly` branch, to minimize cross mer
 ### Python Code
 
 #### Compatibility
-The code should work with Python 3.8+. Note that Tautulli runs on many different platforms.
+The code should work with Python 2.7. Note that Tautulli runs on many different platforms.
 
 Re-use existing code. Do not hesitate to add logging in your code. You can the logger module `plexpy.logger.*` for this. Web requests are invoked via `plexpy.request.*` and derived ones. Use these methods to automatically add proper and meaningful error handling.
 
 #### Code conventions
-Although Tautulli did not adopt a code convention in the past, we try to follow [PEP8](http://legacy.python.org/dev/peps/pep-0008/) conventions for future code. A short summary to remind you (copied from http://wiki.ros.org/PyStyleGuide):
+Although Tautulli did not adapt a code convention in the past, we try to follow the [PEP8](http://legacy.python.org/dev/peps/pep-0008/) conventions for future code. A short summary to remind you (copied from http://wiki.ros.org/PyStyleGuide):
 
  * 4 space indentation
  * 80 characters per line
@@ -38,4 +38,4 @@ HTML5 compatible browsers are targeted.
 * 4 space indentation
 * `methodName`
 * `variableName`
-* `ClassName`
+* `ClassName`

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/tautulli/tautulli-baseimage:python3
+FROM tautulli/tautulli-baseimage:latest
 
 LABEL maintainer="Tautulli"
 
@@ -9,20 +9,15 @@ ENV TAUTULLI_DOCKER=True
 ENV TZ=UTC
 
 WORKDIR /app
-COPY . /app
+
 RUN \
-  groupadd -g 1000 tautulli && \
-  useradd -u 1000 -g 1000 tautulli && \
   echo ${BRANCH} > /app/branch.txt && \
   echo ${COMMIT} > /app/version.txt
 
-RUN \
-  mkdir /config && \
-  touch /config/DOCKER
-VOLUME /config
+COPY . /app
 
 CMD [ "python", "Tautulli.py", "--datadir", "/config" ]
-ENTRYPOINT [ "./start.sh" ]
 
+VOLUME /config
 EXPOSE 8181
-HEALTHCHECK --start-period=90s CMD curl -ILfks https://localhost:8181/status > /dev/null || curl -ILfs http://localhost:8181/status > /dev/null || exit 1
+HEALTHCHECK  --start-period=90s CMD curl -ILfSs http://localhost:8181/status > /dev/null || curl -ILfkSs https://localhost:8181/status > /dev/null || exit 1

PlexPy.py

@@ -1,4 +1,8 @@
-#!/usr/bin/env python
+#!/bin/sh
+''''which python    >/dev/null 2>&1 && exec python    "$0" "$@" # '''
+''''which python2   >/dev/null 2>&1 && exec python2   "$0" "$@" # '''
+''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
+''''exec echo "Error: Python not found!" # '''
 
 # -*- coding: utf-8 -*-
 

README.md

@@ -1,163 +1,63 @@
 # Tautulli
 
-A python based web application for monitoring, analytics and notifications for 
-[Plex Media Server](https://plex.tv).
+A python based web application for monitoring, analytics and notifications for [Plex Media Server](https://plex.tv).
 
-This project is based on code from [Headphones](https://github.com/rembo10/headphones)
-and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb).
+This project is based on code from [Headphones](https://github.com/rembo10/headphones) and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb).
 
 ## Features
 
--   Responsive web design viewable on desktop, tablet and mobile web browsers.
--   Themed to complement Plex/Web.
--   Easy configuration setup (no separate web server required).
--   Monitor current Plex Media Server activity.
--   Fully customizable notifications for stream activity and recently added media.
--   Top statistics on home page with configurable duration and measurement metric.
--   Global watching history with search/filtering & dynamic column sorting.
--   Full user list with general information and comparison stats.
--   Individual user information including devices IP addresses.
--   Complete library statistics and media file information.
--   Rich analytics presented using Highcharts graphing.
--   Beautiful content information pages.
--   Full sync list data on all users syncing items from your library.
--   And many more!!
+* Responsive web design viewable on desktop, tablet and mobile web browsers.
+* Themed to complement Plex/Web.
+* Easy configuration setup (no separate web server required).
+* Monitor current Plex Media Server activity.
+* Fully customizable notifications for stream activity and recently added media.
+* Top statistics on home page with configurable duration and measurement metric.
+* Global watching history with search/filtering & dynamic column sorting.
+* Full user list with general information and comparison stats.
+* Individual user information including devices IP addresses.
+* Complete library statistics and media file information.
+* Rich analytics presented using Highcharts graphing.
+* Beautiful content information pages.
+* Full sync list data on all users syncing items from your library.
+* And many more!!
 
 ## Preview
 
-[Full preview gallery available on our website][Tautulli]
+* [Full preview gallery available on our website](https://tautulli.com)
 
 ![Tautulli Homepage](https://tautulli.com/images/screenshots/activity-compressed.jpg?v=2)
 
-## Installation
+## Installation & Support
 
-[![Python][badge-python]][Python]
-[![Docker Pulls][badge-docker-pulls]][DockerHub]
-[![Docker Stars][badge-docker-stars]][DockerHub]
-[![Downloads][badge-downloads]][Releases Latest]
-
-[badge-python]: https://img.shields.io/badge/python->=3.9-blue?style=flat-square
-[badge-docker-pulls]: https://img.shields.io/docker/pulls/tautulli/tautulli?style=flat-square
-[badge-docker-stars]: https://img.shields.io/docker/stars/tautulli/tautulli?style=flat-square
-[badge-downloads]: https://img.shields.io/github/downloads/Tautulli/Tautulli/total?style=flat-square
+[![Python](https://img.shields.io/badge/python-v2.7.17-blue?style=flat-square)](https://python.org/downloads/release/python-2717/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
+[![Docker Stars](https://img.shields.io/docker/stars/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
 
 | Status | Branch: `master` | Branch: `beta` | Branch: `nightly` |
 | --- | --- | --- | --- |
-| Release   | [![Release@master][badge-release-master]][Releases Latest] <br> [![Release Date@master][badge-release-master-date]][Releases Latest] | [![Release@beta][badge-release-beta]][Releases] <br> [![Commits@beta][badge-release-beta-commits]][Commits Beta] | [![Last Commits@nightly][badge-release-nightly-last-commit]][commits Nightly] <br> [![Commits@nightly][badge-release-nightly-commits]][Commits Nightly] |
-| Docker    | [![Docker@master][badge-docker-master]][DockerHub] <br> [![Docker Build@master][badge-docker-master-ci]][Publish Docker Master] | [![Docker@beta][badge-docker-beta]][DockerHub] <br> [![Docker Build@beta][badge-docker-beta-ci]][Publish Docker Beta] | [![Docker@nightly][badge-docker-nightly]][DockerHub] <br> [![Docker Build@nightly][badge-docker-nightly-ci]][Publish Docker Nightly] |
-| Snap      | [![Snap@master][badge-snap-master]][Snapcraft] <br> [![Snap Build@master][badge-snap-master-ci]][Publish Snap Master] | [![Snap@beta][badge-snap-beta]][Snapcraft] <br> [![Snap Build@beta][badge-snap-beta-ci]][Publish Snap Beta] | [![Snap@nightly][badge-snap-nightly]][Snapcraft] <br> [![Snap Build@nightly][badge-snap-nightly-ci]][Publish Snap Nightly] |
-| Installer | [![Windows@master][badge-installer-master-win]][Releases Latest] <br> [![MacOS@master][badge-installer-master-macos]][Releases Latest] <br> [![Installer Build@master][badge-installer-master-ci]][Publish Installer Master] | [![Windows@beta][badge-installer-beta-win]][Releases] <br> [![MacOS@beta][badge-installer-beta-macos]][Releases] <br> [![Installer Build@beta][badge-installer-beta-ci]][Publish Installer Beta] | [![Installer Build@nightly][badge-installer-nightly-ci]][Publish Installer Nightly] |
+| Release | [![Release@master](https://img.shields.io/github/v/release/Tautulli/Tautulli?style=flat-square)](https://github.com/Tautulli/Tautulli/releases/latest) <br> [![Release Date@master](https://img.shields.io/github/release-date/Tautulli/Tautulli?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/releases/latest) | [![Release@beta](https://img.shields.io/github/v/release/Tautulli/Tautulli?include_prereleases&style=flat-square)](https://github.com/Tautulli/Tautulli/releases) <br> [![Commits@beta](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/beta?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/beta) | [![Last Commits@nightly](https://img.shields.io/github/last-commit/Tautulli/Tautulli/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly) <br> [![Commits@nightly](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly) |
+| Docker  | [![Docker@master](https://img.shields.io/badge/tautulli-tautulli:latest-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/master?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Amaster) | [![Docker@beta](https://img.shields.io/badge/tautulli-tautulli:beta-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@beta](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/beta?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Abeta) | [![Docker@nightly](https://img.shields.io/badge/tautulli-tautulli:nightly-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@nightly](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker/nightly?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Anightly) |
 
-Read the [Installation Guides][Installation] for instructions on how to install Tautulli.
+[![Wiki](https://img.shields.io/badge/github-wiki-black?style=flat-square)](https://github.com/Tautulli/Tautulli-Wiki/wiki)
+[![Discord](https://img.shields.io/discord/183396325142822912?label=discord&style=flat-square&color=7289DA)](https://tautulli.com/discord)
+[![Reddit](https://img.shields.io/reddit/subreddit-subscribers/tautulli?label=reddit&style=flat-square&color=FF5700)](https://www.reddit.com/r/Tautulli/)
+[![Plex Forums](https://img.shields.io/badge/plex%20forums-discussion-E5A00D?style=flat-square)](https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242)
 
-[badge-release-master]: https://img.shields.io/github/v/release/Tautulli/Tautulli?style=flat-square
-[badge-release-master-date]: https://img.shields.io/github/release-date/Tautulli/Tautulli?style=flat-square&color=blue
-[badge-release-beta]: https://img.shields.io/github/v/release/Tautulli/Tautulli?include_prereleases&style=flat-square
-[badge-release-beta-commits]: https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/beta?style=flat-square&color=blue
-[badge-release-nightly-last-commit]: https://img.shields.io/github/last-commit/Tautulli/Tautulli/nightly?style=flat-square&color=blue
-[badge-release-nightly-commits]: https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/nightly?style=flat-square&color=blue
-[badge-docker-master]: https://img.shields.io/badge/docker-latest-blue?style=flat-square
-[badge-docker-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=master
-[badge-docker-beta]: https://img.shields.io/badge/docker-beta-blue?style=flat-square
-[badge-docker-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=beta
-[badge-docker-nightly]: https://img.shields.io/badge/docker-nightly-blue?style=flat-square
-[badge-docker-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=nightly
-[badge-snap-master]: https://img.shields.io/badge/snap-stable-blue?style=flat-square
-[badge-snap-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=master
-[badge-snap-beta]: https://img.shields.io/badge/snap-beta-blue?style=flat-square
-[badge-snap-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=beta
-[badge-snap-nightly]: https://img.shields.io/badge/snap-edge-blue?style=flat-square
-[badge-snap-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=nightly
-[badge-installer-master-win]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=windows&style=flat-square
-[badge-installer-master-macos]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=macos&style=flat-square
-[badge-installer-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=master
-[badge-installer-beta-win]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=windows&include_prereleases&style=flat-square
-[badge-installer-beta-macos]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=macos&include_prereleases&style=flat-square
-[badge-installer-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=beta
-[badge-installer-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=nightly
+* Read the [Installation Guides](https://github.com/Tautulli/Tautulli-Wiki/wiki/Installation) for instructions to install Tautulli.
+* The [Frequently Asked Questions](https://github.com/Tautulli/Tautulli-Wiki/wiki/Frequently-Asked-Questions) in the wiki can help you with common problems.
+* Support is available on [Discord](https://tautulli.com/discord), [Reddit](https://www.reddit.com/r/Tautulli), or the [Plex Forums](https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242).
 
-## Support
+## Issues & Feature Requests
 
-[![Wiki][badge-wiki]][Wiki]
-[![Discord][badge-discord]][Discord]
-[![Reddit][badge-reddit]][Reddit]
-[![Plex Forums][badge-forums]][Plex Forums]
-[![Issues][badge-issues]][Issues]
+[![Issues](https://img.shields.io/badge/github-issues-red?style=flat-square)](https://github.com/Tautulli/Tautulli-Issues)
+[![Feathub](https://img.shields.io/badge/feathub-requests-lightgrey?style=flat-square)](https://feathub.com/Tautulli/Tautulli)
 
-[badge-wiki]: https://img.shields.io/badge/github-wiki-black?style=flat-square
-[badge-discord]: https://img.shields.io/discord/183396325142822912?label=discord&style=flat-square&color=7289DA
-[badge-reddit]: https://img.shields.io/reddit/subreddit-subscribers/tautulli?label=reddit&style=flat-square&color=FF5700
-[badge-forums]: https://img.shields.io/badge/plex%20forums-discussion-E5A00D?style=flat-square
-[badge-issues]: https://img.shields.io/badge/github-issues-black?style=flat-square
-
-If you think you've found a bug in Tautulli make sure you have read the [FAQ][]
-first to make sure it hasn't been covered by one of the questions there. If your
-problem isn't answered in the FAQ try the following first:
-
--   Update to the latest version of Tautulli.
--   Turning your device off and on again.
--   Analyzing your logs, you just might find the solution yourself!
--   Using the **search** function to see if this issue has already been reported/solved.
--   Checking the [Wiki][] for [Installation][] instructions and reading the [FAQs][FAQ].
--   For basic questions try asking on [Discord][], [Reddit][], 
-    or the [Plex Forums][] first before opening an issue.
-
-**If nothing has worked:**
-
-1.  Please check the [issues tracker][Issues] to see if someone else has already reported the bug.
-2.  If this is a new bug, open a [bug report][Issue New] on the issues tracker.
-3.  Provide a clear title to easily help identify your problem.
-4.  Use proper [Markdown syntax][] to structure your post (i.e. code/log in code blocks).
-5.  Make sure to fill out the required information on the issue template.
-6.  Close your issue when it's solved! If you found the solution yourself please
-    comment so that others benefit from it.
-
-## Feature Requests
-
-1.  Pleases check the [issues tracker][Issues] to see if someone else has already requested the feature.
-    If a similar idea has already been requested, _give it a thumbs up_. **Do not comment
-    with `+1` or something similar as it creates unnecessary spam.**
-2.  If this is a new feature request, open a [feature request][Issue New] on the issues tracker.
+* Please see the [Issues Repository](https://github.com/Tautulli/Tautulli-Issues).
 
 ## License
 
-[![License][badge-license]][License]
+[![License](https://img.shields.io/github/license/Tautulli/Tautulli?style=flat-square)](https://github.com/Tautulli/Tautulli/blob/master/LICENSE)
 
-[badge-license]: https://img.shields.io/github/license/Tautulli/Tautulli?style=flat-square
+This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included.
 
-This is free software under the GPL v3 open source license. Feel free to do with it what you wish,
-but any modification must be open sourced. A copy of the license is included.
-
-This software includes Highsoft software libraries which you may freely distribute for 
-non-commercial use. Commercial users must licence this software, for more information visit
-https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
-
-
-[Python]: https://python.org/downloads
-[DockerHub]: https://hub.docker.com/r/tautulli/tautulli
-[Releases]: https://github.com/Tautulli/Tautulli/releases
-[Releases Latest]: https://github.com/Tautulli/Tautulli/releases/latest
-[License]: https://github.com/Tautulli/Tautulli/blob/master/LICENSE
-[FAQ]: https://github.com/Tautulli/Tautulli/wiki/Frequently-Asked-Questions
-[Installation]: https://github.com/Tautulli/Tautulli/wiki/Installation
-[Issues]: https://github.com/Tautulli/Tautulli/issues
-[Issue New]: https://github.com/Tautulli/Tautulli/issues/new/choose
-[Markdown syntax]: https://help.github.com/articles/github-flavored-markdown
-[Tautulli]: http://tautulli.com
-[Wiki]: https://github.com/Tautulli/Tautulli/wiki
-[Discord]: https://tautulli.com/discord
-[Reddit]: https://reddit.com/r/Tautulli
-[Plex Forums]: https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242
-[Snapcraft]: https://snapcraft.io/tautulli
-[Commits Beta]: https://github.com/Tautulli/Tautulli/commits/beta
-[Commits Nightly]: https://github.com/Tautulli/Tautulli/commits/nightly
-
-[Publish Docker Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Amaster
-[Publish Docker Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Abeta
-[Publish Docker Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Anightly
-[Publish Snap Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Amaster
-[Publish Snap Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Abeta
-[Publish Snap Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Anightly
-[Publish Installer Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Amaster
-[Publish Installer Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Abeta
-[Publish Installer Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Anightly
+This software includes Highsoft software libraries which you may freely distribute for non-commercial use. Commerical users must licence this software, for more information visit https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.

Tautulli.py

@@ -1,4 +1,8 @@
-#!/usr/bin/env python
+#!/bin/sh
+''''which python    >/dev/null 2>&1 && exec python    "$0" "$@" # '''
+''''which python2   >/dev/null 2>&1 && exec python2   "$0" "$@" # '''
+''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
+''''exec echo "Error: Python not found!" # '''
 
 # -*- coding: utf-8 -*-
 
@@ -23,25 +27,17 @@ import sys
 # Ensure lib added to path, before any other imports
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib'))
 
-
 import argparse
 import datetime
 import locale
-import platformdirs
 import pytz
 import signal
-import shutil
 import time
-import threading
 import tzlocal
-import ctypes
 
 import plexpy
-from plexpy import common, config, database, helpers, logger, webstart
-if common.PLATFORM == 'Windows':
-    from plexpy import windows
-elif common.PLATFORM == 'Darwin':
-    from plexpy import macos
+from plexpy import config, database, helpers, logger, webstart
+
 
 # Register signals, such as CTRL + C
 signal.signal(signal.SIGINT, plexpy.sig_handler)
@@ -55,14 +51,12 @@ def main():
     """
 
     # Fixed paths to Tautulli
-    if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
-        plexpy.FROZEN = True
+    if hasattr(sys, 'frozen'):
         plexpy.FULL_PATH = os.path.abspath(sys.executable)
-        plexpy.PROG_DIR = sys._MEIPASS
     else:
         plexpy.FULL_PATH = os.path.abspath(__file__)
-        plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
 
+    plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
     plexpy.ARGS = sys.argv[1:]
 
     # From sickbeard
@@ -70,26 +64,8 @@ def main():
     plexpy.SYS_ENCODING = None
 
     try:
-
-        # Attempt to get the system's locale settings
-        language_code, encoding = locale.getlocale()
-
-        # Special handling for Windows platform
-        if sys.platform == 'win32':
-            # Get the user's current language settings on Windows
-            windll = ctypes.windll.kernel32
-            lang_id = windll.GetUserDefaultLCID()
-
-            # Map Windows language ID to locale identifier
-            language_code = locale.windows_locale.get(lang_id, '')
-
-        # Get the preferred encoding
-        encoding = locale.getpreferredencoding()
-
-        # Assign values to application-specific variable
-        plexpy.SYS_LANGUAGE = language_code
-        plexpy.SYS_ENCODING = encoding
-
+        locale.setlocale(locale.LC_ALL, "")
+        plexpy.SYS_LANGUAGE, plexpy.SYS_ENCODING = locale.getdefaultlocale()
     except (locale.Error, IOError):
         pass
 
@@ -129,7 +105,7 @@ def main():
     if args.quiet:
         plexpy.QUIET = True
 
-    # Do an initial setup of the logger.
+    # Do an intial setup of the logger.
     # Require verbose for pre-initilization to see critical errors
     logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=True)
 
@@ -143,17 +119,15 @@ def main():
 
     if helpers.bool_true(os.getenv('TAUTULLI_DOCKER', False)):
         plexpy.DOCKER = True
-        plexpy.DOCKER_MOUNT = not os.path.isfile('/config/DOCKER')
-    if helpers.bool_true(os.getenv('TAUTULLI_SNAP', False)):
-        plexpy.SNAP = True
 
     if args.dev:
         plexpy.DEV = True
-        logger.debug("Tautulli is running in the dev environment.")
+        logger.debug(u"Tautulli is running in the dev environment.")
 
     if args.daemon:
         if sys.platform == 'win32':
-            logger.warn("Daemonizing not supported under Windows, starting normally")
+            sys.stderr.write(
+                "Daemonizing not supported under Windows, starting normally\n")
         else:
             plexpy.DAEMON = True
             plexpy.QUIET = True
@@ -171,13 +145,11 @@ def main():
             try:
                 with open(plexpy.PIDFILE, 'r') as fp:
                     pid = int(fp.read())
+                os.kill(pid, 0)
             except IOError as e:
                 raise SystemExit("Unable to read PID file: %s", e)
-
-            try:
-                os.kill(pid, 0)
             except OSError:
-                logger.warn("PID file '%s' already exists, but PID %d is "
+                logger.warn("PID file '%s' already exists, but PID %d is " \
                             "not running. Ignoring PID file." %
                             (plexpy.PIDFILE, pid))
             else:
@@ -203,20 +175,9 @@ def main():
     # Determine which data directory and config file to use
     if args.datadir:
         plexpy.DATA_DIR = args.datadir
-    elif plexpy.FROZEN:
-        plexpy.DATA_DIR = platformdirs.user_data_dir("Tautulli", False)
     else:
         plexpy.DATA_DIR = plexpy.PROG_DIR
 
-    # Migrate Snap data dir
-    if plexpy.SNAP:
-        snap_common = os.environ['SNAP_COMMON']
-        old_data_dir = os.path.join(snap_common, 'Tautulli')
-        if os.path.exists(old_data_dir) and os.listdir(old_data_dir):
-            plexpy.SNAP_MIGRATE = True
-            logger.info("Migrating Snap user data.")
-            shutil.move(old_data_dir, plexpy.DATA_DIR)
-
     if args.config:
         config_file = args.config
     else:
@@ -231,18 +192,9 @@ def main():
                 'Could not create data directory: ' + plexpy.DATA_DIR + '. Exiting....')
 
     # Make sure the DATA_DIR is writeable
-    test_file = os.path.join(plexpy.DATA_DIR, '.TEST')
-    try:
-        with open(test_file, 'w'):
-            pass
-    except IOError:
+    if not os.access(plexpy.DATA_DIR, os.W_OK):
         raise SystemExit(
             'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
-    finally:
-        try:
-            os.remove(test_file)
-        except OSError:
-            pass
 
     # Put the database in the DATA_DIR
     plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
@@ -264,54 +216,38 @@ def main():
     # Start the background threads
     plexpy.start()
 
-    # Force the http port if necessary
+    # Force the http port if neccessary
     if args.port:
         plexpy.HTTP_PORT = args.port
         logger.info('Using forced web server port: %i', plexpy.HTTP_PORT)
     else:
         plexpy.HTTP_PORT = int(plexpy.CONFIG.HTTP_PORT)
 
+    # Check if pyOpenSSL is installed. It is required for certificate generation
+    # and for CherryPy.
+    if plexpy.CONFIG.ENABLE_HTTPS:
+        try:
+            import OpenSSL
+        except ImportError:
+            logger.warn("The pyOpenSSL module is missing. Install this " \
+                        "module to enable HTTPS. HTTPS will be disabled.")
+            plexpy.CONFIG.ENABLE_HTTPS = False
+
     # Try to start the server. Will exit here is address is already in use.
     webstart.start()
 
-    if common.PLATFORM == 'Windows':
-        if plexpy.CONFIG.SYS_TRAY_ICON:
-            plexpy.WIN_SYS_TRAY_ICON = windows.WindowsSystemTray()
-            plexpy.WIN_SYS_TRAY_ICON.start()
-        windows.set_startup()
-    elif common.PLATFORM == 'Darwin':
-        macos.set_startup()
+    # Windows system tray icon
+    if os.name == 'nt' and plexpy.CONFIG.WIN_SYS_TRAY:
+        plexpy.win_system_tray()
+
+    logger.info("Tautulli is ready!")
 
     # Open webbrowser
     if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch and not plexpy.DEV:
         plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, plexpy.HTTP_PORT,
                               plexpy.HTTP_ROOT)
 
-    if common.PLATFORM == 'Darwin' and plexpy.CONFIG.SYS_TRAY_ICON:
-        if not macos.HAS_PYOBJC:
-            logger.warn("The pyobjc module is missing. Install this "
-                        "module to enable the MacOS menu bar icon.")
-            plexpy.CONFIG.SYS_TRAY_ICON = False
-
-        if plexpy.CONFIG.SYS_TRAY_ICON:
-            # MacOS menu bar icon must be run on the main thread and is blocking
-            # Start the rest of Tautulli on a new thread
-            thread = threading.Thread(target=wait)
-            thread.daemon = True
-            thread.start()
-
-            plexpy.MAC_SYS_TRAY_ICON = macos.MacOSSystemTray()
-            plexpy.MAC_SYS_TRAY_ICON.start()
-        else:
-            wait()
-    else:
-        wait()
-
-
-def wait():
-    logger.info("Tautulli is ready!")
-
-    # Wait endlessly for a signal to happen
+    # Wait endlessy for a signal to happen
     while True:
         if not plexpy.SIGNAL:
             try:
@@ -329,14 +265,11 @@ def wait():
                 plexpy.shutdown(restart=True, checkout=True)
             elif plexpy.SIGNAL == 'reset':
                 plexpy.shutdown(restart=True, reset=True)
-            elif plexpy.SIGNAL == 'update':
-                plexpy.shutdown(restart=True, update=True)
             else:
-                logger.error('Unknown signal. Shutting down...')
-                plexpy.shutdown()
+                plexpy.shutdown(restart=True, update=True)
 
             plexpy.SIGNAL = None
 
-
+# Call main()
 if __name__ == "__main__":
     main()

contrib/clean_pyc.bat

@@ -1,11 +0,0 @@
-@echo off
-:: Display information
-echo This script will remove *.pyc files. These files are generated by Python, but they can cause conflicts after an upgrade. It's safe to remove them, because they will be regenerated.
-echo Press enter to continue, or CTRL + C to quit.
-pause
-
-cd ..\
-:: Remove *.pyc files
-del /S *.pyc
-:: Remove __pycache__ folders
-for /d /r . %%d in (__pycache__) do @if exist "%%d" rd /s /q "%%d"

contrib/clean_pyc.sh

@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Display information
 echo "This script will remove *.pyc files. These files are generated by Python, but they can cause conflicts after an upgrade. It's safe to remove them, because they will be regenerated."
 echo "Press enter to continue, or CTRL + C to quit."
 read
 
-# Remove *.pyc files
-find "`dirname $0`/.." -type f -name "*.pyc" -exec rm -rf {} \;
-# Remove __pycache__ folders
-find "`dirname $0`/.." -type d -name "__pycache__" -exec rm -rf {} \;
+# Remove the *.pyc
+find "`dirname $0`/.." -type f -name "*.pyc" -exec rm -rf {} \;

contrib/downgrade.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Parameter check
 if [ -z "$1" ]; then

data/interfaces/default/app_import.html

@@ -5,105 +5,46 @@
             <h4 class="modal-title">Import ${app} Database</h4>
         </div>
         <div class="modal-body" id="modal-text">
-            <form id="import_database_form" enctype="multipart/form-data" method="post" name="import_database_form">
-                <input type="hidden" id="import_app" name="import_app" value="${app.lower()}" />
-                % if app in ('PlexWatch', 'Plexivity'):
-                <p class="help-block">
-                    <%
-                        v = ''
-                        if app == 'PlexWatch':
-                            v = '0.3.2'
-                        elif app == 'Plexivity':
-                            v = '0.9.8'
-                    %>
-                    <strong>Please ensure your ${app} database is at version ${v} or higher.</strong>
-                </p>
-                % endif
-                <div class="form-group">
-                    <label for="import_database_file">Option 1: Upload a Database File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <label for="import_database_file" class="input-group-btn">
-                                    <span class="btn btn-form">Upload</span>
-                                    <input type="file" style="display: none;" id="import_database_file" name="import_database_file" required>
-                                </label>
-                                <input id="import_database_file_name" type="text" class="form-control" placeholder="tautulli.db" disabled>
-                            </div>
-                        </div>
+            <p class="help-block">
+                <%
+                    v = ''
+                    if app == 'PlexWatch':
+                        v = '0.3.2'
+                    elif app == 'Plexivity':
+                        v = '0.9.8'
+                %>
+                <strong>Please ensure your ${app} database is at version ${v} or higher.</strong>
+            </p>
+            <div class="form-group">
+                <label for="db_location">Database Location</label>
+                <div class="row">
+                    <div class="col-xs-8">
+                        <input type="text" class="form-control" id="db_location" name="db_location" value="" required>
                     </div>
-                    <p class="help-block">Upload the ${app} database file you wish to import (max file size is 1GB).</p>
                 </div>
-                <div class="form-group">
-                    <label for="import_database_path">Option 2: Browse for a Database File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_database_path_browse" data-toggle="browse" data-description="Database File" data-filter=".db" data-target="#import_database_path">Browse</button>
-                                </span>
-                                <input type="text" class="form-control" id="import_database_path" name="import_database_path" value="" placeholder="tautulli.db" required disabled>
-                            </div>
-                        </div>
+                <p class="help-block">Enter the path and file name for the ${app} database you wish to import.</p>
+            </div>
+            <div class="form-group">
+                <label for="table_name">Table Name</label>
+                <div class="row">
+                    <div class="col-xs-4">
+                        <select id="table_name" class="form-control" name="table_name">
+                            <option value="processed">processed</option>
+                            <option value="grouped">grouped</option>
+                        </select>
                     </div>
-                    <p class="help-block">Browse for the ${app} database file you wish to import.</p>
                 </div>
-                % if app == 'Tautulli':
-                <div class="form-group">
-                    <label for="table_name">Import Method</label>
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <select class="form-control" id="import_method" name="import_method">
-                                <option value="merge">Merge</option>
-                                <option value="overwrite">Overwrite</option>
-                            </select>
-                        </div>
+                <p class="help-block">The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p>
+            </div>
+            <div class="form-group">
+                <label for="import_ignore_interval">Ignore Interval</label>
+                <div class="row">
+                    <div class="col-xs-2">
+                        <input type="text" class="form-control" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
                     </div>
-                    <p class="help-block">Select how you would like to import the Tautulli history.</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li><strong>Merge</strong> will add all history and remove any duplicates from the imported database into the current database.</li>
-                        <li><strong>Overwrite</strong> will replace all history in the current database with the imported database.</li>
-                    </ul>
                 </div>
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" name="import_backup_db" id="import_backup_db" value="1" checked> Backup Current Database
-                    </label>
-                    <p class="help-block">Automatically create a backup of the current database before importing.</p>
-                </div>
-                <div class="form-group">
-                    <label>Import Notes</label>
-                    <p class="help-block">The following data will also be imported:</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li>Libraries and Users</li>
-                        <li>Notification / Newsletter Agents</li>
-                        <li>Registered Mobile Devices</li>
-                    </ul>
-                </div>
-                % else:
-                <div class="form-group">
-                    <label for="import_table_name">Table Name</label>
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <select class="form-control" id="import_table_name" name="import_table_name">
-                                <option value="processed">Processed</option>
-                                <option value="grouped">Grouped</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p>
-                </div>
-                <div class="form-group">
-                    <label for="import_ignore_interval">Ignore Interval</label>
-                    <div class="row">
-                        <div class="col-xs-2">
-                            <input type="text" class="form-control" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
-                        </div>
-                    </div>
-                    <p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
-                </div>
-                % endif
-            </form>
+                <p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
+            </div>
         </div>
         <div class="modal-footer">
             <div>
@@ -114,87 +55,24 @@
     </div>
 </div>
 <script>
-    $("#import_database_file").change(function() {
-        if ($(this)[0].files[0]) {
-            $("#import_database_file_name").val($(this)[0].files[0].name);
-        }
-    });
-
+    // Send database path to import script
     $("#import_db").click(function() {
-        $(this).prop('disabled', true);
-
-        var app = $("#import_app").val();
-        var database_file = $("#import_database_file")[0].files[0];
-        var database_path = $("#import_database_path").val();
-        var method = $("#import_method").val();
-        var backup = $("#import_backup_db").is(':checked');
-        var table_name = $("#import_table_name").val();
-        var ignore_interval = $("#import_ignore_interval").val();
-
-        var content_type;
-        var process_data;
-        var data;
-
-        if (database_file) {
-            content_type = false;
-            process_data = false;
-            data = new FormData();
-            data.append('app', app);
-            data.append('database_file', database_file);
-            data.append('method', method);
-            data.append('backup', backup);
-            data.append('table_name', table_name);
-            data.append('ignore_interval', ignore_interval);
-        } else {
-            content_type = 'application/x-www-form-urlencoded; charset=UTF-8';
-            process_data = true;
-            data = {
-                app: app,
-                database_path: database_path,
-                method: method,
-                backup: backup,
-                table_name: table_name,
-                ignore_interval: ignore_interval
-            }
-        }
-
-        if (database_file) {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>&nbsp; Uploading database file...');
-        } else {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
-        }
-
+        var database_path = $("#db_location").val();
+        var table_name = $("#table_name").val();
+        var import_ignore_interval = $("#import_ignore_interval").val();
         $.ajax({
             url: 'import_database',
-            type: 'POST',
-            data: data,
+            data: {
+                app: "${app}",
+                database_path: database_path,
+                table_name: table_name,
+                import_ignore_interval: import_ignore_interval
+            },
             cache: false,
             async: true,
-            contentType: content_type,
-            processData: process_data,
             success: function(data) {
-                var msg;
-                if (data.result === 'success') {
-                    msg = "<i class='fa fa-check'></i>&nbsp; " + data.message;
-                } else {
-                    msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; " + data.message;
-                }
-                $("#status-message").html(msg);
-                $("#import_database_file").val(null);
-                $("#import_database_file_name").val('');
-                $("#import_database_path").val('');
-            },
-            error: function (xhr) {
-                var msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; Error (" + xhr.status + "): ";
-                if (xhr.status === 413) {
-                    msg += "file is too large to upload"
-                } else {
-                    msg += 'try again'
-                }
-                $("#status-message").html(msg);
-            },
-            complete: function(xhr) {
-                $("#import_db").prop('disabled', false);
+                $("#status-message").html(data);
+                $("#db_location").val('')
             }
         });
     });

data/interfaces/default/base.html

@@ -13,11 +13,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <meta name="referrer" content="no-referrer">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
+    <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
     <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
-    <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet" />
-    <link href="${http_root}css/selectize.min.css" rel="stylesheet" />
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <link href="${http_root}css/opensans.min.css" rel="stylesheet">
     <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
@@ -25,21 +22,21 @@
     ${next.headIncludes()}
 
     <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
 
     <!-- ICONS -->
     <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.9.0" crossorigin="use-credentials">
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5" crossorigin="use-credentials">
     <meta name="theme-color" content="#282a2d">
     <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
     <meta name="apple-mobile-web-app-title" content="Tautulli">
     <!-- Microsoft -->
     <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
 </head>
 
 <body class="content">
@@ -51,19 +48,15 @@
         % if plexpy.UPDATE_AVAILABLE is None:
         You are running an unknown version of Tautulli.<br />
         % elif plexpy.UPDATE_AVAILABLE == 'release':
-        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">
+        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank">
         new release (${plexpy.LATEST_RELEASE})</a> of Tautulli is available!<br />
         % elif plexpy.UPDATE_AVAILABLE == 'commit':
-        A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank" rel="noreferrer">
+        A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank">
         newer version</a> of Tautulli is available!<br />
         You are ${plexpy.COMMITS_BEHIND} commit${'s' if plexpy.COMMITS_BEHIND > 1 else ''} behind.<br />
         % endif
-        % if plexpy.INSTALL_TYPE == 'docker':
+        % if plexpy.DOCKER:
         Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>
-        % elif plexpy.INSTALL_TYPE == 'snap':
-        Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>
-        % elif plexpy.INSTALL_TYPE in ('windows', 'macos'):
-        <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>
         % else:
         <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
         % endif
@@ -87,7 +80,7 @@
             </div>
             <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
                 <ul class="nav navbar-nav">
-                    <li>
+                    <li class="hidden-sm hidden-xs">
                         <form action="search" method="post" class="form" id="search_form">
                             <div class="input-group">
                                 <span class="input-textbox">
@@ -124,6 +117,11 @@
                     % else:
                     <li><a href="graphs">Graphs</a></li>
                     % endif
+                    % if title == "Synced Items":
+                    <li class="active"><a href="sync">Synced Items</a></li>
+                    % else:
+                    <li><a href="sync">Synced Items</a></li>
+                    % endif
                     % if title == "Settings":
                     <li class="dropdown active">
                     % else:
@@ -136,7 +134,7 @@
                             <li><a href="settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
                             <li role="separator" class="divider"></li>
                             <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
-                            <li><a href="${anon_url('https://github.com/%s/%s/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer"><i class="fa fa-fw fa-question-circle"></i> FAQ</a></li>
+                            <li><a href="${anon_url('https://github.com/%s/%s-Wiki/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank"><i class="fa fa-fw fa-question-circle"></i> FAQ</a></li>
                             <li><a href="support"><i class="fa fa-fw fa-comment"></i> Support</a></li>
                             <li role="separator" class="divider"></li>
                             <li><a href="#" data-target="#donate-modal" data-toggle="modal"><i class="fa fa-fw fa-heart"></i> Donate</a></li>
@@ -202,7 +200,7 @@ ${next.modalIncludes()}
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <span id="sign-in-alert" style="padding-right: 25px; display: none;"></span>
+                    <span id="incorrect-login" style="padding-right: 25px; display: none;">Incorrect username or password.</span>
                     <button id="sign-in" type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
                 </div>
                 <input type="hidden" id="admin_login" name="admin_login" value="1" />
@@ -230,72 +228,33 @@ ${next.modalIncludes()}
                     </div>
                 </div>
                 <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
-                    <li class="active"><a href="#github-donation" role="tab" data-toggle="tab">GitHub</a></li>
-                    <li><a href="#patreon-donation" role="tab" data-toggle="tab">Patreon</a></li>
-                    <li><a href="#stripe-donation" role="tab" data-toggle="tab">Stripe</a></li>
+                    <li class="active"><a href="#patreon-donation" role="tab" data-toggle="tab">Patreon</a></li>
+                    <li><a href="#github-donation" role="tab" data-toggle="tab">GitHub</a></li>
                     <li><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" id="crypto-donation-tab">Crypto</a></li>
                 </ul>
                 <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="github-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to GitHub.
-                        </p>
-                        <p>
-                            <a href="${anon_url('https://github.com/sponsors/JonnyWong16')}" target="_blank" rel="noreferrer" class="btn btn-sm btn-default" style="font-weight: 600;">
-                                <i class="fa fa-heart fa-sm" style="color: #ea4aaa;"></i>&nbsp; Sponsor
-                            </a>
-                        </p>
-                        <p class="small-muted">(GitHub does not have a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="patreon-donation" style="text-align: center">
+                    <div role="tabpanel" class="tab-pane active" id="patreon-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to Patreon.
                         </p>
-                        <p>
-                            <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank" rel="noreferrer">
-                                <img src="images/become_a_patron_button.png" alt="Become a Patron" width="170" height="40">
-                            </a>
-                        </p>
-                        <p class="small-muted">(Patreon has a fee)</p>
+                        <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank">
+                            <img src="images/become_a_patron_button.png" alt="Become a Patron" height="40">
+                        </a>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="stripe-donation" style="text-align: center">
+                    <div role="tabpanel" class="tab-pane" id="github-donation" style="text-align: center">
                         <p>
-                            Click the button below to continue to Stripe.
+                            Click the button below to continue to GitHub.
                         </p>
-                        <p>
-                            <a href="${anon_url('https://donate.stripe.com/5kA7vnb7dczVbxC9AA')}" target="_blank" rel="noreferrer">
-                                <img src="images/Stripe_wordmark_-_white_small_28px.png" alt="Stripe" style="background-color: #7068fe; border-radius: 3px; padding: 3px;">
-                            </a>
-                        </p>
-                        <p class="small-muted">(Stripe has a fee)</p>
+                        <a href="${anon_url('https://github.com/sponsors/JonnyWong16')}" target="_blank" class="btn btn-sm btn-default" style="font-weight: 600;">
+                            <i class="fa fa-heart fa-sm" style="color: #ea4aaa;"></i>&nbsp; Sponsor
+                        </a>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="paypal-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to PayPal.
                         </p>
-                        <p>
-                            <a href="${anon_url('https://www.paypal.com/donate/?hosted_button_id=CUHSQ99KAKC5Q')}" target="_blank" rel="noreferrer">
-                                <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
-                            </a>
-                        </p>
-                        <p class="small-muted">(PayPal has a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="crypto-donation" style="text-align: center">
-                        <p>
-                            Select a cryptocurrency.
-                        </p>
-                        <select class="form-control" id="crypto-select"></select>
-                        <div id="crypto-qrcode"></div>
-                        <div id="crypto-address" class="form-group">
-                            <label>Address:</label>
-                            <span class="inline-pre" id="crypto-address-value"></span>
-                        </div>
-                        <p>
-                            Or click the button below to continue to Coinbase.
-                        </p>
-                        <a href="${anon_url('https://commerce.coinbase.com/checkout/8a9fa08c-8a38-409e-9220-868124c4ba0c')}" target="_blank" rel="noreferrer" class="donate-with-crypto">
-                            <span>Donate with Crypto</span>
+                        <a href="${anon_url('https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=6XPPKTDSX9QFL&lc=US&item_name=Tautulli&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted')}" target="_blank">
+                            <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
                         </a>
                     </div>
                 </div>
@@ -327,20 +286,17 @@ ${next.modalIncludes()}
     </div>
 </div>
 
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
+<script src="${http_root}js/jquery-2.1.4.min.js"></script>
 <script src="${http_root}js/bootstrap.min.js"></script>
 <script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script>
-<script src="${http_root}js/moment-with-locales.min.js"></script>
-<script src="${http_root}js/moment-duration-format.min.js"></script>
 <script src="${http_root}js/pnotify.custom.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>
 <script src="${http_root}js/ipaddr.min.js"></script>
-<script src="${http_root}js/selectize.min.js"></script>
-<script src="${http_root}js/jquery.tripleclick.min.js"></script>
-<script src="${http_root}js/blurhash_pure_js_port.min.js"></script>
 <script src="${http_root}js/script.js${cache_param}"></script>
+<script src="${http_root}js/jquery.tripleclick.min.js"></script>
+% if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
 <script src="${http_root}js/ajaxNotifications.js"></script>
-<script src="${http_root}js/kjua.min.js"></script>
+% endif
 <script>
     % if _session['user_group'] == 'admin':
     $('body').on('click', '#updateDismiss', function() {
@@ -369,17 +325,13 @@ ${next.modalIncludes()}
                     if (result.update === null) {
                         msg = 'You are running an unknown version of Tautulli.<br />';
                     } else if (result.update === true && result.release === true) {
-                        msg = 'A <a href="' + result.release_url + '" target="_blank" rel="noreferrer">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />';
+                        msg = 'A <a href="' + result.release_url + '" target="_blank">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />';
                     } else if (result.update === true && result.release === false) {
-                        msg = 'A <a href="' + result.compare_url + '" target="_blank" rel="noreferrer">newer version</a> of Tautulli is available!<br />' +
+                        msg = 'A <a href="' + result.compare_url + '" target="_blank">newer version</a> of Tautulli is available!<br />' +
                             'You are '+ result.commits_behind + ' commit' + (result.commits_behind > 1 ? 's' : '') + ' behind.<br />';
                     }
-                    if (result.install_type === 'docker') {
+                    if (result.docker) {
                         msg += 'Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>';
-                    } else if (result.install_type === 'snap') {
-                        msg += 'Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>';
-                    } else if (result.install_type === 'windows' || result.install_type === 'macos') {
-                        msg += '<a href="' + result.release_url + '" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>'
                     } else {
                         msg += '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
                     }
@@ -414,42 +366,6 @@ ${next.modalIncludes()}
         checkUpdate(function () { $('#nav-update').html('<i class="fa fa-fw fa-arrow-alt-circle-up"></i> Check for Updates'); });
     });
 
-    $('#crypto-donation-tab').one('shown.bs.tab', function (e) {
-        $.ajax({
-            url: 'https://tautulli.com/donate/crypto-addresses.json',
-            type: 'GET',
-            dataType: 'json',
-            cache: false,
-            async: true,
-            success: function (data) {
-                $('#crypto-select').empty().append('<option selected disabled>Select Cryptocurrency</option>');
-                $.each(data, function (index, crypto) {
-                    $('<option/>', {
-                        text: crypto.name + ' (' + crypto.symbol + ')',
-                        value: crypto.address
-                    }).appendTo('#crypto-select');
-                });
-            },
-            error: function () {
-                $('#crypto-select').empty().append('<option selected disabled>Error: Unable to load addresses</option>');
-            }
-        });
-    });
-
-    $('#crypto-select').change(function() {
-        var address = $(this).val();
-        $('#crypto-qrcode').empty().kjua({
-            text: address,
-            render: 'canvas',
-            ecLevel: 'H',
-            size: 256,
-            fill: '#000',
-            back: '#eee'
-        }).show();
-        $('#crypto-address-value').text(address);
-        $('#crypto-address').show();
-    })
-
     % endif
 
     $('.dropdown-toggle').click(function (e) {
@@ -458,22 +374,8 @@ ${next.modalIncludes()}
         }
     });
 
-    function displaySearch() {
-        if ($(this).width() < 768) {
-            $('#search_button').removeClass('btn-inactive');
-            $('#query').css({ right: 0, width: '100%' })
-        } else if ($('#query').val().trim() == '') {
-            $('#search_button').addClass('btn-inactive');
-            $('#query').css({ right: '-200px', width: '0' })
-        }
-    }
-    displaySearch();
-    $(window).resize(function() {
-        displaySearch();
-    });
-
     $('#search_form').submit(function (e) {
-        if ($('#query').val().trim() != '') {
+        if ($('#query').hasClass('active') && $('#query').val().trim() != '') {
             $.ajax({
                 type: 'post',
                 url: 'search',
@@ -481,16 +383,14 @@ ${next.modalIncludes()}
             })
         } else {
             e.preventDefault();
-            if ($(window).width() >= 768) {
-                $('#search_button').removeClass('btn-inactive');
-                $('#query').clearQueue().val('').animate({ right: '0', width: '200px' }).addClass('active').focus();
-            }
+            $('#search_button').removeClass('btn-inactive');
+            $('#query').clearQueue().val('').animate({ right: '0', width: '200px' }).addClass('active').focus();
         }
     })
     $('#query').on('blur', function (e) {
-        if ($(this).val().trim() == '' && $(window).width() >= 768) {
+        if ($(this).val().trim() == '') {
             $(this).delay(200).animate({ right: '-200px', width: '0' }, function () {
-                displaySearch();
+                $('#search_button').addClass('btn-inactive');
             }).removeClass('active');
         }
     });
@@ -519,10 +419,6 @@ ${next.modalIncludes()}
         $(document).on('hidden.bs.modal', '.modal', function () {
             $('.modal:visible').length && $(document.body).addClass('modal-open');
         });
-
-        % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
-        check_notifications();
-        % endif
     });
 
     % if _session['user_group'] != 'admin':
@@ -539,16 +435,12 @@ ${next.modalIncludes()}
             data: $(this).serialize(),
             dataType: 'json',
             statusCode: {
-                200: function(xhr, status) {
+                200: function() {
                    window.location = "${http_root}";
                 },
-                401: function(xhr, status) {
-                    $('#sign-in-alert').text('Incorrect username or password.').show();
-                    $('#username').focus();
-                },
-                429: function(xhr, status) {
-                    var retry = Math.ceil(xhr.getResponseHeader('Retry-After') / 60)
-                    $('#sign-in-alert').text('Too many login attempts. Try again in ' + retry + ' minute(s).').show();
+                401: function() {
+                   $('#incorrect-login').show();
+                   $('#username').focus();
                 }
             },
             complete: function() {

data/interfaces/default/config_import.html

@@ -1,138 +0,0 @@
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">${title}</h4>
-        </div>
-        <div class="modal-body" id="modal-text">
-            <form id="import_config_form" enctype="multipart/form-data" method="post" name="import_config_form">
-                <div class="form-group">
-                    <label for="import_config_file">Option 1: Upload a Configuration File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <label for="import_config_file" class="input-group-btn">
-                                    <span class="btn btn-form">Upload</span>
-                                    <input type="file" style="display: none;" id="import_config_file" name="import_config_file" required>
-                                </label>
-                                <input id="import_config_file_name" type="text" class="form-control" placeholder="config.ini" disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Upload the Tautulli configuration file you wish to import.</p>
-                </div>
-                <div class="form-group">
-                    <label for="import_config_path">Option 2: Browse for a Configuration File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_config_path_browse" data-toggle="browse" data-description="Configuration File" data-filter=".ini" data-target="#import_config_path">Browse</button>
-                                </span>
-                                <input type="text" class="form-control" id="import_config_path" name="import_config_path" value="" placeholder="config.ini" required disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Browse for the Tautulli configuration file you wish to import.</p>
-                </div>
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" name="import_backup_config" id="import_backup_config" value="1" checked> Backup Current Configuration
-                    </label>
-                    <p class="help-block">Automatically create a backup of the current configuration before importing.</p>
-                </div>
-                <div class="form-group">
-                    <label>Import Notes</label>
-                    <p class="help-block">The following settings will <em>not</em> be imported:</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li>Git Path, Log / Backup / Cache Directory, Plex Logs Folder</li>
-                        <li>Custom Newsletter Templates Folder, Newsletter Output Directory</li>
-                        <li>HTTP Host / Port / Root / Username / Password</li>
-                        <li>Enable HTTPS, HTTPS Certificate / Certificate Chain / Key</li>
-                    </ul>
-                </div>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <span id="status-message" style="padding-right: 25px;"></span>
-                <input type="button" id="import_config" class="btn btn-bright" value="Import">
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $("#import_config_file").change(function() {
-        if ($(this)[0].files[0]) {
-            $("#import_config_file_name").val($(this)[0].files[0].name);
-        }
-    });
-
-    $("#import_config").click(function() {
-        $(this).prop('disabled', true);
-
-        var config_file = $("#import_config_file")[0].files[0];
-        var config_path = $("#import_config_path").val();
-        var backup = $("#import_backup_config").is(':checked');
-
-        var content_type;
-        var process_data;
-        var data;
-
-        if (config_file) {
-            content_type = false;
-            process_data = false;
-            data = new FormData();
-            data.append('config_file', config_file);
-            data.append('backup', backup);
-        } else {
-            content_type = 'application/x-www-form-urlencoded; charset=UTF-8';
-            process_data = true;
-            data = {
-                config_path: config_path,
-                backup: backup
-            }
-        }
-
-        if (config_file) {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>&nbsp; Uploading config file...');
-        } else {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
-        }
-
-        $.ajax({
-            url: 'import_config',
-            type: 'POST',
-            data: data,
-            cache: false,
-            async: true,
-            contentType: content_type,
-            processData: process_data,
-            success: function(data) {
-                var msg;
-                if (data.result === 'success') {
-                    msg = "<i class='fa fa-check'></i>&nbsp; " + data.message;
-                    window.location.href = 'restart_import_config';
-                } else {
-                    msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; " + data.message;
-                }
-                $("#status-message").html(msg);
-                $("#import_config_file").val(null);
-                $("#import_config_file_name").val('');
-                $("#import_config_path").val('');
-            },
-            error: function (xhr) {
-                var msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; Error (" + xhr.status + "): ";
-                if (xhr.status === 413) {
-                    msg += "file is too large to upload"
-                } else {
-                    msg += 'try again'
-                }
-                $("#status-message").html(msg);
-            },
-            complete: function(xhr) {
-                $("#import_config").prop('disabled', false);
-            }
-        });
-    });
-</script>

data/interfaces/default/configuration_table.html

@@ -11,7 +11,6 @@ DOCUMENTATION :: END
 
 <%!
     import os
-    import sqlite3
     import sys
     import plexpy
     from plexpy import common, logger
@@ -23,11 +22,11 @@ DOCUMENTATION :: END
         % if plexpy.CURRENT_VERSION:
         <tr>
             <td>Git Branch:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/tree/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}" target="_blank" rel="noreferrer">${plexpy.CONFIG.GIT_BRANCH}</a></td>
+            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/tree/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}" target="_blank">${plexpy.CONFIG.GIT_BRANCH}</a></td>
         </tr>
         <tr>
             <td>Git Commit Hash:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}" target="_blank" rel="noreferrer">${plexpy.CURRENT_VERSION}</a></td>
+            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}" target="_blank">${plexpy.CURRENT_VERSION}</a></td>
         </tr>
         % endif
         <tr>
@@ -50,10 +49,6 @@ DOCUMENTATION :: END
             <td>Cache Directory:</td>
             <td>${plexpy.CONFIG.CACHE_DIR}</td>
         </tr>
-        <tr>
-            <td>Export Directory:</td>
-            <td>${plexpy.CONFIG.EXPORT_DIR}</td>
-        </tr>
         <tr>
             <td>Newsletter Directory:</td>
             <td>${plexpy.CONFIG.NEWSLETTER_DIR}</td>
@@ -70,36 +65,28 @@ DOCUMENTATION :: END
         </tr>
         <tr>
             <td>System Timezone:</td>
-            <td>${str(plexpy.SYS_TIMEZONE)} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
-        </tr>
-        <tr>
-            <td>System Language:</td>
-            <td>${plexpy.SYS_LANGUAGE}${' (override {})'.format(plexpy.CONFIG.PMS_LANGUAGE) if plexpy.CONFIG.PMS_LANGUAGE else ''}</td>
+            <td>${plexpy.SYS_TIMEZONE.zone} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
         </tr>
         <tr>
             <td>Python Version:</td>
             <td>${sys.version}</td>
         </tr>
-        <tr>
-            <td>SQLite Version:</td>
-            <td>${sqlite3.sqlite_version}</td>
-        </tr>
         <tr>
             <td class="top-line">Resources:</td>
             <td class="top-line">
-                <a class="no-highlight" href="${anon_url('https://tautulli.com')}" target="_blank" rel="noreferrer">Tautulli Website</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Source</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s/wiki' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Wiki</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s/issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="issue">Bug Reports</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s/issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="feature request">Feature Requests</a>
+                <a class="no-highlight" href="${anon_url('https://tautulli.com')}" target="_blank">Tautulli Website</a> |
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">GitHub Source</a> |
+                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s-Issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" data-id="issue">GitHub Issues</a> |
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s-Wiki' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank">GitHub Wiki</a> |
+                <a class="no-highlight guidelines-modal-link" href="${anon_url('http://feathub.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" data-id="feature request">FeatHub Feature Requests</a>
             </td>
         </tr>
         <tr>
             <td>Support:</td>
             <td>
-                <a class="no-highlight support-modal-link" href="${anon_url('https://tautulli.com/discord')}" target="_blank" rel="noreferrer">Tautulli Discord Server</a> |
-                <a class="no-highlight support-modal-link" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank" rel="noreferrer">Tautulli Subreddit</a> |
-                <a class="no-highlight support-modal-link" href="${anon_url('https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242')}" target="_blank" rel="noreferrer">Plex Forums</a>
+                <a class="no-highlight support-modal-link" href="${anon_url('https://tautulli.com/discord')}" target="_blank">Tautulli Discord Server</a> |
+                <a class="no-highlight support-modal-link" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank">Tautulli Subreddit</a> | 
+                <a class="no-highlight support-modal-link" href="${anon_url('https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242')}" target="_blank">Plex Forums</a>
             </td>
         </tr>
     </tbody>

data/interfaces/default/css/dataTables.bootstrap.css

@@ -0,0 +1,371 @@
+div.dataTables_length label {
+	font-weight: normal;
+	text-align: left;
+	white-space: nowrap;
+}
+
+div.dataTables_length select {
+	width: 75px;
+	display: inline-block;
+}
+
+div.dataTables_filter {
+	text-align: right;
+}
+
+div.dataTables_filter label {
+	font-weight: normal;
+	white-space: nowrap;
+	text-align: left;
+}
+
+div.dataTables_filter input {
+	margin-left: 0.5em;
+	display: inline-block;
+	width: auto;
+}
+
+div.dataTables_info {
+	padding-top: 8px;
+	white-space: nowrap;
+}
+
+div.dataTables_paginate {
+	margin: 0;
+	white-space: nowrap;
+	text-align: right;
+}
+
+div.dataTables_paginate ul.pagination {
+	margin: 2px 0;
+	white-space: nowrap;
+}
+
+@media screen and (max-width: 767px) {
+	div.dataTables_wrapper > div.row > div,
+	div.dataTables_length,
+	div.dataTables_filter,
+	div.dataTables_info,
+	div.dataTables_paginate {
+		text-align: center;
+	}
+
+	div.DTTT {
+		margin-bottom: 0.5em;
+	}
+}
+
+
+table.dataTable td,
+table.dataTable th {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+
+table.dataTable {
+	clear: both;
+	margin-top: 6px !important;
+	margin-bottom: 6px !important;
+	max-width: none !important;
+}
+
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting_asc_disabled,
+table.dataTable thead .sorting_desc_disabled {
+	cursor: pointer;
+	position: relative;
+}
+
+table.dataTable thead .sorting:after,
+table.dataTable thead .sorting_asc:after,
+table.dataTable thead .sorting_desc:after {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: block;
+	font-family: 'Glyphicons Halflings';
+	opacity: 0.5;
+}
+table.dataTable thead .sorting:after {
+	opacity: 0.2;
+	content: "\e150"; /* sort */
+}
+table.dataTable thead .sorting_asc:after {
+	content: "\e155"; /* sort-by-attributes */
+}
+table.dataTable thead .sorting_desc:after {
+	content: "\e156"; /* sort-by-attributes-alt */
+}
+div.dataTables_scrollBody table.dataTable thead .sorting:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_asc:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+table.dataTable thead .sorting_asc_disabled:after,
+table.dataTable thead .sorting_desc_disabled:after {
+	color: #eee;
+}
+
+table.dataTable thead > tr > th {
+	padding-right: 30px;
+}
+
+table.dataTable th:active {
+	outline: none;
+}
+
+
+/* Condensed */
+table.dataTable.table-condensed thead > tr > th {
+	padding-right: 20px;
+}
+
+table.dataTable.table-condensed thead .sorting:after,
+table.dataTable.table-condensed thead .sorting_asc:after,
+table.dataTable.table-condensed thead .sorting_desc:after {
+	top: 6px;
+	right: 6px;
+}
+
+/* Scrolling */
+div.dataTables_scrollHead table {
+	margin-bottom: 0 !important;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+div.dataTables_scrollHead table thead tr:last-child th:first-child,
+div.dataTables_scrollHead table thead tr:last-child td:first-child {
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+
+div.dataTables_scrollBody table {
+	border-top: none;
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+}
+
+div.dataTables_scrollBody tbody tr:first-child th,
+div.dataTables_scrollBody tbody tr:first-child td {
+	border-top: none;
+}
+
+div.dataTables_scrollFoot table {
+	margin-top: 0 !important;
+	border-top: none;
+}
+
+/* Frustratingly the border-collapse:collapse used by Bootstrap makes the column
+   width calculations when using scrolling impossible to align columns. We have
+   to use separate
+ */
+table.table-bordered.dataTable {
+	border-collapse: separate !important;
+}
+table.table-bordered thead th,
+table.table-bordered thead td {
+	border-left-width: 0;
+	border-top-width: 0;
+}
+table.table-bordered tbody th,
+table.table-bordered tbody td {
+	border-left-width: 0;
+	border-bottom-width: 0;
+}
+table.table-bordered tfoot th,
+table.table-bordered tfoot td {
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
+table.table-bordered th:last-child,
+table.table-bordered td:last-child {
+	border-right-width: 0;
+}
+div.dataTables_scrollHead table.table-bordered {
+	border-bottom-width: 0;
+}
+
+
+
+
+/*
+ * TableTools styles
+ */
+.table.dataTable tbody tr.active td,
+.table.dataTable tbody tr.active th {
+	background-color: #08C;
+	color: white;
+}
+
+.table.dataTable tbody tr.active:hover td,
+.table.dataTable tbody tr.active:hover th {
+	background-color: #0075b0 !important;
+}
+
+.table.dataTable tbody tr.active th > a,
+.table.dataTable tbody tr.active td > a {
+	color: white;
+}
+
+.table-striped.dataTable tbody tr.active:nth-child(odd) td,
+.table-striped.dataTable tbody tr.active:nth-child(odd) th {
+	background-color: #017ebc;
+}
+
+table.DTTT_selectable tbody tr {
+	cursor: pointer;
+}
+
+div.DTTT .btn:hover {
+	text-decoration: none !important;
+}
+
+ul.DTTT_dropdown.dropdown-menu {
+  z-index: 2003;
+}
+
+ul.DTTT_dropdown.dropdown-menu a {
+	color: #333 !important; /* needed only when demo_page.css is included */
+}
+
+ul.DTTT_dropdown.dropdown-menu li {
+	position: relative;
+}
+
+ul.DTTT_dropdown.dropdown-menu li:hover a {
+	background-color: #0088cc;
+	color: white !important;
+}
+
+div.DTTT_collection_background {
+	z-index: 2002;
+}
+
+/* TableTools information display */
+div.DTTT_print_info {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 400px;
+	height: 150px;
+	margin-left: -200px;
+	margin-top: -75px;
+	text-align: center;
+	color: #333;
+	padding: 10px 30px;
+	opacity: 0.95;
+
+	background-color: white;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	border-radius: 6px;
+
+	-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_print_info h6 {
+	font-weight: normal;
+	font-size: 28px;
+	line-height: 28px;
+	margin: 1em;
+}
+
+div.DTTT_print_info p {
+	font-size: 14px;
+	line-height: 20px;
+}
+
+div.dataTables_processing {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 100%;
+    height: 60px;
+    margin-left: -50%;
+    margin-top: -25px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    text-align: center;
+    font-size: 1.2em;
+    background-color: white;
+    background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));
+    background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+}
+
+
+
+/*
+ * FixedColumns styles
+ */
+div.DTFC_LeftHeadWrapper table,
+div.DTFC_LeftFootWrapper table,
+div.DTFC_RightHeadWrapper table,
+div.DTFC_RightFootWrapper table,
+table.DTFC_Cloned tr.even {
+    background-color: white;
+    margin-bottom: 0;
+}
+
+div.DTFC_RightHeadWrapper table ,
+div.DTFC_LeftHeadWrapper table {
+	border-bottom: none !important;
+    margin-bottom: 0 !important;
+    border-top-right-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper table,
+div.DTFC_LeftBodyWrapper table {
+    border-top: none;
+    margin: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper tbody tr:first-child th,
+div.DTFC_RightBodyWrapper tbody tr:first-child td,
+div.DTFC_LeftBodyWrapper tbody tr:first-child th,
+div.DTFC_LeftBodyWrapper tbody tr:first-child td {
+    border-top: none;
+}
+
+div.DTFC_RightFootWrapper table,
+div.DTFC_LeftFootWrapper table {
+    border-top: none;
+    margin-top: 0 !important;
+}
+
+
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_desc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+
+/*
+ * FixedHeader styles
+ */
+div.FixedHeader_Cloned table {
+	margin: 0 !important
+}

data/interfaces/default/css/dataTables.colVis.css

@@ -71,7 +71,7 @@ ul.ColVis_collection {
 	list-style: none;
 	width: 150px;
 	padding: 8px 8px 4px 8px;
-	margin: 10px 0px 10px 0px;
+	margin: 10px 0px 0px 0px;
 	background-color: #444;
 	overflow: hidden;
 	z-index: 2002;

data/interfaces/default/current_activity_instance.html

@@ -62,7 +62,7 @@ DOCUMENTATION :: END
 % if session is not None:
 <%
     from collections import defaultdict
-    from plexpy.helpers import cast_to_int, get_percent, page, short_season
+    from plexpy.helpers import cast_to_int, page
     from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES
     import plexpy
 %>
@@ -74,8 +74,6 @@ DOCUMENTATION :: END
     parent_href = page('info', data['parent_rating_key'])
     grandparent_href = page('info', data['grandparent_rating_key'])
     user_href = page('user', data['user_id']) if data['user_id'] else '#'
-    library_href = page('library', data['section_id']) if data['section_id'] else '#'
-    season = short_season(data['parent_title'])
 %>
 <div class="dashboard-activity-instance" id="activity-instance-${sk}" data-key="${sk}" data-id="${data['session_id']}"
     data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}"
@@ -120,7 +118,9 @@ DOCUMENTATION :: END
                         <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 300, fallback='cover', refresh=True)});"></div>
                     </a>
                     % elif data['media_type'] in ('photo', 'clip'):
-                        % if data['parent_thumb']:
+                        % if data['extra_type']:
+                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['art'].replace('/art', '/thumb') or data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
+                        % elif data['parent_thumb']:
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
                         % else:
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
@@ -161,8 +161,7 @@ DOCUMENTATION :: END
                             </li>
                             <li class="dashboard-activity-info-item">
                                 <div class="sub-heading">Quality</div>
-                                <div class="sub-value platform-right">
-                                    <span id="stream_quality-${sk}">
+                                <div class="sub-value platform-right" id="stream_quality-${sk}">
                                     % if data['media_type'] != 'photo' and data['quality_profile'] != 'Unknown':
                                     <%
                                         br = cast_to_int(data['stream_bitrate']) or ''
@@ -176,8 +175,6 @@ DOCUMENTATION :: END
                                     % else:
                                     ${data['quality_profile']}
                                     % endif
-                                    </span>
-                                    <span data-toggle="tooltip" title="Quality profile is only an estimate based on bitrate and may be incorrect"><i class="fa fa-exclamation-circle"></i></span>
                                 </div>
                             </li>
                             % if data['optimized_version'] == 1:
@@ -223,7 +220,7 @@ DOCUMENTATION :: END
                                 <div class="sub-heading">Container</div>
                                 <div class="sub-value" id="transcode_container-${sk}">
                                     % if data['stream_container_decision'] == 'transcode':
-                                    Converting (${data['container'].upper()} <i class="fa fa-long-arrow-right"></i> ${data['stream_container'].upper()})
+                                    Transcode (${data['container'].upper()} <i class="fa fa-long-arrow-right"></i> ${data['stream_container'].upper()})
                                     % else:
                                     Direct Play (${data['stream_container'].upper()})
                                     % endif
@@ -235,14 +232,11 @@ DOCUMENTATION :: END
                                 <div class="sub-value" id="video_decision-${sk}">
                                     % if data['media_type'] in ('movie', 'episode', 'clip') and data['stream_video_decision']:
                                         <%
-                                            if data['video_dynamic_range'] != 'SDR':
+                                            if data['video_dynamic_range'] == 'HDR':
                                                 video_dynamic_range = ' ' + data['video_dynamic_range']
-                                            else:
-                                                video_dynamic_range = ''
-                                            if data['stream_video_dynamic_range'] != 'SDR' or video_dynamic_range:
                                                 stream_video_dynamic_range = ' ' + data['stream_video_dynamic_range']
                                             else:
-                                                stream_video_dynamic_range = ''
+                                                video_dynamic_range = stream_video_dynamic_range = ''
                                         %>
                                         % if data['stream_video_decision'] == 'transcode':
                                         <%
@@ -266,15 +260,12 @@ DOCUMENTATION :: END
                                 <div class="sub-heading">Audio</div>
                                 <div class="sub-value" id="audio_decision-${sk}">
                                     % if data['stream_audio_decision']:
-                                        <%
-                                            audio_language = (data['audio_language'] or 'Unknown') +  ' - ' if data['media_type'] != 'track' else ''
-                                        %>
                                         % if data['stream_audio_decision'] == 'transcode':
-                                        Transcode (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())} ${data['audio_channel_layout'].split('(')[0].capitalize()} <i class="fa fa-long-arrow-right"></i> ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
+                                        Transcode (${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())} ${data['audio_channel_layout'].split('(')[0].capitalize()} <i class="fa fa-long-arrow-right"></i> ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
                                         % elif data['stream_audio_decision'] == 'copy':
-                                        Direct Stream (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
+                                        Direct Stream (${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
                                         % else:
-                                        Direct Play (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
+                                        Direct Play (${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
                                         % endif
                                     % endif
                                 </div>
@@ -289,13 +280,13 @@ DOCUMENTATION :: END
                                             subtitle_codec = 'None' if data['stream_subtitle_codec'] and data['stream_subtitle_transient'] else data['subtitle_codec'].upper()
                                         %>
                                         % if data['stream_subtitle_decision'] == 'transcode':
-                                        Transcode (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec} <i class="fa fa-long-arrow-right"></i> ${data['stream_subtitle_codec'].upper()})
+                                        Transcode (${subtitle_codec} <i class="fa fa-long-arrow-right"></i> ${data['stream_subtitle_codec'].upper()})
                                         % elif data['stream_subtitle_decision'] == 'copy':
-                                        Direct Stream (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec})
+                                        Direct Stream (${subtitle_codec})
                                         % elif data['stream_subtitle_decision'] == 'burn':
-                                        Burn (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec})
+                                        Burn (${subtitle_codec})
                                         % else:
-                                        Direct Play (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec if data['synced_version'] else data['stream_subtitle_codec'].upper()})
+                                        Direct Play (${subtitle_codec if data['synced_version'] else data['stream_subtitle_codec'].upper()})
                                         % endif
                                     % else:
                                     None
@@ -325,8 +316,7 @@ DOCUMENTATION :: END
                                         % if data['relayed']:
                                         <span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span>
                                         % else:
-                                        <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal"
-                                            data-ip="${data['ip_address']}" data-location="${data['location']}" data-secure="${data['secure']}" data-relayed="${data['relayed']}">
+                                        <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal" data-ip="${data['ip_address']}">
                                             <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup External IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
                                         </a>
                                         <script>
@@ -370,7 +360,7 @@ DOCUMENTATION :: END
                 % if data['media_type'] != 'photo':
                 <div class="dashboard-activity-info-time">
                     % if data['live']:
-                    <br /><span class="thumb-tooltip dashboard-activity-info-channel" data-toggle="popover" data-img="${data['channel_thumb']}" data-height="40" data-width="40">${data['channel_title'] or (data['channel_vcn'] + ' ' + data['channel_call_sign'])}</span>
+                    <br /><span class="thumb-tooltip" data-toggle="popover" data-img="${data['channel_thumb']}" data-height="40" data-width="40">${data['channel_call_sign']} ${data['channel_identifier']}</span>
                     % elif data['view_offset']:
                     ETA:
                     <span id="stream-eta-${sk}">
@@ -402,16 +392,15 @@ DOCUMENTATION :: END
                 % if data['live']:
                 <div id="progress-bar-${sk}" class="progress-bar" style="width: 100%" data-state="live" data-toggle="tooltip" title="Stream Progress Live">Live</div>
                 % else:
-                <%  transcode_progress = get_percent(data['transcode_max_offset_available'] * 1000, data['duration']) or data['transcode_progress'] %>
-                <div id="buffer-bar-${sk}" class="buffer-bar" style="width: ${transcode_progress}%" data-toggle="tooltip" title="Transcoder Progress ${transcode_progress}%">${transcode_progress}%</div>
+                <div id="buffer-bar-${sk}" class="buffer-bar" style="width: ${data['transcode_progress']}%" data-toggle="tooltip" title="Transcoder Progress ${data['transcode_progress']}%">${data['transcode_progress']}%</div>
                 <div id="progress-bar-${sk}" class="progress-bar" style="width: ${data['progress_percent']}%" data-last_view_offset="${data['view_offset']}" data-view_offset="${data['view_offset']}" data-stream_duration="${data['stream_duration']}" data-state="${data['state']}" data-toggle="tooltip" title="Stream Progress ${data['progress_percent']}%">${data['progress_percent']}%</div>
                 % endif
             </div>
         </div>
     </div>
     <div class="dashboard-activity-metadata-wrapper">
-        <a href="${user_href}" title="${data['username']}">
-            <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${page('pms_image_proxy', data['user_thumb'], None, 80, 80, fallback='user')});"></div>
+        <a href="${user_href}" title="${data['friendly_name']}">
+            <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
         </a>
         <div class="dashboard-activity-metadata-title-container">
             <div id="play-state-${sk}" class="dashboard-activity-metadata-play_state-icon" title="${data['state'].capitalize()}">
@@ -421,10 +410,6 @@ DOCUMENTATION :: END
                 <i class="fa fa-fw fa-pause"></i>&nbsp;
                 % elif data['state'] == 'buffering':
                 <i class="fa fa-fw fa-spinner"></i>&nbsp;
-                % elif data['state'] == 'error':
-                <i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;
-                % else:
-                <i class="fa fa-fw fa-question-circle"></i>&nbsp;
                 % endif
             </div>
             <div class="dashboard-activity-metadata-title">
@@ -464,27 +449,21 @@ DOCUMENTATION :: END
         <div class="dashboard-activity-metadata-subtitle-container">
             % if data['live']:
             <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Live TV">
-                <a href="${library_href}">
-                    <i class="fa fa-fw fa-broadcast-tower"></i>
-                </a>&nbsp;
+                <i class="fa fa-fw fa-broadcast-tower"></i>&nbsp;
             </div>
             % elif data['channel_stream'] == 0:
             <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="${data['media_type'].capitalize()}">
-                <a href="${library_href}">
-                    % if data['media_type'] == 'movie':
-                    <i class="fa fa-fw fa-film"></i>
-                    % elif data['media_type'] == 'episode':
-                    <i class="fa fa-fw fa-television"></i>
-                    % elif data['media_type'] == 'track':
-                    <i class="fa fa-fw fa-music"></i>
-                    % elif data['media_type'] == 'photo':
-                    <i class="fa fa-fw fa-picture-o"></i>
-                    % elif data['media_type'] == 'clip':
-                    <i class="fa fa-fw fa-video-camera"></i>
-                    % else:
-                    <i class="fa fa-fw fa-question-circle"></i>
-                    % endif
-                </a>&nbsp;
+                % if data['media_type'] == 'movie':
+                <i class="fa fa-fw fa-film"></i>&nbsp;
+                % elif data['media_type'] == 'episode':
+                <i class="fa fa-fw fa-television"></i>&nbsp;
+                % elif data['media_type'] == 'track':
+                <i class="fa fa-fw fa-music"></i>&nbsp;
+                % elif data['media_type'] == 'photo':
+                <i class="fa fa-fw fa-picture-o"></i>&nbsp;
+                % elif data['media_type'] == 'clip':
+                <i class="fa fa-fw fa-video-camera"></i>&nbsp;
+                % endif
             </div>
             % else:
             <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Channel">
@@ -497,7 +476,7 @@ DOCUMENTATION :: END
                     <span title="${data['year']}" class="sub-heading">${data['year']}</span>
                     % elif data['media_type'] == 'episode':
                     % if data['media_index']:
-                    <a href="${href}" title="${data['parent_title']}" class="sub-heading">${season}</a>
+                    <a href="${href}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a>
                     &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
                     % else:
                     <a href="${href}" title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</a>
@@ -509,7 +488,7 @@ DOCUMENTATION :: END
                     % if data['media_type'] == 'movie':
                     <span title="${data['year']}" class="sub-heading">${data['year']}</span>
                     % elif data['media_type'] == 'episode':
-                    <a href="${parent_href}" title="${data['parent_title']}" class="sub-heading">${season}</a>
+                    <a href="${parent_href}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a>
                     &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
                     % elif data['media_type'] == 'track':
                     <a id="metadata-parent_title-${sk}" href="${parent_href}" title="${data['parent_title']}" class="sub-heading">${data['parent_title']}</a>
@@ -526,7 +505,7 @@ DOCUMENTATION :: END
                 % elif data['channel_title']:
                 <span title="${data['channel_title']}" class="sub-heading">${data['channel_title']}</span>
                     % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']:
-                    (<span title="${data['parent_title']}" class="sub-heading">${season}</span>
+                    (<span title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</span>
                     &middot; <span title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</span>)
                     % elif data['media_type'] == 'episode' and data['originally_available_at']:
                     (<span title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</span>)
@@ -534,7 +513,7 @@ DOCUMENTATION :: END
                 % else:
                 <span title="Channel" class="sub-heading">Channel</span>
                     % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']:
-                    (<span title="${data['parent_title']}" class="sub-heading">${season}</span>
+                    (<span title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</span>
                     &middot; <span title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</span>)
                     % elif data['media_type'] == 'episode' and data['originally_available_at']:
                     (<span title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</span>)
@@ -542,9 +521,9 @@ DOCUMENTATION :: END
                 % endif
             </div>
             <div class="dashboard-activity-metadata-user">
-                <a href="${user_href}" title="${data['username']}">${data['friendly_name']}</a>
+                <a href="${user_href}" title="${data['friendly_name']}">${data['friendly_name']}</a>
             </div>
         </div>
     </div>
 </div>
-% endif
+% endif

data/interfaces/default/edit_library.html

@@ -115,13 +115,21 @@ DOCUMENTATION :: END
         var msg = 'Are you REALLY sure you want to purge all history for the <strong>${data["section_name"]}</strong> library?<br>' + 
             'This is permanent and cannot be undone!';
         var url = 'delete_all_library_history';
-        confirmAjaxCall(url, msg, { server_id: '${server_id}', section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
+        confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
     });
 
     $('#undelete-library').click(function () {
-        var msg = 'Are you sure you want to undelete this library?';
+        var msg = 'Are you sure you want to undelete this user?';
         var url = 'undelete_library';
         confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
     });
+
+    $(document).ready(function() {
+        // Move #confirm-modal to parent container
+        if (!($('#edit-library-modal').next().is('#confirm-modal-purge'))) {
+            $('#confirm-modal-purge').appendTo($('#edit-library-modal').parent());
+        }
+        $('#edit-library-modal > #confirm-modal-purge').remove();
+    });
 </script>
 % endif

data/interfaces/default/edit_user.html

@@ -134,5 +134,13 @@ DOCUMENTATION :: END
         var url = 'undelete_user';
         confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
     });
+
+    $(document).ready(function() {
+        // Move #confirm-modal-purge to parent container
+        if (!($('#edit-user-modal').next().is('#confirm-modal-purge'))) {
+            $('#confirm-modal-purge').appendTo($('#edit-user-modal').parent());
+        }
+        $('#edit-user-modal > #confirm-modal-purge').remove();
+    });
 </script>
 % endif

data/interfaces/default/export_modal.html

@@ -1,310 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           export_modal.html
-Version:            0.1
-Variable names:     data [list]
-
-data :: Usable parameters
-
-== Global keys ==
-
-DOCUMENTATION :: END
-</%doc>
-<%
-    import plexpy
-    from plexpy import exporter
-    from plexpy.helpers import anon_url
-    export = exporter.Export()
-    thumb_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[0]])
-    art_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[1]])
-    logo_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[2]])
-%>
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="info-modal-title">
-                ${title}
-            </h4>
-        </div>
-        <div class="modal-body">
-            <form method="post" class="form" id="export_metadata_form">
-                <input type="hidden" id="export_section_id" name="export_section_id" value="${section_id or ''}" />
-                <input type="hidden" id="export_user_id" name="export_user_id" value="${user_id or ''}" />
-                <input type="hidden" id="export_rating_key" name="export_rating_key" value="${rating_key or ''}" />
-                <input type="hidden" id="export_media_type" name="export_media_type" value="${media_type or ''}" />
-                <input type="hidden" id="export_sub_media_type" name="export_sub_media_type" value="${sub_media_type or ''}" />
-                <input type="hidden" id="export_export_type" name="export_export_type" value="${export_type or ''}" />
-                <div class="form-group">
-                    <label>Instructions</label>
-                    <p class="help-block">
-                        Please see the <a href="${anon_url('https://github.com/%s/%s/wiki/Exporter-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Exporter Guide</a> for more details about each option.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_file_format">Data File Format</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_file_format" name="export_file_format">
-                                % for format in file_formats:
-                                <option value="${format}">${format.upper()}</option>
-                                % endfor
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the export data file format.</p>
-                </div>
-                % if not rating_key:
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" id="export_individual_files" name="export_individual_files" value="1"> Export Individual Files
-                    </label>
-                    <p class="help-block">Enable to export one file for each ${media_type} instead of a single file containing all ${media_type}s.</p>
-                </div>
-                % endif
-                <div class="form-group">
-                    <label for="export_metadata_level">Metadata Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_metadata_level" name="export_metadata_level">
-                                <option value="0">Level 0 - None / Custom</option>
-                                <option value="1" selected>Level 1 - Basic Metadata</option>
-                                <option value="2">Level 2 - Extended Metadata</option>
-                                <option value="3">Level 3 - Advanced Metadata</option>
-                                <option value="9">Level 9 - All Metadata</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the metadata export level. Higher levels include all fields from the lower levels.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_custom_metadata_fields">Custom Metadata Fields</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <input type="text" class="form-control" id="export_custom_metadata_fields" name="export_custom_metadata_fields" data-field_type="Metadata">
-                        </div>
-                    </div>
-                    <p class="help-block">Add additional fields to the selected metadata export level.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_media_info_level">Media Info Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_media_info_level" name="export_media_info_level">
-                                <option value="0">Level 0 - None / Custom</option>
-                                <option value="1" selected>Level 1 - Basic Media Info</option>
-                                <option value="2">Level 2 - Extended Media Info</option>
-                                <option value="3">Level 3 - Advanced Media Info</option>
-                                <option value="9">Level 9 - All Media Info</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the media info export level. Higher levels include all fields from the lower levels.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_custom_media_info_fields">Custom Media Info Fields</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <input type="text" class="form-control" id="export_custom_media_info_fields" name="export_custom_media_info_fields" data-field_type="Media Info">
-                        </div>
-                    </div>
-                    <p class="help-block">Add additional fields to the selected media info export level.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_thumb_level">Poster and Cover Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_thumb_level" name="export_thumb_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Posters and Covers Only</option>
-                                <option value="2">Level 2 - Selected and Locked Posters and Covers Only</option>
-                                <option value="9">Level 9 - All Selected Posters and Covers</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export poster and cover image files.<br>Note: Only applies to ${thumb_media_types}.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_art_level">Background Artwork Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_art_level" name="export_art_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Artwork Only</option>
-                                <option value="2">Level 2 - Selected and Locked Artwork Only</option>
-                                <option value="9">Level 9 - All Selected Artwork</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export background artwork image files.<br>Note: Only applies to ${art_media_types}.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_logo_level">Logo Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_logo_level" name="export_logo_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Logos Only</option>
-                                <option value="2">Level 2 - Selected and Locked Logos Only</option>
-                                <option value="9">Level 9 - All Selected Logos</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export logo image files.<br>Note: Only applies to ${logo_media_types}.
-                    </p>
-                </div>
-                <p class="help-block">
-                    Warning: Exporting images may take a long time! Images will be saved to a folder alongside the data file.
-                </p>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <input type="button" class="btn btn-bright btn-ok" data-dismiss="modal" id="export_metadata" value="Export">
-            </div>
-        </div>
-    </div>
-</div>
-<script src="${http_root}js/selectize.plugin.disable-options.js"></script>
-<script>
-    $('#export_metadata_form').submit(function(e) {
-        e.preventDefault();
-    })
-
-    var optgroups = (function () {
-        var optgroups = [];
-        for (var i = 0; i <= 9; i++) {
-            optgroups.push({$order: i+1, value: i});
-        }
-        return optgroups
-    })()
-
-    var $export_custom_fields = $('#export_custom_metadata_fields, #export_custom_media_info_fields').selectize({
-        plugins: {
-            'remove_button': {},
-            'disable_options': {
-                disableField: 'level'
-            }
-        },
-        maxItems: null,
-        valueField: 'field',
-        labelField: 'field',
-        sortField: 'field',
-        searchField: ['field'],
-        optgroupField: 'level',
-        optgroups: optgroups,
-        lockOptgroupOrder: true,
-        render: {
-            optgroup_header: function(data, escape) {
-                return '<div class="optgroup-header">' + escape(this.$input.data('field_type') + ' Level: ' + data.value) + '</div>';
-            },
-            option: function (item, escape) {
-                return '<div data-field="' + escape(item.field) + '" data-level="' + escape(item.level) + '">' + escape(item.field) +'</div>';
-            }
-        }
-    });
-    var export_custom_metadata_fields = $export_custom_fields[0].selectize;
-    var export_custom_media_info_fields = $export_custom_fields[1].selectize;
-
-    function setDisabledFields() {
-        var metadata_export_level = $('#export_metadata_level option:selected').val();
-        var media_info_export_level = $('#export_media_info_level option:selected').val();
-        export_custom_metadata_fields.setDisabledOptions([...Array(parseInt(metadata_export_level) + 1).keys()]);
-        export_custom_media_info_fields.setDisabledOptions([...Array(parseInt(media_info_export_level) + 1).keys()]);
-    }
-
-    $('#export_metadata_level, #export_media_info_level').on('change', setDisabledFields);
-
-    function getExportFields() {
-        $.ajax({
-            url: 'get_export_fields',
-            async: true,
-            data: {
-                media_type: $('#export_media_type').val(),
-                sub_media_type: $('#export_sub_media_type').val()
-            },
-            success: function (result) {
-                if (result) {
-                    export_custom_metadata_fields.addOption(result.metadata_fields);
-                    export_custom_media_info_fields.addOption(result.media_info_fields);
-                    setDisabledFields();
-                }
-            }
-        })
-    }
-    getExportFields();
-
-    $('#export_file_format').on('change', function() {
-        if ($(this).val() === 'm3u') {
-            $('#export_metadata_level').prop('disabled', true);
-            $('#export_media_info_level').prop('disabled', true);
-            $("#export_thumb_level").prop('disabled', true);
-            $("#export_art_level").prop('disabled', true);
-            $("#export_logo_level").prop('disabled', true);
-            export_custom_metadata_fields.disable();
-            export_custom_media_info_fields.disable();
-        } else {
-            $('#export_metadata_level').prop('disabled', false);
-            $('#export_media_info_level').prop('disabled', false);
-            $("#export_thumb_level").prop('disabled', false);
-            $("#export_art_level").prop('disabled', false);
-            $("#export_logo_level").prop('disabled', false);
-            export_custom_metadata_fields.enable();
-            export_custom_media_info_fields.enable();
-        }
-    })
-
-    $("#export_metadata").click(function() {
-        var section_id = $('#export_section_id').val();
-        var user_id = $('#export_user_id').val();
-        var rating_key = $('#export_rating_key').val();
-        var metadata_export_level = $('#export_metadata_level option:selected').val();
-        var media_info_export_level = $('#export_media_info_level option:selected').val();
-        var file_format = $('#export_file_format option:selected').val();
-        var thumb_level = $("#export_thumb_level option:selected").val();
-        var art_level = $("#export_art_level option:selected").val();
-        var logo_level = $("#export_logo_level option:selected").val();
-        var custom_fields = [
-            $('#export_custom_metadata_fields').val(),
-            $('#export_custom_media_info_fields').val()
-        ].filter(Boolean).join(',');
-        var export_type = $('#export_export_type').val()
-        var individual_files = $('#export_individual_files').is(':checked')
-
-        $.ajax({
-            url: 'export_metadata',
-            data: {
-                section_id: section_id,
-                user_id: user_id,
-                rating_key: rating_key,
-                metadata_level: metadata_export_level,
-                media_info_level: media_info_export_level,
-                file_format: file_format,
-                thumb_level: thumb_level,
-                art_level: art_level,
-                logo_level: logo_level,
-                custom_fields: custom_fields,
-                export_type: export_type,
-                individual_files: individual_files
-            },
-            async: true,
-            success: function (data) {
-                if (data.result === 'success') {
-                    $("#nav-tabs-export").click();
-                    redrawExportTable();
-                    showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                } else {
-                    showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                }
-            }
-        });
-    });
-</script>

data/interfaces/default/graphs.html

@@ -1,8 +1,7 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/bootstrap-select.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
+<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
@@ -15,15 +14,17 @@
         <div class="button-bar">
             <div class="btn-group" id="user-selection">
                 <label>
-                    <select name="graph-user" id="graph-user" multiple>
+                    <select name="graph-user" id="graph-user" class="btn" style="color: inherit;">
+                        <option value="">All Users</option>
+                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
                     </select>
                 </label>
             </div>
             <div class="btn-group" style="margin-right: 2px;" data-toggle="buttons" id="yaxis-selection">
-                <label class="btn btn-dark btn-filter">
+                <label class="btn btn-dark">
                     <input type="radio" name="yaxis-options" id="yaxis-plays" value="plays" autocomplete="off"> Play Count
                 </label>
-                <label class="btn btn-dark btn-filter">
+                <label class="btn btn-dark">
                     <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off"> Play Duration
                 </label>
             </div>
@@ -39,17 +40,17 @@
 			</div>
         </div>
     </div>
-    <div class="table-card-back">
-        <ul class="nav nav-list nav-pills" role="tablist" id="graph-tabs">
-            <li role="presentation"><a id="nav-tabs-plays" href="#tabs-plays" aria-controls="tabs-plays" data-toggle="tab" role="tab">Media Type</a></li>
-            <li role="presentation"><a id="nav-tabs-stream" href="#tabs-stream" aria-controls="tabs-stream" data-toggle="tab" role="tab">Stream Type</a></li>
-            <li role="presentation"><a id="nav-tabs-total" href="#tabs-total" aria-controls="tabs-total" data-toggle="tab" role="tab">Play Totals</a></li>
+    <div class='table-card-back'>
+        <ul class="nav nav-pills" role="tablist" id="graph-tabs">
+            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by Period</a></li>
+            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
         </ul>
         <div class="tab-content">
-            <div role="tabpanel" class="tab-pane" id="tabs-plays">
+            <div role="tabpanel" class="tab-pane" id="tabs-1">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by media type <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
                         </p>
@@ -122,10 +123,10 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-stream">
+            <div role="tabpanel" class="tab-pane" id="tabs-2">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-video-camera"></i> Daily <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by stream type <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The total play count or duration of tv, movies, and music by the transcode decision. Click a graph point to open up a list of items played for that specific date.
                         </p>
@@ -137,20 +138,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="row" id="concurrent-graph">
-                    <div class="col-md-12">
-                        <h4><i class="fa fa-video-camera"></i> Daily concurrent stream count</span> by stream type <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The total count of concurrent streams of tv, movies, and music by the transcode decision.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_concurrent_streams_by_stream_type">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="row">
                     <div class="col-md-6">
                         <h4><i class="fa fa-expand-arrows-alt"></i> <span class="yaxis-text">Play count</span> by source resolution <small>Last <span class="days">30</span> days</small></h4>
@@ -208,10 +195,10 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-total">
+            <div role="tabpanel" class="tab-pane" id="tabs-3">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-calendar"></i> Total <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by month <small>Last <span class="months">12</span> months</small></h4>
+                        <h4><i class="fa fa-calendar"></i> Plays by month <small>Last <span class="months">12</span> months</small></h4>
                         <p class="help-block">
                             The combined total of tv, movies, and music by month.
                         </p>
@@ -238,8 +225,9 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/bootstrap-select.min.js"></script>
-<script src="${http_root}js/highcharts.min.js"></script>
+<script src="${http_root}js/moment-with-locale.js"></script>
+<script src="${http_root}js/moment-duration-format.js"></script>
+<script src="${http_root}js/highcharts/js/highcharts.js"></script>
 <script src="${http_root}js/jquery.dataTables.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
@@ -301,10 +289,6 @@
             return obj;
         }, {});
 
-        if (!("Total" in chart_visibility)) {
-            chart_visibility["Total"] = false;
-        }
-
         return data_series.map(function(s) {
             var obj = Object.assign({}, s);
             obj.visible = (chart_visibility[s.name] !== false);
@@ -330,9 +314,7 @@
             'Live TV': '#19A0D7',
             'Direct Play': '#E5A00D',
             'Direct Stream': '#FFFFFF',
-            'Transcode': '#F06464',
-            'Max. Concurrent Streams': '#96C83C',
-            'Total': '#96C83C'
+            'Transcode': '#F06464'
         };
         var series_colors = [];
         $.each(data_series, function(index, series) {
@@ -347,7 +329,6 @@
 <script src="${http_root}js/graphs/plays_by_platform.js${cache_param}"></script>
 <script src="${http_root}js/graphs/plays_by_user.js${cache_param}"></script>
 <script src="${http_root}js/graphs/plays_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/concurrent_streams_by_stream_type.js${cache_param}"></script>
 <script src="${http_root}js/graphs/plays_by_source_resolution.js${cache_param}"></script>
 <script src="${http_root}js/graphs/plays_by_stream_resolution.js${cache_param}"></script>
 <script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js${cache_param}"></script>
@@ -360,37 +341,18 @@
         var yaxis = getLocalStorage('graph_type', 'plays');
         var current_day_range = getLocalStorage('graph_days', 30);
         var current_month_range = getLocalStorage('graph_months', 12);
-        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-plays');
-
-        // Update tab values from upgrading
-        switch (current_tab) {
-            case '#tabs-1':
-                current_tab = '#tabs-plays'
-                break
-            case '#tabs-2':
-                current_tab = '#tabs-stream'
-                break
-            case '#tabs-3':
-                current_tab = '#tabs-total'
-                break
-            default:
-                break
-        }
-
-        if (window.location.hash === '#concurrent-graph') {
-            current_tab = '#tabs-stream';
-        }
+        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-1');
 
         $('#yaxis-' + yaxis).prop('checked', true);
         $('#yaxis-' + yaxis).closest('label').addClass('active');
         $('#graph-days').val(current_day_range);
         $('#graph-months').val(current_month_range);
-        $('#nav-' + current_tab.replace('#', '')).tab('show').trigger('show.bs.tab');
-        //$(current_tab).addClass('active');
+        $('#graph-tabs a[href="' + current_tab + '"]').closest('li').addClass('active');
+        $(current_tab).addClass('active');
 
 
-        $('.days').text(current_day_range);
-        $('.months').text(current_month_range);
+        $('.days').html(current_day_range);
+        $('.months').html(current_month_range);
         
         // Load user ids and names (for the selector)
         $.ajax({
@@ -398,35 +360,14 @@
             type: 'get',
             dataType: "json",
             success: function (data) {
-                let select = $('#graph-user');
-                let by_id = {};
+                var select = $('#graph-user');
                 data.sort(function(a, b) {
                     return a.friendly_name.localeCompare(b.friendly_name);
                 });
                 data.forEach(function(item) {
                     select.append('<option value="' + item.user_id + '">' +
                         item.friendly_name + '</option>');
-                    by_id[item.user_id] = item.friendly_name;
                 });
-                select.selectpicker({
-                    countSelectedText: function(sel, total) {
-                        if (sel === 0 || sel === total) {
-                            return 'All users';
-                        } else if (sel > 1) {
-                            return sel + ' users';
-                        } else {
-                            return select.val().map(function(id) {
-                                return by_id[id];
-                            }).join(', ');
-                        }
-                    },
-                    style: 'btn-dark',
-                    actionsBox: true,
-                    selectedTextFormat: 'count',
-                    noneSelectedText: 'All users'
-                });
-                select.selectpicker('render');
-                select.selectpicker('selectAll');
             }
         });
 
@@ -528,7 +469,7 @@
                 }
             });
 
-            $('#nav-tabs-plays').tab('show');
+            $('#graph-tabs a[href="#tabs-1"]').tab('show')
         }
 
         function loadGraphsTab2(time_range, yaxis) {
@@ -565,33 +506,6 @@
                 }
             });
 
-            $.ajax({
-                url: "get_concurrent_streams_by_stream_type",
-                type: 'get',
-                data: { time_range: time_range, user_id: selected_user_id },
-                dataType: "json",
-                success: function(data) {
-                    var dateArray = [];
-                    $.each(data.categories, function (i, day) {
-                        dateArray.push(moment(day, 'YYYY-MM-DD').valueOf());
-                        // Highlight the weekend
-                        if ((moment(day, 'YYYY-MM-DD').format('ddd') == 'Sat') ||
-                            (moment(day, 'YYYY-MM-DD').format('ddd') == 'Sun')) {
-                            hc_plays_by_day_options.xAxis.plotBands.push({
-                                from: i-0.5,
-                                to: i+0.5,
-                                color: 'rgba(80,80,80,0.3)'
-                            });
-                        }
-                    });
-                    hc_concurrent_streams_by_stream_type_options.yAxis.min = 0;
-                    hc_concurrent_streams_by_stream_type_options.xAxis.categories = dateArray;
-                    hc_concurrent_streams_by_stream_type_options.series = getGraphVisibility(hc_concurrent_streams_by_stream_type_options.chart.renderTo, data.series);
-                    hc_concurrent_streams_by_stream_type_options.colors = getGraphColors(data.series);
-                    var hc_plays_by_stream_type = new Highcharts.Chart(hc_concurrent_streams_by_stream_type_options);
-                }
-            });
-
             $.ajax({
                 url: "get_plays_by_source_resolution",
                 type: 'get',
@@ -648,7 +562,7 @@
                 }
             });
 
-            $('#nav-tabs-stream').tab('show');
+            $('#graph-tabs a[href="#tabs-2"]').tab('show')
         }
 
         function loadGraphsTab3(time_range, yaxis) {
@@ -672,11 +586,16 @@
                 }
             });
 
-            $('#nav-tabs-total').tab('show');
+            $('#graph-tabs a[href="#tabs-3"]').tab('show')
         }
 
+        // Set initial state
+        if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+        if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+        if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+
         // Tab1 opened
-        $('#nav-tabs-plays').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -684,7 +603,7 @@
         });
 
         // Tab2 opened
-        $('#nav-tabs-stream').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -692,7 +611,7 @@
         });
 
         // Tab3 opened
-        $('#nav-tabs-total').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -705,9 +624,9 @@
             forceMinMax($(this));
             current_day_range = $(this).val();
             setLocalStorage('graph_days', current_day_range);
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            $('.days').text(current_day_range);
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            $('.days').html(current_day_range);
         });
         
         // Month range changed
@@ -716,36 +635,25 @@
             forceMinMax($(this));
             current_month_range = $(this).val();
             setLocalStorage('graph_months', current_month_range);
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
-            $('.months').text(current_month_range);
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            $('.months').html(current_month_range);
         });
 
-        let graph_user_last_id = undefined;
-
         // User changed
         $('#graph-user').on('change', function() {
-            let val = $(this).val();
-            if (val.length === 0 || val.length === $(this).children().length) {
-                selected_user_id = null; // if all users are selected, just send an empty list
-            } else {
-                selected_user_id = val.join(",");
-            }
-            if (selected_user_id === graph_user_last_id) {
-                return;
-            }
-            graph_user_last_id = selected_user_id;
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
+            selected_user_id = $(this).val() || null;
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
         });
         
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
             setLocalStorage('graph_type', yaxis);
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
         });
 
         function setGraphFormat(type) {
@@ -760,7 +668,6 @@
                     if (this.points.length > 1) {
                         var total = 0;
                         $.each(this.points, function(i, point) {
-                            if (point.series.name === 'Total') return;
                             s += '<br/>'+point.series.name+': '+point.y;
                             total += point.y;
                         });
@@ -787,7 +694,6 @@
                     if (this.points.length > 1) {
                         var total = 0;
                         $.each(this.points, function(i, point) {
-                            if (point.series.name === 'Total') return;
                             s += '<br/>'+point.series.name+': '+moment.duration(point.y, 'hours').format('D [days] H [hrs] m [mins]');
                             total += point.y;
                         });
@@ -808,7 +714,6 @@
 
             hc_plays_by_day_options.xAxis.plotBands = [];
             hc_plays_by_stream_type_options.xAxis.plotBands = [];
-            hc_concurrent_streams_by_stream_type_options.xAxis.plotBands = [];
 
             hc_plays_by_day_options.yAxis.labels.formatter = yaxis_format;
             hc_plays_by_dayofweek_options.yAxis.labels.formatter = yaxis_format;

data/interfaces/default/history.html

@@ -1,65 +1,51 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/bootstrap-select.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
+<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.css">
 <link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
 <link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
 </%def>
 
 <%def name="body()">
 <div class='container-fluid'>
-    % if config['database_is_importing']:
-    <div style="text-align: center; margin-top: 20px;">
-        <i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is importing history from another database. This could take a few minutes depending on the size of your database.
-        <br />
-        You may leave this page and check back later.
-    </div>
-    % endif
     <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-history"></i> History</span>
         </div>
         <div class="button-bar">
             % if _session['user_group'] == 'admin':
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbsp</div>
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
             <div class="btn-group">
                 <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                     <i class="fa fa-trash-o"></i> Delete mode
-                </button>
+                </button>&nbsp
             </div>
             % endif
             % if _session['user_group'] == 'admin':
             <div class="btn-group" id="user-selection">
                 <label>
-                    <select name="history-user" id="history-user" multiple>
+                    <select name="history-user" id="history-user" class="btn" style="color: inherit;">
+                        <option value="">All Users</option>
+                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
                     </select>
                 </label>
             </div>
             % endif
             <div class="btn-group" data-toggle="buttons" id="media_type-selection">
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-movie" value="movie" autocomplete="off"><i class="fa fa-film"></i> Movies
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-all" value="all" autocomplete="off"> All
                 </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-episode" value="episode" autocomplete="off"><i class="fa fa-television"></i> TV Shows
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-movie" value="movie" autocomplete="off"> Movies
                 </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-track" value="track" autocomplete="off"><i class="fa fa-music"></i> Music
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-episode" value="episode" autocomplete="off"> TV Shows
                 </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-live" value="live" autocomplete="off"><i class="fa fa-broadcast-tower"></i> Live TV
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-track" value="track" autocomplete="off"> Music
                 </label>
-            </div>
-            <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-copy" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
+                <label class="btn btn-dark">
+                    <input type="radio" name="media_type-filter" id="history-live" value="live" autocomplete="off"> Live TV
                 </label>
             </div>
             <div class="btn-group">
@@ -83,7 +69,7 @@
                 <th align="left" id="started">Started</th>
                 <th align="left" id="paused_counter">Paused</th>
                 <th align="left" id="stopped">Stopped</th>
-                <th align="left" id="play_duration">Duration</th>
+                <th align="left" id="duration">Duration</th>
                 <th align="left" id="percent_complete"></th>
             </tr>
             </thead>
@@ -120,11 +106,11 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/bootstrap-select.min.js"></script>
 <script src="${http_root}js/jquery.dataTables.min.js"></script>
 <script src="${http_root}js/dataTables.colVis.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
+<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script>
     $(document).ready(function () {
@@ -134,41 +120,18 @@
             type: 'GET',
             dataType: 'json',
             success: function (data) {
-                let select = $('#history-user');
-                let by_id = {};
+                var select = $('#history-user');
                 data.sort(function (a, b) {
                     return a.friendly_name.localeCompare(b.friendly_name);
                 });
                 data.forEach(function (item) {
                     select.append('<option value="' + item.user_id + '">' +
                         item.friendly_name + '</option>');
-                    by_id[item.user_id] = item.friendly_name;
                 });
-                select.selectpicker({
-                    countSelectedText: function(sel, total) {
-                        if (sel === 0 || sel === total) {
-                            return 'All users';
-                        } else if (sel > 1) {
-                            return sel + ' users';
-                        } else {
-                            return select.val().map(function(id) {
-                                return by_id[id];
-                            }).join(', ');
-                        }
-                    },
-                    style: 'btn-dark',
-                    actionsBox: true,
-                    selectedTextFormat: 'count',
-                    noneSelectedText: 'All users'
-                });
-                select.selectpicker('render');
-                select.selectpicker('selectAll');
             }
         });
 
-        let history_user_last_id = undefined;
-
-        function loadHistoryTable(media_type, transcode_decision, selected_user_id) {
+        function loadHistoryTable(media_type, selected_user_id) {
             history_table_options.ajax = {
                 url: 'get_history',
                 type: 'POST',
@@ -176,7 +139,6 @@
                     return {
                         json_data: JSON.stringify(d),
                         media_type: media_type,
-                        transcode_decision: transcode_decision,
                         user_id: selected_user_id
                     };
                 }
@@ -193,60 +155,32 @@
 
             $('#media_type-selection').on('change', function () {
                 $('#media_type-selection > label').removeClass('active');
-                var selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
+                selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
                 $(selected_filter).closest('label').addClass('active');
-                media_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
+                media_type = $(selected_filter).val();
                 setLocalStorage('history_media_type', media_type);
                 history_table.draw();
             });
 
-            $('#transcode_decision-selection').on('change', function () {
-                $('#transcode_decision-selection > label').removeClass('active');
-                var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
-                $(selected_filter).closest('label').addClass('active');
-                transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-                setLocalStorage('history_transcode_decision', transcode_decision);
-                history_table.draw();
-            });
-
             $('#history-user').on('change', function () {
-                let val = $(this).val();
-                if (val.length === 0 || val.length === $(this).children().length) {
-                    selected_user_id = null; // if all users are selected, just send an empty list
-                } else {
-                    selected_user_id = val.join(",");
-                }
-                if (selected_user_id === history_user_last_id) {
-                    return;
-                }
-                history_user_last_id = selected_user_id;
+                selected_user_id = $(this).val() || null;
                 history_table.draw();
             });
         }
 
+        var media_type = getLocalStorage('history_media_type', 'all');
         var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
 
-        var media_type = getLocalStorage('history_media_type', 'all');
-        $.each(media_type.split(','), function (i, item) {
-            var history_media_type = $('#history-media_type-' + item);
-            history_media_type.prop('checked', true);
-            history_media_type.closest('label').addClass('active');
-        });
+        $('#history-' + media_type).prop('checked', true);
+        $('#history-' + media_type).closest('label').addClass('active');
 
-        var transcode_decision = getLocalStorage('history_transcode_decision', 'all');
-        $.each(transcode_decision.split(','), function (i, item) {
-            var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
-            history_transcode_decision.prop('checked', true);
-            history_transcode_decision.closest('label').addClass('active');
-        });
-
-        loadHistoryTable(media_type, transcode_decision, selected_user_id);
+        loadHistoryTable(media_type, selected_user_id);
 
         % if _session['user_group'] == 'admin':
         $('#row-edit-mode').on('click', function() {
-            if ($(this).hasClass('active')) {
-                $(this).tooltip('destroy');
+            $('#row-edit-mode-alert').fadeIn(200);
 
+            if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
                     $('#confirm-modal-delete').modal();
@@ -271,13 +205,6 @@
                 });
 
             } else {
-                $(this).tooltip({
-                    container: '.body-container',
-                    placement: 'bottom',
-                    title: 'Select rows to delete. Data is deleted upon exiting delete mode.',
-                    trigger: 'manual'
-                }).tooltip('show');
-
                 history_to_delete = [];
                 $('.delete-control').each(function() {
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');

data/interfaces/default/history_table_modal.html

@@ -32,7 +32,7 @@
                     <th align="left" id="started">Started</th>
                     <th align="left" id="paused_counter">Paused</th>
                     <th align="left" id="stopped">Stopped</th>
-                    <th align="left" id="play_duration">Duration</th>
+                    <th align="left" id="duration">Duration</th>
                     <th align="left" id="percent_complete"></th>
                 </tr>
                 </thead>
@@ -46,9 +46,8 @@
 
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script>
-    $('#date-header').html(moment('${data["start_date"]}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
-
-    $('#history-modal').off('shown.bs.modal').on('shown.bs.modal', function() {
+    $(document).ready(function() {
+        $('#date-header').html(moment('${data["start_date"]}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
         history_table_options.ajax = {
             url: 'get_history',
             data: function ( d ) {
@@ -57,8 +56,7 @@
                     user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
                     media_type: "${data.get('media_type') or 'all'}",
-                    transcode_decision: "${data.get('transcode_decision')}",
-                    include_activity: false
+                    transcode_decision: "${data.get('transcode_decision')}"
                 };
             }
         };
@@ -67,6 +65,10 @@
         history_table.columns([0, 3, 4, 5, 9, 11, 12]).visible(false);
 
         clearSearchButton('history_table_modal', history_table);
+
+        $('#history-modal').on('shown.bs.modal', function() {
+            history_table.columns.adjust().draw();
+        });
     });
 </script>
 % else:

data/interfaces/default/home_stats.html

@@ -25,7 +25,7 @@ grandparent_thumb       Returns location of the item's thumbnail. Use with pms_i
 rating_key              Returns the unique identifier for the media item.
 title                   Returns the title for the associated stat.
 
-== Only if 'stat_id' is 'top_tv' or 'top_movies' or 'top_music' or 'top_user' or 'top_platform' or 'top_libraries' ==
+== Only if 'stat_id' is 'top_tv' or 'top_movies' or 'top_music' or 'top_user' or 'top_platform' ==
 total_plays             Returns the count for the associated stat.
 total_duration          Returns the total duration for the associated stat.
 
@@ -58,8 +58,6 @@ DOCUMENTATION :: END
     # Human readable duration
     def hd(seconds):
         m, s = divmod(cast_to_int(seconds), 60)
-        if s > 30:
-            m += 1
         h, m = divmod(m, 60)
         return str(h).zfill(1) + ':' + str(m).zfill(2)
 %>
@@ -76,11 +74,6 @@ DOCUMENTATION :: END
         % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
         <% fallback = 'art-live' if row0['live'] else 'art' %>
         <div id="stats-background-${stat_id}" class="dashboard-stats-background" style="background-image: url(${page('pms_image_proxy', row0['art'], row0['rating_key'], 500, 280, 40, '282828', 3, fallback=fallback)});">
-        % elif stat_id == 'top_libraries':
-        <% fallback = 'art-live' if row0['live'] else row0['library_art'] %>
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background" style="background-image: url(${page('pms_image_proxy', row0['art'] or row0['library_art'], None, 500, 280, 40, '282828', 3, fallback=fallback)});" data-library_art="${row0['library_art']}">
-        % elif stat_id == 'top_users':
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background" data-blurhash="${page('pms_image_proxy', row0['user_thumb'] or 'interfaces/default/images/gravatar-default.png', None, 100, 100, 40, '282828', 0, fallback='user')}">
         % elif stat_id == 'top_platforms':
         <div id="stats-background-${stat_id}" class="dashboard-stats-background platform-${row0['platform_name']}-rgba no-image">
         % else:
@@ -103,22 +96,16 @@ DOCUMENTATION :: END
                         if row0['live']:
                             href = page('info', row0['rating_key'], row0['guid'], history=True, live=row0['live'])
                         else:
-                            href = page('info', row0['rating_key'], history=True)
+                            href = page('info', row0['rating_key'])
                 %>
                 <a id="stats-thumb-url-${stat_id}" href="${href}" title="${row0['title']}">
-                    <div id="stats-thumb-${stat_id}" class="dashboard-stats-${fallback.split('-')[0]}" style="background-image: url(${page('pms_image_proxy', row0['thumb'], row0['grandparent_rating_key'] or row0['rating_key'], 300, height, fallback=fallback)});"></div>
+                    <div id="stats-thumb-${stat_id}" class="dashboard-stats-${fallback.split('-')[0]}" style="background-image: url(${page('pms_image_proxy', row0['thumb'], row0['rating_key'], 300, height, fallback=fallback)});"></div>
                 </a>
             </div>
-            % elif stat_id == 'top_libraries':
-                % if row0['library_thumb'].startswith('http'):
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat hidden-xs" style="background-image: url(${page('pms_image_proxy', row0['library_thumb'], None, 100, 100, fallback='cover')});"></div>
-                % else:
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat svg-icon library-${row0['section_type']} hidden-xs"></div>
-                % endif
             % elif stat_id == 'top_users':
             <% user_href = page('user', row0['user_id']) if row0['user_id'] else '#' %>
-            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['user']}" class="hidden-xs">
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-circle" style="background-image: url(${page('pms_image_proxy', row0['user_thumb'] or 'interfaces/default/images/gravatar-default.png', None, 100, 100, fallback='user')})"></div>
+            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['friendly_name']}" class="hidden-xs">
+                <div id="stats-thumb-${stat_id}" class="dashboard-stats-circle" style="background-image: url(${row0['user_thumb'] or 'images/gravatar-default.png'})"></div>
             </a>
             % elif stat_id == 'top_platforms':
             <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat svg-icon platform-${row0['platform_name']} transparent hidden-xs"></div>
@@ -135,7 +122,7 @@ DOCUMENTATION :: END
                     % elif stat_id.startswith('popular'):
                     <span class="dashboard-stats-stats-units">users</span>
                     % elif stat_id == 'last_watched':
-                    <span class="dashboard-stats-stats-units" id="last-watched-header-info" title="${row0['user']}">${row0['friendly_name']}</span>
+                    <span class="dashboard-stats-stats-units" id="last-watched-header-info">${row0['friendly_name']}</span>
                     % elif stat_id == 'most_concurrent':
                     <span class="dashboard-stats-stats-units" id="most-concurrent-header-info">streams</span>
                     % endif
@@ -145,11 +132,10 @@ DOCUMENTATION :: END
                         <ul class="list-unstyled dashboard-stats-info-list">
                             % for row in top_stat['rows']:
                             <li class="dashboard-stats-info-item ${'expanded' if loop.index == 0 else ''}" data-stat_id="${stat_id}"
-                                data-rating_key="${row.get('rating_key')}" data-grandparent_rating_key="${row.get('grandparent_rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
-                                data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}" data-library-type="${row.get('section_type')}"
-                                data-user_id="${row.get('user_id')}" data-user="${row.get('user')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
-                                data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}"
-                                data-library_art="${row.get('library_art', '')}" data-library_thumb="${row.get('library_thumb', '')}">
+                                data-rating_key="${row.get('rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
+                                data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}"
+                                data-user_id="${row.get('user_id')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
+                                data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}">
                                 <div class="sub-list">${loop.index + 1}</div>
                                 <div class="sub-value">
                                     % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
@@ -159,27 +145,20 @@ DOCUMENTATION :: END
                                             if row['live']:
                                                 href = page('info', row['rating_key'], row['guid'], history=True, live=row['live'])
                                             else:
-                                                href = page('info', row['rating_key'], history=True)
+                                                href = page('info', row['rating_key'])
                                     %>
                                     <a href="${href}" title="${row['title']}">
                                         ${row['title']}
                                     </a>
-                                    % elif stat_id == 'top_libraries':
-                                    <% library_href = page('library', row['section_id']) %>
-                                    <a href="${library_href}" title="${row['section_name']}">
-                                        ${row['section_name']}
-                                    </a>
                                     % elif stat_id == 'top_users':
                                     <% user_href = page('user', row['user_id']) if row['user_id'] else '#' %>
-                                    <a href="${user_href}" title="${row['user']}">
+                                    <a href="${user_href}" title="${row['friendly_name']}">
                                         ${row['friendly_name']}
                                     </a>
                                     % elif stat_id == 'top_platforms':
                                     ${row['platform']}
                                     % elif stat_id == 'most_concurrent':
-                                    <a href="graphs#concurrent-graph" title="${row['title']}">
-                                        ${row['title']}
-                                    </a>
+                                    ${row['title']}
                                     % endif
                                 </div>
                                 <div class="sub-count">

data/interfaces/default/images/app-store-badge.svg

@@ -1,46 +0,0 @@
-<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
-  <title>Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917</title>
-  <g>
-    <g>
-      <g>
-        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
-        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
-      </g>
-      <g id="_Group_" data-name="&lt;Group&gt;">
-        <g id="_Group_2" data-name="&lt;Group&gt;">
-          <g id="_Group_3" data-name="&lt;Group&gt;">
-            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
-            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
-          </g>
-        </g>
-        <g>
-          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
-          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
-          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
-          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
-          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
-          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
-          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
-          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
-        </g>
-      </g>
-    </g>
-    <g id="_Group_4" data-name="&lt;Group&gt;">
-      <g>
-        <path d="M37.82619,8.731a2.63964,2.63964,0,0,1,2.80762,2.96484c0,1.90625-1.03027,3.002-2.80762,3.002H35.67092V8.731Zm-1.22852,5.123h1.125a1.87588,1.87588,0,0,0,1.96777-2.146,1.881,1.881,0,0,0-1.96777-2.13379h-1.125Z" style="fill: #fff"/>
-        <path d="M41.68068,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C44.57522,13.99463,45.01369,13.42432,45.01369,12.44434Z" style="fill: #fff"/>
-        <path d="M51.57326,14.69775h-.92187l-.93066-3.31641h-.07031l-.92676,3.31641h-.91309l-1.24121-4.50293h.90137l.80664,3.436h.06641l.92578-3.436h.85254l.92578,3.436h.07031l.80273-3.436h.88867Z" style="fill: #fff"/>
-        <path d="M53.85354,10.19482H54.709v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M59.09377,8.437h.88867v6.26074h-.88867Z" style="fill: #fff"/>
-        <path d="M61.21779,12.44434a2.13346,2.13346,0,1,1,4.24756,0,2.1338,2.1338,0,1,1-4.24756,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C64.11232,13.99463,64.5508,13.42432,64.5508,12.44434Z" style="fill: #fff"/>
-        <path d="M66.4009,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,66.4009,13.42432Zm2.89453-.38477v-.37646l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,69.29543,13.03955Z" style="fill: #fff"/>
-        <path d="M71.34816,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074h-.85156v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C72.0718,14.772,71.34816,13.87061,71.34816,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C72.72121,10.91846,72.26613,11.49707,72.26613,12.44434Z" style="fill: #fff"/>
-        <path d="M79.23,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C82.12453,13.99463,82.563,13.42432,82.563,12.44434Z" style="fill: #fff"/>
-        <path d="M84.66945,10.19482h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915H87.605V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M93.51516,9.07373v1.1416h.97559v.74854h-.97559V13.2793c0,.47168.19434.67822.63672.67822a2.96657,2.96657,0,0,0,.33887-.02051v.74023a2.9155,2.9155,0,0,1-.4834.04541c-.98828,0-1.38184-.34766-1.38184-1.21582v-2.543h-.71484v-.74854h.71484V9.07373Z" style="fill: #fff"/>
-        <path d="M95.70461,8.437h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723H98.69v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/>
-        <path d="M104.76125,13.48193a1.828,1.828,0,0,1-1.95117,1.30273A2.04531,2.04531,0,0,1,100.73,12.46045a2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27V12.688h-3.17969v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,101.63527,12.03076Z" style="fill: #fff"/>
-      </g>
-    </g>
-  </g>
-</svg>

data/interfaces/default/images/default_profile.svg

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="120px" height="120px" viewBox="0 0 120 120" enable-background="new 0 0 120 120" xml:space="preserve">
-<g>
-	<path fill="#BEBEBE" d="M31.161,105.119c4.747-3.413,10.392-5.561,16.939-6.444c2.645,1.983,6.611,2.976,11.9,2.976
-		c5.288,0,9.255-0.992,11.9-2.976c6.546,0.884,12.192,3.031,16.938,6.444c-8.325,5.336-18.223,8.431-28.838,8.431
-		C49.385,113.55,39.487,110.455,31.161,105.119z"/>
-	<path fill="#D6D6D6" d="M48.1,98.675l2.737-8.553C42.241,84.96,36.2,72.758,36.2,58.526c0-7.478,1.669-14.397,4.498-20.029
-		c3.436,1.059,7.504,1.669,11.864,1.669c10.86,0,19.907-3.795,21.903-8.822c5.676,6.256,9.334,16.104,9.334,27.182
-		c0,14.232-6.041,26.434-14.637,31.596l2.737,8.553c-2.646,1.983-6.612,2.976-11.9,2.976c-5.248,0-9.194-0.977-11.838-2.929
-		L48.1,98.675z"/>
-	<path fill="#A6A6A6" d="M38.763,73.994C33.496,68.09,30.25,60,30.25,51.075C30.25,33.002,43.57,18.35,60,18.35
-		c16.431,0,29.75,14.65,29.75,32.724c0,8.925-3.247,17.016-8.514,22.92c1.64-4.647,2.563-9.901,2.563-15.468
-		c0-11.078-3.658-20.925-9.334-27.182c-1.996,5.027-11.043,8.822-21.903,8.822c-4.36,0-8.428-0.611-11.864-1.669
-		C37.868,44.128,36.2,51.048,36.2,58.526C36.2,64.093,37.124,69.348,38.763,73.994z"/>
-	<path fill="#D6D6D6" d="M60,113.55c29.575,0,53.55-23.974,53.55-53.55c0-29.575-23.975-53.55-53.55-53.55
-		C30.425,6.45,6.45,30.425,6.45,60C6.45,89.576,30.425,113.55,60,113.55z M60,119.5C27.138,119.5,0.5,92.86,0.5,60
-		S27.138,0.5,60,0.5c32.86,0,59.5,26.64,59.5,59.499C119.5,92.86,92.86,119.5,60,119.5z"/>
-</g>
-</svg>

data/interfaces/default/images/favicon/browserconfig.xml

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="mstile-150x150.png?v=2.6.0"/>
+            <square150x150logo src="mstile-150x150.png?v=2.0.5"/>
             <TileColor>#282a2d</TileColor>
         </tile>
     </msapplication>

data/interfaces/default/images/favicon/manifest.json

@@ -6,17 +6,18 @@
     "scope": "../../",
     "icons": [
         {
-            "src": "android-chrome-192x192.png?v=2.6.0",
+            "src": "android-chrome-192x192.png?v=2.0.5",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "android-chrome-256x256.png?v=2.6.0",
+            "src": "android-chrome-256x256.png?v=2.0.5",
             "sizes": "256x256",
             "type": "image/png"
         }
     ],
     "theme_color": "#282a2d",
     "background_color": "#282a2d",
-    "display": "standalone"
+    "display": "standalone",
+    "orientation": "any"
 }

data/interfaces/default/images/favicon/safari-pinned-tab.svg

@@ -1,32 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="350.000000pt" height="350.000000pt" viewBox="0 0 350.000000 350.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,350.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M1566 3489 c-433 -46 -867 -274 -1141 -601 -404 -481 -526 -1100
--334 -1688 91 -278 283 -569 498 -756 676 -589 1646 -589 2322 0 215 187 407
-478 498 756 142 436 113 895 -84 1305 -320 666 -1027 1061 -1759 984z m1147
--604 c87 -36 146 -118 154 -214 10 -111 -39 -203 -137 -254 -49 -26 -63 -28
--131 -25 l-76 3 -109 -154 c-60 -85 -190 -269 -290 -409 l-181 -255 26 -46
-c22 -38 26 -59 26 -121 0 -63 -5 -84 -29 -132 -27 -54 -28 -59 -13 -76 22 -24
-47 -86 47 -117 0 -14 6 -28 13 -30 6 -3 91 -16 187 -30 157 -23 175 -24 183
--10 38 68 115 118 199 130 103 15 220 -51 268 -151 26 -52 29 -154 6 -207 -19
--48 -82 -114 -129 -138 -151 -77 -346 22 -373 189 -7 46 15 39 -222 74 -142
-20 -155 21 -163 6 -65 -116 -225 -163 -347 -102 -116 58 -167 187 -126 323 8
-29 13 55 11 57 -3 3 -65 -33 -138 -79 -74 -46 -162 -100 -196 -120 l-62 -38 6
--47 c11 -100 -46 -207 -136 -254 -43 -23 -66 -28 -121 -28 -77 0 -124 16 -175
-62 -48 41 -76 99 -82 167 -7 72 9 129 50 183 85 112 256 132 372 44 l31 -24
-174 109 c96 60 180 111 185 113 6 2 -2 16 -16 32 -35 39 -412 468 -414 471 0
-1 -21 -5 -45 -13 -57 -20 -142 -14 -196 14 -162 84 -197 288 -71 419 102 108
-291 101 386 -14 62 -75 78 -185 40 -273 l-21 -49 23 -28 c13 -16 102 -118 198
--227 l175 -198 20 61 c26 78 64 125 124 155 63 31 117 39 177 26 49 -11 51
--11 72 17 21 26 533 749 548 773 4 6 -4 28 -17 48 -88 133 -44 307 94 376 61
-31 163 36 221 11z"/>
-</g>
-</svg>
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000" preserveAspectRatio="xMidYMid meet"><g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none"><path d="M5695 6555 c-135 -34 -244 -94 -342 -189 -40 -39 -73 -76 -73 -83 0 -7 -4 -13 -10 -13 -14 0 -87 -156 -106 -225 -22 -83 -26 -234 -8 -320 17 -79 86 -230 133 -288 l30 -39 -48 -71 c-39 -57 -159 -228 -251 -357 -69 -97 -398 -564 -416 -590 -13 -19 -60 -87 -105 -150 -45 -63 -107 -151 -138 -195 -30 -44 -59 -84 -63 -90 -7 -9 -251 -354 -346 -490 -92 -131 -173 -245 -175 -245 -1 0 -34 9 -72 21 -130 38 -325 31 -454 -18 -168 -63 -313 -196 -385 -354 -39 -87 -65 -183 -68 -256 0 -24 -3 -43 -4 -43 -2 0 -43 46 -91 102 -49 57 -100 117 -115 133 -14 17 -128 149 -253 295 -125 146 -251 292 -279 324 -56 65 -77 89 -108 126 -58 68 -152 178 -172 200 -12 14 -50 57 -83 96 l-61 71 27 44 c58 93 91 217 92 342 2 161 -38 294 -125 412 -133 181 -316 279 -542 292 -470 27 -833 -434 -699 -887 74 -251 275 -437 530 -490 132 -28 334 -6 421 45 l42 24 173 -197 c96 -108 186 -210 200 -227 15 -16 163 -187 330 -380 458 -529 491 -567 526 -605 18 -19 31 -35 30 -36 -6 -5 -265 -161 -277 -167 -8 -4 -34 -20 -58 -35 -194 -124 -634 -382 -651 -382 -12 0 -46 20 -75 44 -60 49 -180 112 -242 127 -21 5 -48 12 -59 15 -11 4 -65 9 -121 11 -81 4 -117 1 -182 -15 -261 -66 -462 -270 -528 -537 -10 -40 -11 -217 -2 -258 5 -23 11 -51 14 -61 29 -145 147 -312 284 -403 123 -82 224 -114 370 -118 83 -3 124 2 240 29 36 9 133 57 187 94 60 41 111 91 153 152 14 19 28 37 32 40 19 15 71 140 89 217 17 73 20 107 16 198 -4 61 -7 121 -9 134 -3 28 -46 0 482 321 179 108 379 228 444 265 104 59 120 65 133 52 13 -13 12 -22 -10 -78 -49 -123 -58 -165 -62 -262 -7 -149 25 -286 89 -383 47 -72 91 -128 125 -158 19 -17 39 -36 45 -42 27 -25 136 -94 150 -94 8 0 17 -4 20 -9 3 -5 16 -11 28 -14 13 -3 50 -12 83 -21 74 -19 278 -15 345 7 198 65 358 196 435 358 16 34 20 36 49 28 17 -4 49 -10 71 -14 22 -3 99 -16 170 -30 72 -13 144 -26 160 -29 28 -5 101 -18 170 -31 17 -3 80 -14 140 -25 61 -11 124 -22 140 -25 17 -4 49 -9 72 -12 40 -5 42 -7 48 -47 14 -98 29 -147 73 -235 36 -75 61 -110 121 -171 154 -154 280 -210 480 -213 134 -2 180 5 273 40 212 83 371 262 427 481 24 93 25 255 2 342 -64 241 -245 428 -481 501 -62 18 -97 23 -200 22 -107 0 -136 -4 -205 -26 -44 -15 -109 -43 -145 -64 -83 -48 -208 -171 -250 -245 -17 -32 -35 -60 -38 -61 -4 -2 -46 4 -93 13 -48 10 -104 20 -125 23 -22 3 -46 8 -54 11 -8 3 -33 7 -55 10 -38 5 -58 9 -122 21 -16 3 -53 10 -83 15 -30 6 -66 12 -79 15 -13 2 -103 19 -200 36 -169 30 -207 42 -196 60 10 16 -28 155 -62 224 -19 39 -54 96 -78 127 l-45 58 40 52 c96 125 143 266 143 433 1 164 -27 263 -108 391 -19 30 -35 57 -35 61 0 3 31 49 69 102 57 81 450 638 625 889 28 40 62 88 76 107 14 18 194 274 400 568 291 414 379 534 393 531 10 -2 27 -6 37 -9 78 -25 240 -29 338 -9 433 87 677 573 489 974 -93 200 -255 332 -478 389 -87 22 -227 25 -304 6z"/></g></svg>

data/interfaces/default/images/google-play-badge.svg

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Livello_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 5435.8 1604"
-	 style="enable-background:new 0 0 5435.8 1604;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#A6A6A6;}
-	.st2{fill:#FFFFFF;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
-	.st8{opacity:0.2;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
-	.st9{opacity:0.12;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
-	.st10{opacity:0.25;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
-</style>
-<metadata>
-	<sfw  xmlns="&ns_sfw;">
-		<slices></slices>
-		<sliceSourceBounds  bottomLeftOrigin="true" height="1604" width="5435.8" x="-2656.9" y="-784"></sliceSourceBounds>
-	</sfw>
-</metadata>
-<path class="st0" d="M5234.4,1604h-5033C90.4,1604,0,1513.6,0,1403.5v-1203C0,90,90.4,0,201.4,0h5033c110.9,0,201.4,90,201.4,200.5
-	v1203C5435.8,1513.6,5345.3,1604,5234.4,1604z"/>
-<path class="st1" d="M5234.4,32.1c93.1,0,169.3,75.7,169.3,168.4v1203c0,92.7-75.7,168.4-169.3,168.4h-5033
-	c-93.1,0-169.3-75.7-169.3-168.4v-1203c0-92.7,75.7-168.4,169.3-168.4C201.4,32.1,5234.4,32.1,5234.4,32.1z M5234.4,0h-5033
-	C90.4,0,0,90.4,0,200.5v1203C0,1514,90.4,1604,201.4,1604h5033c110.9,0,201.4-90,201.4-200.5v-1203C5435.8,90.4,5345.3,0,5234.4,0z"
-	/>
-<path class="st2" d="M2863.6,530.6c-36.3,0-66.9-12.7-91.1-37.7c-24-24.3-37.4-57.8-36.8-92c0-36.5,12.4-67.4,36.8-91.9
-	c24.1-25,54.7-37.7,91-37.7c35.9,0,66.5,12.7,91.1,37.7c24.4,25.3,36.8,56.2,36.8,91.9c-0.4,36.6-12.8,67.5-36.8,91.9
-	C2930.5,518,2899.9,530.6,2863.6,530.6z M1783.5,530.6c-35.5,0-66.3-12.5-91.5-37.2c-25-24.6-37.7-55.7-37.7-92.4
-	s12.7-67.8,37.7-92.4c24.7-24.7,55.5-37.2,91.5-37.2c17.6,0,34.7,3.5,51.1,10.6c16.1,6.9,29.2,16.3,38.9,27.8l2.4,2.9l-27.1,26.6
-	l-2.8-3.3c-15.3-18.2-35.8-27.1-62.9-27.1c-24.2,0-45.3,8.6-62.7,25.6c-17.5,17.1-26.4,39.5-26.4,66.6s8.9,49.5,26.4,66.6
-	c17.4,17,38.5,25.6,62.7,25.6c25.8,0,47.5-8.6,64.4-25.6c10-10,16.2-24,18.4-41.7h-86.9v-37.4h124.2l0.5,3.4
-	c0.9,6.3,1.8,12.8,1.8,18.8c0,34.5-10.4,62.4-31,83C1851.1,518.2,1820.5,530.6,1783.5,530.6z M3219.6,525.3h-38.3L3064,337.6l1,33.8
-	v153.8h-38.3V276.7h43.7l1.2,1.9l110.3,176.8l-1-33.7V276.7h38.7V525.3z M2575.8,525.3H2537V314.1h-67.3v-37.4H2643v37.4h-67.3
-	V525.3z M2438.1,525.3h-38.7V276.7h38.7V525.3z M2220.6,525.3h-38.7V314.1h-67.3v-37.4h173.3v37.4h-67.3V525.3z M2090.1,524.9
-	h-148.4V276.7h148.4v37.4h-109.6v68.2h98.9v37h-98.9v68.2h109.6V524.9z M2800.9,467.2c17.3,17.3,38.3,26,62.7,26
-	c25.1,0,45.6-8.5,62.7-26c17-17,25.6-39.3,25.6-66.2s-8.6-49.3-25.5-66.2c-17.3-17.3-38.4-26-62.7-26c-25.1,0-45.6,8.5-62.6,26
-	c-17,17-25.6,39.3-25.6,66.2S2784,450.3,2800.9,467.2L2800.9,467.2z"/>
-<path class="st3" d="M2732.1,872.4c-94.5,0-171.1,71.7-171.1,170.6c0,98,77.1,170.6,171.1,170.6c94.5,0,171.1-72.2,171.1-170.6
-	C2903.2,944.1,2826.6,872.4,2732.1,872.4z M2732.1,1146c-51.7,0-96.2-42.8-96.2-103.4c0-61.5,44.6-103.4,96.2-103.4
-	c51.7,0,96.2,41.9,96.2,103.4C2828.4,1103.6,2783.8,1146,2732.1,1146z M2358.8,872.4c-94.5,0-171.1,71.7-171.1,170.6
-	c0,98,77.1,170.6,171.1,170.6c94.5,0,171.1-72.2,171.1-170.6C2529.9,944.1,2453.2,872.4,2358.8,872.4z M2358.8,1146
-	c-51.7,0-96.2-42.8-96.2-103.4c0-61.5,44.6-103.4,96.2-103.4c51.7,0,96.2,41.9,96.2,103.4C2455,1103.6,2410.5,1146,2358.8,1146z
-	 M1914.6,924.5v72.2h173.3c-5.3,40.5-18.7,70.4-39.2,90.9c-25.4,25.4-64.6,53-133.7,53c-106.5,0-189.8-86-189.8-192.5
-	s83.3-192.5,189.8-192.5c57.5,0,99.4,22.7,130.5,51.7l51.2-51.2c-43.2-41.4-100.7-73.1-181.3-73.1c-146.1,0-268.7,119-268.7,264.7
-	c0,146.1,122.5,264.7,268.7,264.7c78.9,0,138.1-25.8,184.9-74.4c47.7-47.7,62.8-115,62.8-169.3c0-16.9-1.3-32.1-4-45h-244.6
-	C1914.6,923.6,1914.6,924.5,1914.6,924.5z M3731.5,980.7c-14.3-38.3-57.5-108.7-146.1-108.7c-87.8,0-160.8,69.1-160.8,170.6
-	c0,95.8,72.2,170.6,169.3,170.6c78,0,123.4-47.7,142.1-75.7l-57.9-38.8c-19.2,28.5-45.9,47.2-83.8,47.2c-38.3,0-65.1-17.4-82.9-51.7
-	l228.1-94.5C3739.5,999.8,3731.5,980.7,3731.5,980.7z M3498.9,1037.7c-1.8-65.9,51.2-99.4,89.1-99.4c29.9,0,54.8,14.7,63.3,36.1
-	L3498.9,1037.7z M3313.6,1203h74.9V701.8h-74.9V1203z M3190.6,910.3h-2.7c-16.9-20.1-49-38.3-90-38.3
-	c-85.1,0-163.5,74.9-163.5,171.1c0,95.8,78,169.8,163.5,169.8c40.5,0,73.1-18.3,90-38.8h2.7v24.5c0,65.1-34.8,100.2-90.9,100.2
-	c-45.9,0-74.4-33-86-60.6l-65.1,27.2c18.7,45,68.6,100.7,151,100.7c87.8,0,162.2-51.7,162.2-177.8V882.2h-70.8v28.1
-	C3191.1,910.3,3190.6,910.3,3190.6,910.3z M3104.6,1146c-51.7,0-94.9-43.2-94.9-102.9c0-60.2,43.2-103.8,94.9-103.8
-	c51.2,0,90.9,44.1,90.9,103.8C3196,1102.8,3155.9,1146,3104.6,1146z M4082.2,701.8h-179.1V1203h74.9v-189.8h104.3
-	c82.9,0,164.4-60.1,164.4-155.5S4165.5,701.8,4082.2,701.8z M4084.4,943.2h-106.5v-172h106.5c56.1,0,87.8,46.3,87.8,86
-	C4172.2,896.5,4140.1,943.2,4084.4,943.2z M4546.9,871.5c-54.4,0-110.5,24.1-133.7,76.6l66.4,27.6c14.3-27.6,40.5-37,68.2-37
-	c38.8,0,78,23.2,78.9,64.6v5.3c-13.4-7.6-42.8-19.2-78-19.2c-71.7,0-144.4,39.2-144.4,112.7c0,67.3,58.8,110.5,124.3,110.5
-	c50.3,0,78-22.7,95.3-49h2.7v38.8h72.2v-192C4698.8,921,4632.4,871.5,4546.9,871.5z M4537.5,1146c-24.5,0-58.8-12-58.8-42.8
-	c0-38.8,42.8-53.5,79.3-53.5c33,0,48.6,7.1,68.2,16.9C4620.8,1111.6,4582.8,1145.6,4537.5,1146z M4962.2,882.2l-86,217.4h-2.7
-	l-89.1-217.4h-80.6l133.7,303.9l-76.2,168.9h78L5045,882.2C5045,882.2,4962.2,882.2,4962.2,882.2z M4288,1203h74.9V701.8H4288V1203z
-	"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1682.1077" y1="1339.4783" x2="1624.2924" y2="1309.6345" gradientTransform="matrix(11.64 0 0 -22.55 -18705.5957 30554.3691)">
-	<stop  offset="0" style="stop-color:#00A0FF"/>
-	<stop  offset="6.569999e-03" style="stop-color:#00A1FF"/>
-	<stop  offset="0.2601" style="stop-color:#00BEFF"/>
-	<stop  offset="0.5122" style="stop-color:#00D2FF"/>
-	<stop  offset="0.7604" style="stop-color:#00DFFF"/>
-	<stop  offset="1" style="stop-color:#00E3FF"/>
-</linearGradient>
-<path class="st4" d="M418.4,302.1c-11.6,12.5-18.3,31.6-18.3,56.6v886.7c0,25,6.7,44.1,18.7,56.1l3.1,2.7l496.8-496.8v-11.1
-	L421.5,299.4C421.5,299.4,418.4,302.1,418.4,302.1z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="1712.6624" y1="1274.8376" x2="1606.5613" y2="1274.8376" gradientTransform="matrix(9.145 0 0 -7.7 -14305.5381 10618.251)">
-	<stop  offset="0" style="stop-color:#FFE000"/>
-	<stop  offset="0.4087" style="stop-color:#FFBD00"/>
-	<stop  offset="0.7754" style="stop-color:#FFA500"/>
-	<stop  offset="1" style="stop-color:#FF9C00"/>
-</linearGradient>
-<path class="st5" d="M1084,973.5L918.3,807.8v-11.6L1084,630.5l3.6,2.2l196,111.4c56.1,31.6,56.1,83.8,0,115.8l-196,111.4
-	C1087.6,971.3,1084,973.5,1084,973.5z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1707.4414" y1="1290.0475" x2="1646.682" y2="1211.2225" gradientTransform="matrix(15.02 0 0 -11.5775 -24650.2285 15829.6484)">
-	<stop  offset="0" style="stop-color:#FF3A44"/>
-	<stop  offset="1" style="stop-color:#C31162"/>
-</linearGradient>
-<path class="st6" d="M1087.6,971.3L918.3,802l-499.9,499.9c18.3,19.6,49,21.8,83.3,2.7L1087.6,971.3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="1660.6357" y1="1365.6676" x2="1687.767" y2="1330.4501" gradientTransform="matrix(15.02 0 0 -11.5715 -24650.2285 15809.9922)">
-	<stop  offset="0" style="stop-color:#32A071"/>
-	<stop  offset="6.850000e-02" style="stop-color:#2DA771"/>
-	<stop  offset="0.4762" style="stop-color:#15CF74"/>
-	<stop  offset="0.8009" style="stop-color:#06E775"/>
-	<stop  offset="1" style="stop-color:#00F076"/>
-</linearGradient>
-<path class="st7" d="M1087.6,632.7L501.7,299.9c-34.3-19.6-65.1-16.9-83.3,2.7L918.3,802L1087.6,632.7z"/>
-<path class="st8" d="M1084,967.7l-581.9,330.6c-32.5,18.7-61.5,17.4-80.2,0.4l-3.1,3.1l3.1,2.7c18.7,16.9,47.7,18.3,80.2-0.4
-	L1088,971.3C1088,971.3,1084,967.7,1084,967.7z"/>
-<path class="st9" d="M1283.6,854.1l-200.1,113.6l3.6,3.6l196-111.4c28.1-16,41.9-37,41.9-57.9C1323.3,821.2,1309,839.4,1283.6,854.1
-	z"/>
-<path class="st10" d="M501.7,305.7l781.9,444.2c25.4,14.3,39.7,33,41.9,52.1c0-20.9-13.8-41.9-41.9-57.9L501.7,299.9
-	c-56.1-32.1-101.6-5.3-101.6,58.8v5.8C400.1,300.3,445.6,274,501.7,305.7z"/>
-</svg>

data/interfaces/default/images/libraries/artist.svg

@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
 <title>artist</title>
-<path fill="#FFFFFF" d="M29.369,0.72H10.271C8.864,0.722,7.726,1.861,7.724,3.267v18.534c-0.771-0.459-1.649-0.703-2.546-0.709
-	c-2.813,0-5.094,2.281-5.094,5.094s2.281,5.094,5.094,5.094s5.093-2.281,5.093-5.094V10.907h19.099v10.894
-	c-0.771-0.459-1.649-0.703-2.546-0.709c-2.813,0-5.094,2.281-5.094,5.094s2.281,5.094,5.094,5.094s5.093-2.281,5.093-5.094V3.267
-	C31.914,1.861,30.775,0.722,29.369,0.72z M10.271,3.267h19.099V8.36H10.271V3.267z"/>
+<path fill="#fff" d="M9.201 24.681c0-6.699 0-13.358 0-20.035 7.594-1.505 15.157-3.004 22.768-4.513 0 0.172 0 0.319 0 0.465 0 7.067-0.026 14.135 0.021 21.202 0.010 1.498-0.59 2.57-1.716 3.423-1.999 1.512-4.26 2.145-6.751 1.88-0.504-0.054-1.020-0.205-1.481-0.418-1.502-0.695-1.856-2.122-0.908-3.48 0.826-1.184 1.99-1.924 3.302-2.433 1.362-0.528 2.774-0.843 4.252-0.719 0.324 0.027 0.646 0.084 0.994 0.13 0-4.345 0-8.679 0-13.050-6.062 1.204-12.099 2.404-18.16 3.608 0 0.196 0 0.345 0 0.495 0 5.174-0.006 10.349 0.004 15.523 0.003 1.409-0.802 2.302-1.854 3.056-0.889 0.637-1.859 1.114-2.906 1.426-1.524 0.453-3.067 0.627-4.619 0.169-0.952-0.281-1.789-0.736-2.010-1.83-0.136-0.673 0.098-1.269 0.459-1.822 0.772-1.183 1.947-1.853 3.193-2.388 1.662-0.714 3.394-1.043 5.207-0.698 0.048 0.009 0.099 0.005 0.206 0.010z"></path>
 </svg>

data/interfaces/default/images/libraries/live.svg

@@ -1,36 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g>
-	<polygon fill="none" points="12.252,15.364 9.287,23.717 20.6,23.709 	"/>
-	<path fill="none" d="M13.122,12.92l8.846,8.846l-4.158-11.71c-0.558,0.271-1.175,0.437-1.839,0.437
-		c-0.66,0-1.276-0.164-1.833-0.434L13.122,12.92z"/>
-	<path fill="#FFFFFF" d="M19.663,8.28c0.33-0.601,0.529-1.277,0.529-2.008c0-2.333-1.892-4.223-4.222-4.223s-4.222,1.89-4.222,4.223
-		c0,0.733,0.203,1.412,0.532,2.013l-7.56,21.292c-0.248,0.697,0.047,1.434,0.656,1.654c0.608,0.215,1.305-0.177,1.549-0.865
-		l1.53-4.309l15.034-0.007l1.532,4.315c0.247,0.688,0.941,1.08,1.549,0.865c0.61-0.221,0.904-0.957,0.658-1.654L19.663,8.28z
-		 M17.81,10.057l4.158,11.71l-8.846-8.846l1.016-2.861c0.557,0.27,1.173,0.434,1.833,0.434
-		C16.635,10.493,17.252,10.328,17.81,10.057z M12.252,15.364l8.347,8.345L9.287,23.717L12.252,15.364z"/>
-	<g>
-		<path fill="#FFFFFF" d="M3.638,1.458C3.189,0.996,2.563,0.875,2.279,1.211c-3.043,3.578-3.045,8.859-0.002,12.44
-			c0.284,0.335,0.913,0.214,1.362-0.25c0.452-0.462,0.628-1.022,0.424-1.264C1.76,9.428,1.762,5.433,4.064,2.726
-			C4.267,2.484,4.089,1.924,3.638,1.458z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M28.303,1.46c-0.45,0.464-0.626,1.021-0.421,1.261c2.303,2.71,2.3,6.707-0.003,9.412
-			c-0.205,0.24-0.025,0.802,0.424,1.266c0.448,0.466,1.075,0.586,1.361,0.25c3.044-3.578,3.046-8.86,0.003-12.441
-			C29.38,0.873,28.753,0.996,28.303,1.46z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M8.847,11.926c0.453-0.465,0.687-0.966,0.546-1.132C7.78,8.897,7.781,6.1,9.392,4.205
-			c0.141-0.167-0.094-0.672-0.545-1.138c-0.448-0.463-1.019-0.639-1.24-0.376c-2.351,2.766-2.353,6.848,0,9.616
-			C7.826,12.569,8.398,12.39,8.847,11.926z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M23.182,11.858c0.45,0.466,1.017,0.642,1.24,0.379c2.353-2.766,2.354-6.849,0.001-9.617
-			C24.199,2.362,23.63,2.54,23.18,3.004c-0.449,0.464-0.685,0.967-0.542,1.132c1.611,1.896,1.61,4.692-0.001,6.587
-			C22.495,10.888,22.73,11.393,23.182,11.858z"/>
-	</g>
-</g>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>live</title>
+<path fill="#fff" d="M9.636 10.115c-0.829 0.544-1.243 0.816-2.072 1.361-2.331-3.547-2.331-6.195 0-9.749 0.829 0.546 1.244 0.819 2.072 1.361-1.68 2.557-1.68 4.464 0 7.027z"></path>
+<path fill="#fff" d="M4.374 11.662c-0.828 0.542-1.243 0.815-2.072 1.359-3.069-4.676-3.069-8.159 0-12.838 0.829 0.546 1.244 0.817 2.072 1.362-2.418 3.684-2.418 6.426 0 10.117z"></path>
+<path fill="#fff" d="M22.365 10.115c0.826 0.544 1.242 0.816 2.070 1.361 2.334-3.547 2.334-6.195 0-9.749-0.828 0.546-1.244 0.819-2.070 1.361 1.677 2.557 1.677 4.464 0 7.027z"></path>
+<path fill="#fff" d="M27.627 11.662c0.827 0.542 1.243 0.815 2.070 1.359 3.070-4.676 3.070-8.159 0-12.838-0.827 0.546-1.243 0.817-2.070 1.362 2.419 3.684 2.419 6.426 0 10.117z"></path>
+<path fill="#fff" d="M25.211 31.982l2.611-0.95-8.172-22.45c0.32-0.589 0.502-1.263 0.502-1.979 0-2.293-1.859-4.152-4.152-4.152s-4.151 1.858-4.151 4.152c0 0.672 0.16 1.305 0.443 1.868l-8.212 22.561 2.612 0.95 1.952-5.362h14.616l1.951 5.362zM17.396 10.513l3.945 10.834-7.903-7.9 1.080-2.966c0.46 0.176 0.96 0.272 1.481 0.272 0.49 0.001 0.961-0.084 1.397-0.24zM12.39 16.329l7.51 7.512h-10.245l2.735-7.512z"></path>
 </svg>

data/interfaces/default/images/libraries/movie.svg

@@ -1,17 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px"
-	 height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g id="Layer_1">
-	<title>artist</title>
-</g>
-<g id="Layer_2">
-	<path fill="#FFFFFF" d="M29.508,0.241H2.492c-1.242,0-2.251,1.008-2.251,2.251v27.015c0,1.242,1.009,2.252,2.251,2.252h27.016
-		c1.242,0,2.251-1.01,2.251-2.252V2.493C31.759,1.25,30.75,0.241,29.508,0.241z M4.744,29.508H2.492v-3.002h2.252V29.508z
-		 M4.744,24.255H2.492v-3.753h2.252V24.255z M4.744,18.252H2.492V14.5h2.252V18.252z M4.744,12.248H2.492V8.496h2.252V12.248z
-		 M4.744,6.245H2.492V2.493h2.252V6.245z M25.005,29.508H6.995V16.75h18.01V29.508z M25.005,14.5H6.995V2.493h18.01V14.5z
-		 M29.508,29.508h-2.252v-3.002h2.252V29.508z M29.508,24.255h-2.252v-3.753h2.252V24.255z M29.508,18.252h-2.252V14.5h2.252V18.252
-		z M29.508,12.248h-2.252V8.496h2.252V12.248z M29.508,6.245h-2.252V2.493h2.252V6.245z"/>
-</g>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>movie</title>
+<path fill="#fff" d="M0 1.416c10.695 0 21.315 0 32 0 0 9.719 0 19.417 0 29.168-10.635 0-21.293 0-32 0 0-9.699 0-19.399 0-29.168zM9.202 15.129c4.535 0 9.065 0 13.609 0 0-3.798 0-7.579 0-11.355-4.563 0-9.075 0-13.609 0 0 3.801 0 7.551 0 11.355zM9.215 28.909c4.581 0 9.093 0 13.61 0 0-3.818 0-7.585 0-11.382-4.549 0-9.062 0-13.61 0 0 3.803 0 7.57 0 11.382zM6.813 5.983c0-0.753 0-1.467 0-2.209-1.138 0-2.235 0-3.33 0 0 0.766 0 1.48 0 2.209 1.131 0 2.21 0 3.33 0zM25.231 3.754c0 0.783 0 1.494 0 2.219 1.141 0 2.235 0 3.33 0 0-0.763 0-1.476 0-2.219-1.12 0-2.198 0-3.33 0zM25.233 12.938c0 0.777 0 1.492 0 2.19 1.149 0 2.248 0 3.335 0 0-0.754 0-1.452 0-2.19-1.116 0-2.197 0-3.335 0zM25.227 22.074c0 0.783 0 1.496 0 2.218 1.139 0 2.235 0 3.335 0 0-0.758 0-1.471 0-2.218-1.119 0-2.196 0-3.335 0zM3.472 26.689c0 0.768 0 1.481 0 2.221 1.133 0 2.226 0 3.34 0 0-0.763 0-1.475 0-2.221-1.119 0-2.197 0-3.34 0zM28.579 26.711c-1.112 0-2.225 0-3.353 0 0 0.749 0 1.462 0 2.202 1.137 0 2.233 0 3.353 0 0-0.748 0-1.447 0-2.202zM6.817 15.155c0-0.774 0-1.468 0-2.21-1.133 0-2.229 0-3.338 0 0 0.761 0 1.473 0 2.21 1.127 0 2.207 0 3.338 0zM3.463 19.73c1.165 0 2.242 0 3.346 0 0-0.759 0-1.469 0-2.189-1.143 0-2.239 0-3.346 0 0 0.748 0 1.446 0 2.189zM28.559 19.733c0-0.764 0-1.479 0-2.188-1.144 0-2.241 0-3.34 0 0 0.752 0 1.448 0 2.188 1.114 0 2.195 0 3.34 0zM6.791 24.304c0-0.798 0-1.511 0-2.215-1.145 0-2.225 0-3.312 0 0 0.766 0 1.481 0 2.215 1.129 0 2.211 0 3.312 0zM3.489 8.378c0 0.771 0 1.464 0 2.145 1.138 0 2.219 0 3.319 0 0-0.74 0-1.431 0-2.145-1.129 0-2.211 0-3.319 0zM28.554 10.538c0-0.775 0-1.464 0-2.137-1.146 0-2.242 0-3.319 0 0 0.747 0 1.438 0 2.137 1.131 0 2.21 0 3.319 0z"></path>
 </svg>

data/interfaces/default/images/libraries/photo.svg

@@ -1,25 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px"
-	 height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g id="Layer_2">
-</g>
-<g id="Layer_3">
-	<g>
-		<path fill="#FFFFFF" d="M30.807,8.975c-0.587-0.596-1.388-0.933-2.224-0.934h-5.158l-0.855-2.599
-			c-0.207-0.633-0.607-1.184-1.145-1.577c-0.536-0.389-1.18-0.6-1.84-0.6h-7.171c-0.661,0-1.306,0.211-1.84,0.602
-			C10.037,4.259,9.637,4.811,9.43,5.442L8.573,8.041H3.416C2.579,8.042,1.779,8.379,1.192,8.975c-0.591,0.6-0.923,1.408-0.923,2.25
-			V25.55c0,0.843,0.332,1.65,0.923,2.25c0.587,0.596,1.387,0.932,2.224,0.934h25.167c0.836-0.002,1.637-0.338,2.224-0.934
-			c0.591-0.6,0.923-1.407,0.923-2.25V11.225C31.729,10.383,31.397,9.574,30.807,8.975z M29.482,25.55
-			c0,0.258-0.103,0.497-0.273,0.672c-0.165,0.168-0.391,0.265-0.627,0.266H3.418c-0.237-0.001-0.462-0.098-0.628-0.266
-			c-0.176-0.181-0.274-0.422-0.273-0.674v-14.32c0-0.258,0.103-0.499,0.273-0.673c0.172-0.173,0.396-0.266,0.627-0.267h6.782
-			l1.365-4.144c0.063-0.189,0.181-0.351,0.334-0.463c0.152-0.11,0.332-0.169,0.514-0.169h7.175c0.182,0,0.361,0.059,0.514,0.169
-			c0.153,0.112,0.271,0.273,0.335,0.463l1.363,4.144h6.783c0.23,0,0.456,0.094,0.627,0.267c0.171,0.174,0.272,0.413,0.273,0.671
-			V25.55z"/>
-		<path fill="#FFFFFF" d="M16,10.7c-3.764,0-6.813,3.049-6.813,6.812c0,3.765,3.05,6.815,6.813,6.815
-			c3.763,0,6.813-3.051,6.813-6.815C22.813,13.749,19.763,10.7,16,10.7z M15.999,22.082c-2.523,0-4.568-2.045-4.568-4.568
-			s2.045-4.569,4.568-4.569c2.524,0,4.569,2.046,4.569,4.569S18.523,22.082,15.999,22.082z"/>
-	</g>
-</g>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>photo</title>
+<path fill="#fff" d="M25.208 2.266c0 1.514 0 2.976 0 4.513 2.281 0 4.505 0 6.792 0 0 7.681 0 15.287 0 22.955-10.643 0-21.3 0-32 0 0-7.626 0-15.236 0-22.913 2.258 0 4.486 0 6.792 0 0-1.546 0-3.029 0-4.555 6.152 0 12.226 0 18.415 0zM16.008 9.209c-5.026-0.004-9.12 4.079-9.123 9.099-0.004 4.961 4.099 9.069 9.074 9.085 5.022 0.016 9.124-4.047 9.159-9.070 0.035-4.985-4.087-9.109-9.109-9.114z"></path>
+<path fill="#fff" d="M20.601 18.292c0.003 2.551-2.070 4.626-4.61 4.613-2.558-0.013-4.595-2.069-4.591-4.634 0.003-2.524 2.038-4.557 4.577-4.572 2.562-0.015 4.621 2.030 4.624 4.593z"></path>
 </svg>

data/interfaces/default/images/libraries/playlist.svg

@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#FFFFFF" d="M0.27,2.892h2.621v2.622H0.27V2.892z M31.729,2.892H8.135v2.622h23.595V2.892z M31.729,10.757H8.135v2.622
-	h23.595V10.757z M8.135,18.622h23.595v2.621H8.135V18.622z M31.729,26.487H8.135v2.621h23.595V26.487z M2.891,10.757H0.27v2.622
-	h2.621V10.757z M0.27,18.622h2.621v2.621H0.27V18.622z M2.891,26.487H0.27v2.621h2.621V26.487z"/>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>playlist</title>
+<path fill="#fff" d="M9.167 10.268c7.653 0 15.208 0 22.82 0 0 1.147 0 2.268 0 3.451-7.583 0-15.172 0-22.82 0 0-1.134 0-2.274 0-3.451z"></path>
+<path fill="#fff" d="M9.14 21.73c0-1.152 0-2.257 0-3.424 7.609 0 15.212 0 22.86 0 0 1.132 0 2.252 0 3.424-7.607 0-15.191 0-22.86 0z"></path>
+<path fill="#fff" d="M9.217 5.679c0-1.145 0-2.23 0-3.363 7.562 0 15.101 0 22.683 0 0 1.113 0 2.213 0 3.363-7.539 0-15.080 0-22.683 0z"></path>
+<path fill="#fff" d="M9.225 29.708c0-1.132 0-2.214 0-3.336 7.558 0 15.086 0 22.668 0 0 1.086 0 2.186 0 3.336-7.526 0-15.071 0-22.668 0z"></path>
+<path fill="#fff" d="M0.007 10.279c1.58 0 3.043 0 4.551 0 0 1.153 0 2.272 0 3.444-1.511 0-3.011 0-4.551 0 0-1.157 0-2.292 0-3.444z"></path>
+<path fill="#fff" d="M4.527 2.292c0 1.183 0 2.284 0 3.424-1.496 0-2.957 0-4.479 0 0-1.142 0-2.276 0-3.424 1.51 0 2.971 0 4.479 0z"></path>
+<path fill="#fff" d="M4.571 18.3c0 1.151 0 2.254 0 3.416-1.515 0-3.019 0-4.571 0 0-1.127 0-2.247 0-3.416 1.513 0 3.001 0 4.571 0z"></path>
+<path fill="#fff" d="M4.54 26.352c0 1.137 0 2.218 0 3.354-1.494 0-2.975 0-4.506 0 0-1.094 0-2.192 0-3.354 1.489 0 2.965 0 4.506 0z"></path>
 </svg>

data/interfaces/default/images/libraries/show.svg

@@ -1,12 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<title>artist</title>
-<g>
-	<path fill="#FFFFFF" d="M2.359,1.602h27.281c1.255,0,2.273,1.018,2.273,2.273v19.703c0,1.256-1.019,2.273-2.273,2.273H2.359
-		c-1.255,0-2.273-1.018-2.273-2.273V3.875C0.086,2.62,1.104,1.602,2.359,1.602z M2.359,23.578h27.281V3.875H2.359V23.578z"/>
-	<path fill="#FFFFFF" d="M25.094,30.398v-2.273H6.906v2.273H25.094z"/>
-</g>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>show</title>
+<path fill="#fff" d="M0 26.565c0-8.38 0-16.706 0-25.089 10.661 0 21.307 0 32 0 0 8.343 0 16.686 0 25.089-10.637 0-21.283 0-32 0zM3.514 4.937c0 5.355 0 10.634 0 15.901 8.375 0 16.691 0 24.994 0 0-5.331 0-10.612 0-15.901-8.356 0-16.656 0-24.994 0z"></path>
+<path fill="#fff" d="M6.874 30.524c0-0.553 0-1.056 0-1.602 6.084 0 12.136 0 18.25 0 0 0.509 0 1.029 0 1.602-6.050 0-12.12 0-18.25 0z"></path>
 </svg>

data/interfaces/default/images/libraries/video.svg

@@ -1,13 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<title>artist</title>
-<path fill="#FFFFFF" d="M21.619,27.237H2.515c-1.241,0-2.247-1.006-2.247-2.247V7.011c0-1.242,1.006-2.248,2.247-2.248h19.104
-	c1.24,0,2.247,1.006,2.247,2.248v4.562l6.091-4.349c0.506-0.36,1.207-0.242,1.568,0.263c0.134,0.19,0.206,0.415,0.207,0.647v15.732
-	c-0.002,0.621-0.509,1.123-1.128,1.119c-0.232-0.001-0.458-0.075-0.647-0.209l-6.091-4.349v4.563
-	C23.866,26.231,22.859,27.237,21.619,27.237z M2.515,7.011V24.99h19.104v-6.742c0.003-0.621,0.509-1.122,1.129-1.118
-	c0.231,0,0.457,0.074,0.646,0.208l6.091,4.349V10.314l-6.091,4.349c-0.506,0.36-1.207,0.242-1.568-0.263
-	c-0.133-0.189-0.206-0.415-0.207-0.647V7.011H2.515z"/>
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>video</title>
+<path fill="#fff" d="M20.662 27.439c-6.971 0-13.797 0-20.662 0 0-7.639 0-15.235 0-22.878 6.846 0 13.672 0 20.588 0 0 2.962 0 5.932 0 9.091 3.87-2.316 7.591-4.542 11.412-6.828 0 6.153 0 12.176 0 18.33-3.769-2.257-7.494-4.488-11.338-6.789 0 3.070 0 6.035 0 9.075z"></path>
 </svg>

data/interfaces/default/images/platforms/alexa.svg

@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 63 64">
-<title>alexa</title>
-<path fill="#fff" d="M31.554 1.104c-17.063 0-30.896 13.832-30.896 30.896s13.832 30.896 30.896 30.896 30.896-13.833 30.896-30.896c0-17.063-13.833-30.896-30.896-30.896zM27.506 62.329c0-0.037 0-0.072 0-0.107 0-1.945 0.006-3.89-0.002-5.835-0.006-1.199-0.443-2.224-1.318-3.051-0.459-0.435-1.009-0.711-1.604-0.917-2.669-0.926-5.071-2.316-7.189-4.188-3.006-2.658-5.122-5.897-6.335-9.723-0.313-0.989-0.542-1.997-0.711-3.022-0.185-1.121-0.27-2.25-0.271-3.384-0.001-0.766 0.037-1.532 0.115-2.297 0.283-2.765 1.070-5.374 2.361-7.833 0.836-1.592 1.861-3.053 3.069-4.386 1.705-1.883 3.682-3.414 5.929-4.597 1.777-0.935 3.651-1.605 5.617-2.009 0.649-0.133 1.305-0.237 1.962-0.317 0.94-0.114 1.886-0.13 2.834-0.124 0.691 0.004 1.381 0.042 2.066 0.123 3.624 0.428 6.949 1.663 9.929 3.778 3.997 2.836 6.73 6.604 8.208 11.276 0.313 0.988 0.539 1.999 0.691 3.026 0.092 0.623 0.184 1.247 0.2 1.877 0.021 0.801 0.060 1.603 0.035 2.403-0.021 0.671-0.111 1.34-0.191 2.007-0.148 1.243-0.435 2.456-0.804 3.652-0.745 2.415-1.861 4.653-3.247 6.76-0.863 1.312-1.823 2.551-2.855 3.735-1.409 1.618-2.945 3.108-4.572 4.503-2.165 1.857-4.47 3.523-6.883 5.042-2.011 1.266-4.080 2.43-6.226 3.452-0.143 0.068-0.288 0.135-0.441 0.206-0.123-0.015-0.246-0.031-0.369-0.048z"></path>
-</svg>

data/interfaces/default/images/platforms/android.svg

@@ -1,5 +1,8 @@
 <!-- Generated by IcoMoon.io -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
 <title>android</title>
-<path fill="#fff" d="M46.73 40.88c-0.003 0-0.007 0-0.010 0-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0 0 0 0 0 0 1.471-1.19 2.664-2.659 2.67h-0.001zM17.27 40.88c-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0.003 0 0.007 0 0.010 0 1.469-1.191 2.66-2.66 2.66-0.003 0-0.007 0-0.011 0h0.001zM47.68 24.83l5.32-9.23c0.095-0.159 0.151-0.351 0.151-0.557 0-0.405-0.219-0.76-0.546-0.951l-0.005-0.003c-0.16-0.095-0.354-0.152-0.56-0.152-0.407 0-0.764 0.22-0.957 0.547l-0.003 0.005-5.38 9.34c-4.027-1.851-8.738-2.93-13.7-2.93s-9.673 1.079-13.909 3.016l0.209-0.086-5.39-9.34c-0.204-0.28-0.531-0.46-0.9-0.46-0.613 0-1.11 0.497-1.11 1.11 0 0.167 0.037 0.325 0.103 0.467l-0.003-0.007 5.33 9.23c-9.153 5.047-15.453 14.286-16.323 25.059l-0.007 0.111h64c-0.875-10.883-7.171-20.121-16.158-25.088l-0.162-0.082z"></path>
+<path fill="#fff" d="M31.944 21.318c5.556 0 11.113 0 16.67 0 0.042 0 0.084-0 0.126 0.001 0.548 0.012 0.554 0.012 0.554 0.555 0.002 2.526 0.001 5.052 0.001 7.577 0 5.789 0.003 11.577-0.002 17.365-0.001 1.197-0.344 2.274-1.205 3.155-0.759 0.777-1.671 1.191-2.753 1.22-0.757 0.019-1.515 0.011-2.273 0.016-0.772 0.005-0.774 0.006-0.774 0.751-0.001 2.505-0.032 5.010 0.013 7.514 0.024 1.305-0.386 2.363-1.302 3.29-1.214 1.23-3.457 1.485-4.769 0.396-1.051-0.873-1.725-1.978-1.715-3.423 0.019-2.547 0.010-5.093 0.003-7.64-0.003-1.010 0.144-0.869-0.858-0.876-1.158-0.008-2.315-0.005-3.473-0.001-0.829 0.003-0.76-0.103-0.76 0.794-0.002 2.505-0.027 5.010 0.010 7.514 0.019 1.278-0.377 2.325-1.281 3.235-1.199 1.208-3.371 1.494-4.716 0.437-1.067-0.838-1.779-1.932-1.77-3.386 0.017-2.61 0.005-5.219 0.005-7.829 0-0.147-0.008-0.295 0-0.442 0.013-0.24-0.092-0.339-0.334-0.335-0.736 0.012-1.473 0.002-2.209 0.022-0.575 0.015-1.129-0.058-1.673-0.251-1.682-0.597-2.691-2.017-2.737-3.858-0.063-2.566-0.031-5.135-0.035-7.703-0.007-5.304-0.010-10.608-0.016-15.912-0.001-0.568-0.017-1.136-0.018-1.704-0-0.464 0.006-0.472 0.494-0.479 0.989-0.013 1.978-0.023 2.968-0.023 4.609-0.002 9.219-0.001 13.829-0.001-0.001 0.006-0.001 0.014-0.001 0.021z"></path>
+<path fill="#fff" d="M31.944 19.89c-5.535 0-11.071 0.002-16.606-0.002-0.717-0-0.772 0.153-0.687-0.747 0.189-2.003 0.58-3.948 1.437-5.784 1.041-2.228 2.47-4.152 4.433-5.648 0.864-0.658 1.646-1.43 2.624-1.932 0.216-0.111 0.25-0.23 0.129-0.443-0.363-0.64-0.715-1.286-1.059-1.937-0.441-0.835-0.877-1.674-1.302-2.518-0.247-0.491-0.206-0.765 0.103-0.941 0.342-0.194 0.625-0.077 0.892 0.415 0.721 1.329 1.429 2.664 2.142 3.997 0.069 0.13 0.141 0.258 0.215 0.386 0.226 0.39 0.228 0.394 0.671 0.218 2.478-0.987 5.051-1.43 7.715-1.338 2.143 0.074 4.214 0.501 6.214 1.273 0.118 0.045 0.241 0.081 0.35 0.142 0.186 0.102 0.303 0.067 0.405-0.126 0.534-1.023 1.075-2.043 1.617-3.062 0.297-0.557 0.592-1.115 0.908-1.66 0.189-0.325 0.514-0.408 0.809-0.253 0.292 0.153 0.366 0.43 0.175 0.817-0.39 0.79-0.791 1.575-1.204 2.353-0.383 0.725-0.789 1.438-1.18 2.159-0.19 0.351-0.181 0.348 0.158 0.573 1.666 1.102 3.266 2.297 4.577 3.814 1.895 2.192 3.115 4.723 3.574 7.598 0.119 0.746 0.175 1.503 0.266 2.254 0.038 0.311-0.097 0.421-0.393 0.394-0.146-0.014-0.295-0.002-0.442-0.002-5.514 0-11.028 0-16.543 0zM25.561 12.038c-0.063-1.117-0.623-1.553-1.433-1.566-0.833-0.014-1.419 0.462-1.455 1.603-0.025 0.776 0.66 1.407 1.463 1.409 0.79 0.001 1.421-0.64 1.424-1.445zM39.872 13.483c0.788-0.007 1.497-0.676 1.439-1.441-0.076-0.997-0.486-1.549-1.506-1.576-0.841-0.022-1.403 0.67-1.386 1.605 0.016 0.816 0.635 1.418 1.453 1.411z"></path>
+<path fill="#fff" d="M50.587 32.655c0-2.715-0.003-5.429 0.001-8.143 0.003-1.77 0.853-2.959 2.453-3.698 0.717-0.331 1.433-0.52 2.172-0.287 0.794 0.251 1.537 0.649 2.123 1.273 0.519 0.552 0.839 1.207 0.944 1.957 0.052 0.374 0.082 0.754 0.083 1.131 0.005 5.282-0.005 10.564 0.010 15.846 0.004 1.249-0.402 2.288-1.278 3.179-1.245 1.267-3.35 1.546-4.76 0.479-1.076-0.815-1.719-1.943-1.745-3.342-0.019-1.010-0.013-2.020-0.014-3.030-0.002-1.789-0.001-3.578-0.001-5.366 0.004-0 0.008-0 0.012-0z"></path>
+<path fill="#fff" d="M13.369 32.464c0 2.335-0.001 4.669 0.001 7.004 0 0.63 0.047 1.263 0.002 1.889-0.072 1.003-0.541 1.811-1.23 2.554-0.931 1.004-2.059 1.18-3.323 1.058-1.55-0.15-3.156-2.028-3.181-3.665-0.004-0.231-0.015-0.462-0.014-0.694 0.003-5.406 0.007-10.812 0.011-16.218 0.001-1.655 0.863-2.749 2.268-3.501 0.683-0.366 1.397-0.602 2.158-0.402 1.622 0.427 3.305 1.697 3.292 3.834-0.016 2.713-0.004 5.427-0.004 8.141 0.007-0 0.013-0 0.020 0z"></path>
 </svg>

data/interfaces/default/images/platforms/lg.svg

@@ -1,7 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>lg</title>
-<path fill="#fff" d="M30.203 31.797c0 8.176-6.654 14.832-14.835 14.82-7.927-0.011-14.818-6.28-14.812-14.838 0.005-8.282 6.541-14.82 14.841-14.803 8.618 0.017 14.807 6.969 14.806 14.822zM26.577 32.388c-0.087 4.433-3.485 9.518-9.37 10.487-6.122 1.008-11.584-2.989-12.814-8.656-0.632-2.912-0.221-5.696 1.362-8.228 2.347-3.754 5.815-5.502 10.222-5.453 0-0.387 0-0.761 0-1.134-4.114-0.281-9.226 1.824-11.763 6.923-2.454 4.932-1.296 10.953 2.811 14.672 4.153 3.762 10.224 4.309 14.953 1.326 2.328-1.468 3.999-3.496 4.997-6.067 0.628-1.617 0.882-3.296 0.813-5.032-2.967 0-5.909 0-8.864 0 0 0.39 0 0.768 0 1.162 2.558-0 5.097-0 7.652-0zM15.991 37.112c0-0.129 0-0.221 0-0.313 0-3.731 0-7.463 0-11.194 0-0.060-0.004-0.119 0-0.179 0.009-0.118-0.038-0.166-0.16-0.163-0.278 0.006-0.556 0.012-0.833-0.002-0.178-0.008-0.237 0.042-0.237 0.23 0.005 4.194 0.005 8.389-0 12.583-0 0.198 0.065 0.239 0.249 0.237 1.224-0.007 2.448-0.004 3.672-0.004 0.072 0 0.143 0 0.244 0 0-0.343-0.008-0.665 0.003-0.987 0.006-0.166-0.050-0.214-0.214-0.212-0.82 0.007-1.641 0.003-2.461 0.003-0.078 0-0.155 0-0.263 0zM12.434 27.068c0.003-0.987-0.799-1.798-1.785-1.805s-1.799 0.796-1.805 1.782c-0.006 0.985 0.799 1.8 1.783 1.805 0.985 0.004 1.804-0.803 1.807-1.783z"></path>
-<path fill="#fff" d="M63.467 30.606c0 2.864 0 5.707 0 8.571-1.242 0-2.479 0-3.742 0 0-0.468 0-0.933 0-1.433-0.203 0.226-0.366 0.432-0.553 0.612-0.683 0.656-1.518 1-2.441 1.136-1.187 0.174-2.348 0.075-3.462-0.4-1.234-0.526-2.145-1.407-2.8-2.565-0.599-1.058-0.906-2.207-1.035-3.409-0.148-1.367-0.103-2.723 0.28-4.051 0.797-2.764 2.635-4.391 5.453-4.899 1.534-0.277 3.058-0.208 4.54 0.311 1.243 0.436 2.298 1.139 3.011 2.276 0.431 0.688 0.584 1.467 0.687 2.258 0.013 0.097 0.028 0.195 0.046 0.318-0.064 0.003-0.126 0.010-0.188 0.010-1.389 0.001-2.779-0.002-4.169 0.003-0.151 0.001-0.215-0.034-0.245-0.197-0.229-1.234-1.281-1.773-2.308-1.679-1.182 0.108-1.823 0.859-2.22 1.888-0.211 0.547-0.315 1.12-0.352 1.703-0.066 1.061-0.039 2.117 0.31 3.138 0.211 0.618 0.523 1.173 1.050 1.579 1.371 1.055 3.326 0.436 3.877-1.228 0.090-0.274 0.157-0.557 0.246-0.875-0.112 0-0.182 0-0.251 0-0.794 0-1.588-0.005-2.382 0.004-0.168 0.002-0.213-0.053-0.212-0.214 0.006-0.887 0.005-1.774 0.001-2.66-0.001-0.139 0.019-0.215 0.192-0.215 2.17 0.006 4.341 0.004 6.511 0.004 0.045 0 0.090 0.008 0.157 0.013z"></path>
-<path fill="#fff" d="M48.501 35.522c0 1.233 0 2.44 0 3.661-3.613 0-7.216 0-10.834 0 0-4.923 0-9.841 0-14.77 1.44 0 2.872 0 4.331 0 0 0.092 0 0.175 0 0.259 0 3.526 0 7.053 0 10.579 0 0.271 0 0.271 0.267 0.271 1.985 0 3.97 0 5.954 0 0.086 0 0.171 0 0.281 0z"></path>
-</svg>

data/interfaces/default/images/platforms/msedge.svg

@@ -1,7 +1,5 @@
 <!-- Generated by IcoMoon.io -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
 <title>msedge</title>
-<path fill="#fff" d="M27.374 24.467c0.31-0.182 0.635-0.345 0.965-0.487l0.037-0.015c0.001-0 0.002-0.001 0.003-0.001 0.592-0.25 1.213-0.433 1.844-0.543 0.494-0.086 0.996-0.129 1.495-0.129 1.855 0 3.592 0.591 5.017 1.609-0.35-0.579-0.742-1.141-1.175-1.683-1.129-1.413-2.516-2.664-4.12-3.719-1.083-0.712-2.262-1.331-3.504-1.839-2.715-1.114-5.743-1.703-8.759-1.703-3.885 0-7.654 1.106-10.901 3.198-3.086 1.989-5.566 4.773-7.177 8.055-0.245 1.575-0.369 3.188-0.369 4.798 0 8.102 3.099 15.769 8.727 21.59 5.666 5.863 13.196 9.2 21.301 9.464-0.709-0.233-1.407-0.505-2.093-0.816-2.617-1.183-4.931-2.862-6.878-4.99-0.053-0.056-0.109-0.12-0.166-0.183-3.452-3.863-5.354-8.848-5.354-14.035 0-6.244 2.746-12.13 7.533-16.148 1.109-0.929 2.311-1.744 3.576-2.423z"></path>
-<path fill="#fff" d="M62.724 28.806c0.085-0.731 0.129-1.499 0.129-2.285 0-0.728-0.048-1.455-0.142-2.162-0.194-1.445-0.74-3.421-1.391-5.034-1.995-4.943-5.351-9.205-9.707-12.326-5.929-4.249-11.855-6.062-19.813-6.062-13.874 0-25.737 8.96-29.688 21.849 1.488-1.908 3.295-3.562 5.352-4.888 3.489-2.248 7.538-3.437 11.711-3.437 3.209 0 6.434 0.628 9.327 1.815 1.33 0.545 2.595 1.209 3.759 1.973 1.736 1.141 3.24 2.499 4.468 4.035 1.923 2.408 3.107 5.161 3.52 8.182 0.091 0.507 0.137 1.025 0.139 1.539v0.028c0 1.95-0.623 3.794-1.801 5.334-0.247 0.323-0.521 0.634-0.814 0.922-0.014 0.051-0.032 0.165-0.032 0.424 0 0.411 0.18 0.794 0.497 1.058 0.131 0.077 0.265 0.151 0.399 0.221l0.024 0.013c0.017 0.010 0.033 0.019 0.050 0.027l0.035 0.017c2.312 1.216 4.927 1.833 7.773 1.833 4.039 0 7.64-1.020 10.414-2.948 3.289-2.287 5.293-5.789 5.793-10.128z"></path>
-<path fill="#fff" d="M57.865 48.926l0.112-0.174c0.023-0.036 0.046-0.071 0.069-0.107 0.011-0.033 0.017-0.068 0.017-0.102 0-0.112-0.058-0.213-0.156-0.271-0.065-0.039-0.14-0.052-0.211-0.040-0.066 0.037-0.133 0.074-0.199 0.109l-0.024 0.013c-0.017 0.010-0.034 0.019-0.051 0.028-3.483 1.886-7.44 2.883-11.446 2.883-4.047 0-8.008-0.864-11.454-2.499-3.369-1.598-6.205-3.906-8.2-6.675-2.063-2.862-3.19-6.176-3.261-9.585-0.009-0.153-0.013-0.309-0.013-0.475 0-0.243 0.010-0.482 0.029-0.712l0.002-0.024c0.061-0.736 0.214-1.452 0.449-2.134-3.683 3.663-5.767 8.634-5.767 13.876 0 4.818 1.767 9.449 4.974 13.039 0.050 0.056 0.098 0.11 0.148 0.164 3.675 4.016 8.888 6.334 14.317 6.371 6.007-1.052 11.532-3.838 15.98-8.059 1.778-1.686 3.353-3.579 4.685-5.627z"></path>
+<path fill="#fff" d="M21.073 38.209c-0.063 2.074 0.41 3.878 1.361 5.565 1.431 2.539 3.621 4.206 6.229 5.371 3.352 1.497 6.879 2.013 10.532 1.868 4.829-0.191 9.256-1.752 13.531-3.861 0.668-0.33 1.331-0.671 1.997-1.004 0.184-0.092 0.374-0.172 0.644-0.295 0 0.318 0 0.548 0 0.778 0 3.985-0.008 7.969 0.011 11.954 0.002 0.47-0.132 0.709-0.566 0.911-5.329 2.487-10.902 3.954-16.794 4.255-4.831 0.247-9.489-0.409-13.88-2.461-6.848-3.201-11.624-8.311-13.585-15.697-2.89-10.885 1.409-23.494 13.815-28.952 0.206-0.091 0.42-0.163 0.673-0.201-2.549 2.79-3.7 6.149-4.253 9.84 7.489 0 14.89 0 22.367 0 0-0.389 0.036-0.749-0.006-1.099-0.178-1.456-0.27-2.934-0.592-4.358-0.931-4.115-3.56-6.582-7.654-7.478-3.562-0.78-7.126-0.593-10.644 0.252-8.642 2.075-15.514 6.803-20.709 13.995-0.258 0.357-0.49 0.731-0.735 1.097-0.047-0.014-0.094-0.028-0.141-0.041 0.121-0.78 0.22-1.564 0.365-2.339 1.101-5.872 3.411-11.181 7.371-15.71 3.93-4.494 8.775-7.555 14.584-8.928 7.073-1.672 13.991-1.091 20.551 2.144 7.579 3.739 12.387 9.819 14.642 17.935 0.768 2.763 1.141 5.587 1.131 8.459-0.008 2.408-0.002 4.816-0.002 7.223 0 0.23 0 0.461 0 0.774-13.427 0-26.797 0-40.242 0z"></path>
 </svg>

data/interfaces/default/images/rating/themoviedb.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 190.24 81.52"><defs><linearGradient id="a" y1="40.76" x2="190.24" y2="40.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#90cea1"/><stop offset=".56" stop-color="#3cbec9"/><stop offset="1" stop-color="#00b3e5"/></linearGradient></defs><g data-name="Layer 2"><path d="M105.67 36.06h66.9a17.67 17.67 0 0017.67-17.66A17.67 17.67 0 00172.57.73h-66.9A17.67 17.67 0 0088 18.4a17.67 17.67 0 0017.67 17.66zm-88 45h76.9a17.67 17.67 0 0017.67-17.66 17.67 17.67 0 00-17.67-17.67h-76.9A17.67 17.67 0 000 63.4a17.67 17.67 0 0017.67 17.66zm-7.26-45.64h7.8V6.92h10.1V0h-28v6.9h10.1zm28.1 0h7.8V8.25h.1l9 27.15h6l9.3-27.15h.1V35.4h7.8V0H66.76l-8.2 23.1h-.1L50.31 0h-11.8zm113.92 20.25a15.07 15.07 0 00-4.52-5.52 18.57 18.57 0 00-6.68-3.08 33.54 33.54 0 00-8.07-1h-11.7v35.4h12.75a24.58 24.58 0 007.55-1.15 19.34 19.34 0 006.35-3.32 16.27 16.27 0 004.37-5.5 16.91 16.91 0 001.63-7.58 18.5 18.5 0 00-1.68-8.25zM145 68.6a8.8 8.8 0 01-2.64 3.4 10.7 10.7 0 01-4 1.82 21.57 21.57 0 01-5 .55h-4.05v-21h4.6a17 17 0 014.67.63 11.66 11.66 0 013.88 1.87A9.14 9.14 0 01145 59a9.87 9.87 0 011 4.52 11.89 11.89 0 01-1 5.08zm44.63-.13a8 8 0 00-1.58-2.62 8.38 8.38 0 00-2.42-1.85 10.31 10.31 0 00-3.17-1v-.1a9.22 9.22 0 004.42-2.82 7.43 7.43 0 001.68-5 8.42 8.42 0 00-1.15-4.65 8.09 8.09 0 00-3-2.72 12.56 12.56 0 00-4.18-1.3 32.84 32.84 0 00-4.62-.33h-13.2v35.4h14.5a22.41 22.41 0 004.72-.5 13.53 13.53 0 004.28-1.65 9.42 9.42 0 003.1-3 8.52 8.52 0 001.2-4.68 9.39 9.39 0 00-.55-3.18zm-19.42-15.75h5.3a10 10 0 011.85.18 6.18 6.18 0 011.7.57 3.39 3.39 0 011.22 1.13 3.22 3.22 0 01.48 1.82 3.63 3.63 0 01-.43 1.8 3.4 3.4 0 01-1.12 1.2 4.92 4.92 0 01-1.58.65 7.51 7.51 0 01-1.77.2h-5.65zm11.72 20a3.9 3.9 0 01-1.22 1.3 4.64 4.64 0 01-1.68.7 8.18 8.18 0 01-1.82.2h-7v-8h5.9a15.35 15.35 0 012 .15 8.47 8.47 0 012.05.55 4 4 0 011.57 1.18 3.11 3.11 0 01.63 2 3.71 3.71 0 01-.43 1.92z" fill="url(#a)" data-name="Layer 1"/></g></svg>

data/interfaces/default/images/rating/thetvdb.svg

@@ -1 +0,0 @@
-<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect y="8" width="48" height="32" rx="2" fill="#333"/><path d="M5.708 12.19c-.375-.065-.75-.128-1.125-.19h-.509s-.269.139-.373.178c-1.334.496-1.835 1.26-1.671 2.693.724 6.411 1.453 12.822 2.201 19.238.214 1.845 1.126 2.564 2.98 2.36a92.817 92.817 0 003.233-.427c.427-.062.853-.123 1.28-.182 2.169-.3 4.337-.603 6.505-.905 2.168-.303 4.336-.605 6.505-.905.917-.13 1.552-.64 1.75-1.503.022-.093.047-.19.072-.287.172-.667.365-1.418-.275-1.919-3.327-2.588-3.332-7.64-.024-10.234.168-.129.347-.382.351-.58.03-.918.04-1.84-.02-2.757-.074-1.12-.743-1.81-1.874-1.964-2.444-.33-4.887-.657-7.331-.983-3.055-.409-6.11-.817-9.165-1.233-.842-.116-1.676-.259-2.51-.4zm17.102 5.026c.73 0 1.334.585 1.344 1.31.01.708-.59 1.333-1.309 1.363a1.341 1.341 0 01-1.363-1.29 1.306 1.306 0 011.328-1.383zM7.628 24.148H6.309v-.997h.258v.705h.268v-.62h.257v.62h.278v-.714h.258v1.006zm-.53.61h.53v-.288H6.309v.288h.52v.535h-.52v.288h1.319v-.288h-.53v-.535zm.53 1.448H6.577v-.402h-.268v1.091h.268v-.402h1.05v-.287z" fill="#227D3A"/><path d="M32.023 20.36v-3.545h2.613v13.298c-.64-.024-1.281-.04-1.92-.055-1.499-.037-2.992-.074-4.476-.213-1.26-.119-2.127-1.016-2.717-2.122-1.156-2.177-.704-5.047 1.175-6.476.664-.5 1.611-.718 2.469-.852.62-.1 1.258-.078 1.931-.056.3.01.608.02.925.02zm-.045 2.087c-.24 0-.473-.003-.7-.006a21.007 21.007 0 00-1.377.011c-1.324.075-2.142.962-2.261 2.395-.13 1.517.58 2.752 1.84 2.985.558.103 1.136.116 1.718.129.26.005.52.011.78.025v-5.539zm13.879 4.012c-.56 2.062-1.87 3.351-4.026 3.495-1.295.086-2.6.065-3.917.044a104.6 104.6 0 00-1.776-.019v-13.14h2.633v3.516l.858-.001a193.42 193.42 0 011.582 0c2.727.026 4.086 1.126 4.705 3.789l.002.005c.016.08.21 1.017-.061 2.31zm-7.026 1.507c.343-.025.693-.016 1.04-.008 1.166.03 2.293.058 2.981-1.207.6-1.1.65-2.355-.084-3.401-.717-1.016-1.725-.969-2.746-.92-.399.018-.8.037-1.186-.008-.005 1.885-.005 3.665-.005 5.544zM12.04 20.522c-.436-.002-.88-.004-1.333-.004 0-1.06-.015-2.94-.015-2.94v-.595s-1.87-.03-2.712-.03v3.417l-1.626.015s-.065 1.551-.065 2.236h1.726v2.25c-.003.894-.005 1.788.015 2.683.024 1.166.738 2.286 1.71 2.455.752.13 1.518.165 2.291.201.344.016.69.032 1.036.057V28.11c-.137 0-.27.001-.398.003-.29.003-.56.005-.831-.008-.556-.025-1.042-.303-1.066-.853a71.029 71.029 0 01-.027-3.284c.003-.45.007-.904.007-1.362.269 0 .53.002.787.004.6.005 1.174.01 1.746-.014.481-.02.704.174.873.61.64 1.666 1.304 3.327 1.983 4.978.072.174.135.363.2.554.187.556.38 1.126.767 1.37.436.272 1.11.192 1.745.117.152-.018.303-.035.447-.048.273-.024.654-.262.758-.5a625.204 625.204 0 003.207-7.381l.468-1.088a2.38 2.38 0 00.128-.43c.019-.08.04-.168.065-.264-.244 0-.478.002-.704.005-.502.006-.965.012-1.423-.015-.476-.025-.719.148-.888.59a178.161 178.161 0 01-1.542 3.872c-.172.43-.358.853-.559 1.312-.105.24-.214.49-.328.756l-.135-.308a9.371 9.371 0 01-.163-.381c-.18-.486-.364-.972-.546-1.458a215.63 215.63 0 01-1.368-3.704c-.178-.5-.426-.694-.971-.68-1.072.029-2.144.024-3.258.02z" fill="#fff"/></svg>

data/interfaces/default/index.html

@@ -24,13 +24,17 @@
             </div>
             <div id="currentActivity">
                 % if PLEX_SERVER_UP:
-                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>
+                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
                 % elif config['pms_is_cloud']:
                 <div id="dashboard-no-activity" class="text-muted">Plex Cloud server is sleeping.</div>
                 % elif not config['first_run_complete']:
                 <div id="dashboard-no-activity" class="text-muted">The Tautulli setup wizard has not been completed. Please click <a href="welcome">here</a> to go to the setup wizard.</div>
                 % else:
-                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to the Plex server...</div>
+                <div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.
+                    % if _session['user_group'] == 'admin':
+                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
+                    % endif
+                </div>
                 % endif
             </div>
         </div>
@@ -42,10 +46,10 @@
                 <h3 class="pull-left">Watch Statistics</h3>
                 <div class="button-bar">
                     <div class="btn-group pull-left" data-toggle="buttons" id="watch-stats-toggles" style="margin-right: 3px">
-                        <label class="btn btn-dark btn-filter">
+                        <label class="btn btn-dark">
                             <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-plays" value="plays" autocomplete="off"> Play Count
                         </label>
-                        <label class="btn btn-dark btn-filter">
+                        <label class="btn btn-dark">
                             <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-duration" value="duration" autocomplete="off"> Play Duration
                         </label>
                     </div>
@@ -61,7 +65,7 @@
     <div class="row">
         <div class="col-md-12">
             <div id="home-stats" class="home-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
                 <br>
             </div>
         </div>
@@ -80,7 +84,7 @@
     <div class="row">
         <div class="col-md-12">
             <div id="library-stats" class="library-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
                 <br>
             </div>
         </div>
@@ -92,27 +96,27 @@
                 <h3 class="pull-left"><span id="recently-added-xml">Recently Added</span></h3>
                 <ul class="nav nav-header nav-dashboard pull-right" style="margin-top: -3px;">
                     <li>
-                        <a href="#" id="recently-added-page-left" class="paginate-added btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-left"></i></a>
+                        <a href="#" id="recently-added-page-left" class="paginate btn-gray disabled" data-id="+1"><i class="fa fa-lg fa-chevron-left"></i></a>
                     </li>
                     <li>
-                        <a href="#" id="recently-added-page-right" class="paginate-added btn-gray disabled" data-id="+1"><i class="fa fa-lg fa-chevron-right"></i></a>
+                        <a href="#" id="recently-added-page-right" class="paginate btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-right"></i></a>
                     </li>
                 </ul>
                 <div class="button-bar">
                     <div class="btn-group pull-left" data-toggle="buttons" id="recently-added-toggles" style="margin-right: 3px">
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-all">
+                        <label class="btn btn-dark" id="recently-added-label-all">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-all" value="all" autocomplete="off"> All
                         </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-movies">
+                        <label class="btn btn-dark" id="recently-added-label-movies">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-movie" value="movie" autocomplete="off"> Movies
                         </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-tv">
+                        <label class="btn btn-dark" id="recently-added-label-tv">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-show" value="show" autocomplete="off"> TV Shows
                         </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-music">
+                        <label class="btn btn-dark" id="recently-added-label-music">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-artist" value="artist" autocomplete="off"> Music
                         </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-other_video">
+                        <label class="btn btn-dark" id="recently-added-label-other_video">
                             <input type="radio" name="recently-added-toggle" id="recently-added-toggle-other_video" value="other_video" autocomplete="off"> Videos
                         </label>
                     </div>
@@ -128,12 +132,17 @@
         <div class="col-md-12">
             <div id="recentlyAdded" style="margin-right: -15px;">
                 % if PLEX_SERVER_UP:
-                <div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div>
                 % elif config['pms_is_cloud']:
                 <div class="text-muted">Plex Cloud server is sleeping.</div>
                 % else:
-                <div id="dashboard-no-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to your Plex server...</div>
+                <div class="text-muted">There was an error communicating with your Plex Server.
+                    % if _session['user_group'] == 'admin':
+                    Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.
+                    % endif
+                </div>
                 % endif
+                <br>
             </div>
         </div>
     </div>
@@ -170,10 +179,10 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Terminate Stream</h4>
+                <h4 class="modal-title">Terminate Session</h4>
             </div>
             <div class="modal-body" style="text-align: center;">
-                <p>Are you sure you want to terminate this stream?</p>
+                <p>Are you sure you want to terminate this session?</p>
                 <p>
                     <strong>
                         <span id="terminate-user"></span><br />
@@ -220,6 +229,8 @@
 </%def>
 
 <%def name="javascriptIncludes()">
+<% from plexpy import PLEX_SERVER_UP %>
+<script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/jquery.scrollbar.min.js"></script>
 <script src="${http_root}js/jquery.mousewheel.min.js"></script>
 <script>
@@ -249,43 +260,8 @@
             }
         });
     }
-
-    % if _session['user_group'] == 'admin':
-    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
-    % else:
-    var msg_settings = '';
-    % endif
-
-    var error_msg = 'There was an error communicating with your Plex Server.' + msg_settings;
-
-    % if 'current_activity' in config['home_sections'] or 'recently_added' in config['home_sections']:
-    var server_status;
-    server_status = setInterval(function() {
-        $.getJSON('server_status', function (data) {
-            if (data.connected === true) {
-                clearInterval(server_status);
-                % if 'current_activity' in config['home_sections']:
-                $('#currentActivity').html('<div id="dashboard-checking-activity" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>');
-                activityConnected();
-                % endif
-                % if 'recently_added' in config['home_sections']:
-                $('#recentlyAdded').html('<div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>');
-                recentlyAddedConnected();
-                % endif
-            } else if (data.connected === false) {
-                clearInterval(server_status);
-                % if 'current_activity' in config['home_sections']:
-                $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
-                % endif
-                % if 'recently_added' in config['home_sections']:
-                $('#recentlyAdded').html('<div id="dashboard-no-recently-added" class="text-muted">' + error_msg + '</div>');
-                % endif
-            }
-        });
-    }, 1000);
-    % endif
 </script>
-% if 'current_activity' in config['home_sections']:
+% if 'current_activity' in config['home_sections'] and PLEX_SERVER_UP:
 <script>
     var defaultHandler = {
         get: function(target, name) {
@@ -296,9 +272,7 @@
     var create_instances = [];
     var activity_ready = true;
 
-    $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
-
-    var title = document.title;
+     $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
 
     function getCurrentActivity() {
         activity_ready = false;
@@ -324,8 +298,13 @@
                 }
 
                 if (!(current_activity)) {
+                    % if _session['user_group'] == 'admin':
+                    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
+                    % else:
+                    var msg_settings = '';
+                    % endif
                     $('#currentActivityHeader').hide();
-                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
+                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.' + msg_settings + '</div>');
                     return
                 }
 
@@ -370,8 +349,6 @@
 
                     $('#currentActivityHeader').show();
 
-                    document.title = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' | ' + title;
-
                     sessions.forEach(function (session) {
                         var s = (typeof Proxy === "function") ? new Proxy(session, defaultHandler) : session;
                         var key = s.session_key;
@@ -400,9 +377,6 @@
                             case 'buffering':
                                 state_icon = '<i class="fa fa-fw fa-spinner"></i>&nbsp;';
                                 break;
-                            case 'error':
-                                state_icon = '<i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;';
-                                break;
                             default:
                                 state_icon = '<i class="fa fa-fw fa-question-circle"></i>&nbsp;';
                         }
@@ -457,7 +431,7 @@
 
                         var transcode_container = '';
                         if (s.stream_container_decision === 'transcode') {
-                            transcode_container = 'Converting (' + s.container.toUpperCase() + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_container.toUpperCase() + ')';
+                            transcode_container = 'Transcode (' + s.container.toUpperCase() + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_container.toUpperCase() + ')';
                         } else {
                             transcode_container = 'Direct Play (' + s.stream_container.toUpperCase() + ')';
                         }
@@ -465,8 +439,8 @@
 
                         var video_decision = '';
                         if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.stream_video_decision) {
-                            var v_bd =  (s.video_dynamic_range !== 'SDR') ? ' ' + s.video_dynamic_range : '';
-                            var sv_bd =  (s.stream_video_dynamic_range !== 'SDR' || v_bd) ? ' ' + s.stream_video_dynamic_range : '';
+                            var v_bd =  (s.video_dynamic_range === 'HDR') ? ' ' + s.video_dynamic_range : '';
+                            var sv_bd =  (s.video_dynamic_range === 'HDR') ? ' ' + s.stream_video_dynamic_range : '';
                             var v_res= '';
                             switch (s.video_resolution.toLowerCase()) {
                                 case 'sd':
@@ -505,15 +479,14 @@
 
                         var audio_decision = '';
                         if (['movie', 'episode', 'clip', 'track'].indexOf(s.media_type) > -1 && s.stream_audio_decision) {
-                            var audio_language = (s.media_type !== 'track') ? (s.audio_language || 'Unknown') + ' - ' : '';
                             var a_codec = (s.audio_codec === 'truehd') ? 'TrueHD' : s.audio_codec.toUpperCase();
                             var sa_codec = (s.stream_audio_codec === 'truehd') ? 'TrueHD' : s.stream_audio_codec.toUpperCase();
                             if (s.stream_audio_decision === 'transcode') {
-                                audio_decision = 'Transcode (' + audio_language + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' <i class="fa fa-long-arrow-right"></i> ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+                                audio_decision = 'Transcode (' + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' <i class="fa fa-long-arrow-right"></i> ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
                             } else if (s.stream_audio_decision === 'copy') {
-                                audio_decision = 'Direct Stream (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+                                audio_decision = 'Direct Stream (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
                             } else {
-                                audio_decision = 'Direct Play (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
+                                audio_decision = 'Direct Play (' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
                             }
                         }
                         $('#audio_decision-' + key).html(audio_decision);
@@ -522,13 +495,13 @@
                         if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.subtitles === 1) {
                             var subtitle_codec = (s.stream_subtitle_codec && s.stream_subtitle_transient) ? 'None' : s.subtitle_codec.toUpperCase();
                             if (s.stream_subtitle_decision === 'transcode') {
-                                subtitle_decision = 'Transcode ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_subtitle_codec.toUpperCase() + ')';
+                                subtitle_decision = 'Transcode (' + subtitle_codec + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_subtitle_codec.toUpperCase() + ')';
                             } else if (s.stream_subtitle_decision === 'copy') {
-                                subtitle_decision = 'Direct Stream ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
+                                subtitle_decision = 'Direct Stream (' + subtitle_codec + ')';
                             } else if (s.stream_subtitle_decision === 'burn') {
-                                subtitle_decision = 'Burn ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
+                                subtitle_decision = 'Burn (' + subtitle_codec + ')';
                             } else {
-                                subtitle_decision = 'Direct Play ('+ (s.subtitle_language || 'Unknown')+ ' - ' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
+                                subtitle_decision = 'Direct Play (' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
                             }
                         }
                         $('#subtitle_decision-' + key).html(subtitle_decision);
@@ -566,18 +539,15 @@
 
                         // Update the stream progress times
                         $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));
-                        $('#stream-duration-' + key).html(millisecondsToMinutes(parseInt(s.stream_duration), false));
                         var stream_view_offset = $('#stream-view-offset-' + key);
                         stream_view_offset.data('state', s.state);
                         if (stream_view_offset.data('last_view_offset') !== s.view_offset) {
                             stream_view_offset.data('last_view_offset', s.view_offset).data('view_offset', s.view_offset);
                         }
 
-                        // Update the progress bars
-                        var duration = parseInt(s.duration);
-                        var transcode_progress = duration ? Math.round(s.transcode_max_offset_available * 1000 / duration * 100) : s.transcode_progress;
-                        $('#buffer-bar-' + key).css({width: parseInt(transcode_progress) + '%'}).html(transcode_progress + '%')
-                            .attr('data-original-title', 'Transcoder Progress ' + transcode_progress + '%');
+                        // Update the progress bars, percent - 3 because of 3px padding-right
+                        $('#buffer-bar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%')
+                            .attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
                         if (s.live !== 1) {
                             var progress_bar = $('#progress-bar-' + key);
                             progress_bar.data('state', s.state);
@@ -604,8 +574,6 @@
                 } else {
                     $('#currentActivityHeader').hide();
                     $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">Nothing is currently being played.</div>');
-
-                    document.title = title;
                 }
 
                 activity_ready = true;
@@ -635,7 +603,6 @@
                 $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 });
                 $('#activity-instance-' + session_key + ' [data-toggle=popover]').popover({
                     html: true,
-                    sanitize: false,
                     container: 'body',
                     trigger: 'hover',
                     placement: 'right',
@@ -656,43 +623,38 @@
         });
     }
 
-    function activityConnected() {
-        getCurrentActivity();
-        setInterval(function () {
-            if (!(create_instances.length) && activity_ready) {
-                getCurrentActivity();
-            }
-        }, ${config['home_refresh_interval'] * 1000});
+    getCurrentActivity();
+    setInterval(function () {
+        if (!(create_instances.length) && activity_ready) {
+            getCurrentActivity();
+        }
+    }, ${config['home_refresh_interval'] * 1000});
 
-        setInterval(function(){
-            $('.progress_time_offset').each(function () {
-                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                    var view_offset = parseInt($(this).data('view_offset'));
-                    var stream_duration = parseInt($(this).data('stream_duration'));
-                    var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
-                    $(this).html(timestamp).data('view_offset', Math.min(view_offset + 1000, stream_duration))
-                }
-            });
-            $('.progress-bar').each(function () {
-                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                    var view_offset = parseInt($(this).data('view_offset'));
-                    var stream_duration = parseInt($(this).data('stream_duration'));
-                    var progress_percent = Math.floor(view_offset / stream_duration * 100);
-                    progress_percent = (progress_percent >= 0) ? Math.min(progress_percent, 100) : 100;
-                    $(this).css({width: progress_percent + '%'}).html(progress_percent + '%')
-                        .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
-                        .data('view_offset', Math.min(view_offset + 1000, stream_duration));
-                }
-            });
-        }, 1000);
-    }
+    setInterval(function(){
+        $('.progress_time_offset').each(function () {
+            if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
+                var view_offset = parseInt($(this).data('view_offset'));
+                var stream_duration = parseInt($(this).data('stream_duration'));
+                var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
+                $(this).html(timestamp).data('view_offset', Math.min(view_offset + 1000, stream_duration))
+            }
+        });
+        $('.progress-bar').each(function () {
+            if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
+                var view_offset = parseInt($(this).data('view_offset'));
+                var stream_duration = parseInt($(this).data('stream_duration'));
+                var progress_percent = Math.floor(view_offset / stream_duration * 100);
+                progress_percent = (progress_percent >= 0) ? Math.min(progress_percent, 100) : 100;
+                $(this).width(progress_percent - 3 + '%').html(progress_percent + '%')
+                    .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
+                    .data('view_offset', Math.min(view_offset + 1000, stream_duration));
+            }
+        });
+    }, 1000);
 
     $('#currentActivity').on('click', '.external_ip-modal', function () {
         $.get('get_ip_address_details', {
-            ip_address: $(this).data('ip'),
-            location: $(this).data('location'),
-            secure: $(this).data('secure'),
-            relayed: $(this).data('relayed')
+            ip_address: $(this).data('ip')
         }).then(function (jqXHR) {
             $("#ip-info-modal").html(jqXHR);
         });
@@ -769,21 +731,16 @@
 <script>
     function statsCardCallback() {
         $('.dashboard-stats-instance .dashboard-stats-info-scroller').scrollbar();
-        loadAllBlurHash();
 
         function changeImages(elem) {
             var stat_id = $(elem).data('stat_id');
             var art = $(elem).data('art');
             var thumb = $(elem).data('thumb');
             var user_id = $(elem).data('user_id');
-            var library_type = $(elem).data('library-type');
             var user_thumb = $(elem).data('user_thumb');
             var rating_key = $(elem).data('rating_key');
-            var grandparent_rating_key = $(elem).data('grandparent_rating_key');
             var guid = $(elem).data('guid');
             var live = $(elem).data('live');
-            var library_art = $(elem).data('library_art');
-            var library_thumb = $(elem).data('library_thumb');
             var [height, fallback_poster, fallback_art] = [450, 'poster', 'art'];
             if ($.inArray(stat_id, ['top_music', 'popular_music']) > -1) {
                 [height, fallback_poster, fallback_art] = [300, 'cover', 'art'];
@@ -794,23 +751,12 @@
 
             if (stat_id === 'most_concurrent') {
                 return
-            } else if (stat_id === 'top_libraries') {
-                $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
-                $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
-                    return (className.match (/(^|\s)svg-icon library-\S+/g) || []).join(' ')});
-                if (library_thumb.startsWith('http')) {
-                    $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', library_thumb, null, 100, 100, null, null, null, 'cover') + ')');
-                } else {
-                    $('#stats-thumb-' + stat_id).css('background-image', '')
-                        .addClass('svg-icon library-' + library_type);
-                }
             } else if (stat_id === 'top_users') {
-                loadBlurHash($('#stats-background-' + stat_id), page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, 40, '282828', 0, 'user'));
-                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, null, null, null, 'user') + ')');
+                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + (user_thumb || 'images/gravatar-default.png') + ')');
                 if (user_id) {
                     href = page('user', user_id);
                 }
-                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('user'));
+                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('friendly_name'));
             } else if (stat_id === 'top_platforms') {
                 $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
                     return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
@@ -826,14 +772,13 @@
                         href = page('info', rating_key);
                     }
                 }
-                var img_rating_key = grandparent_rating_key || rating_key;
                 $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('title'));
-                $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
-                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, null, null, null, fallback_poster) + ')');
-                $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')');
-                $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, img_rating_key, 500, 280, 40, '282828', 3, library_art || fallback_art) + ')');
+                $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
+                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, rating_key, 300, height, null, null, null, fallback_poster) + ')');
+                $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('pms_image_proxy', thumb, rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')');
+                $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
                 if (thumb.startsWith('http')) {
-                    $('#library-stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, 300, null, null, null, 'cover') + ')')
+                    $('#library-stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, rating_key, 300, 300, null, null, null, 'cover') + ')')
                         .removeClass('svg-icon library-' + stat_id);
                 } else {
                     $('#library-stats-thumb-' + stat_id).css('background-image', '')
@@ -929,7 +874,7 @@
     getLibraryStats();
 </script>
 % endif
-% if 'recently_added' in config['home_sections']:
+% if 'recently_added' in config['home_sections'] and PLEX_SERVER_UP:
 <script>
     function recentlyAdded(recently_added_count, recently_added_type) {
         showMsg("Loading recently added items...", true, false, 0);
@@ -942,14 +887,10 @@
                 count: recently_added_count,
                 media_type: recently_added_type
             },
-            beforeSend: function () {
-                $(".dashboard-recent-media-row").animate({ scrollLeft: 0 }, 1000);
-            },
             complete: function (xhr, status) {
                 $("#recentlyAdded").html(xhr.responseText);
                 $('#ajaxMsg').fadeOut();
-                highlightScrollerButton("#recently-added");
-                paginateScroller("#recently-added", ".paginate-added");
+                highlightAddedScrollerButton();
             }
         });
     }
@@ -961,15 +902,59 @@
     $('#recently-added-toggle-' + recently_added_type).closest('label').addClass('active');
     $('#recently-added-count').val(recently_added_count);
 
-    function recentlyAddedConnected() {
-        recentlyAdded(recently_added_count, recently_added_type);
+    recentlyAdded(recently_added_count, recently_added_type);
+
+    function highlightAddedScrollerButton() {
+        var scroller = $("#recently-added-row-scroller");
+        var numElems = scroller.find("li:visible").length;
+        scroller.width(numElems * 175);
+        if (scroller.width() > $("body").find(".container-fluid").width()) {
+            $("#recently-added-page-right").removeClass("disabled");
+        } else {
+            $("#recently-added-page-right").addClass("disabled");
+        }
     }
 
+    $(window).resize(function () {
+        highlightAddedScrollerButton();
+    });
+
+    function resetScroller() {
+        leftTotal = 0;
+        $("#recently-added-row-scroller").animate({ left: leftTotal }, 1000);
+        $("#recently-added-page-left").addClass("disabled").blur();
+    }
+
+    var leftTotal = 0;
+    $(".paginate").click(function (e) {
+        e.preventDefault();
+        var scroller = $("#recently-added-row-scroller");
+        var containerWidth = $("body").find(".container-fluid").width();
+        var scrollAmount = $(this).data("id") * parseInt((containerWidth - 15) / 175) * 175;
+        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+        leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
+        scroller.animate({ left: leftTotal }, 250);
+
+        if (leftTotal === 0) {
+            $("#recently-added-page-left").addClass("disabled").blur();
+        } else {
+            $("#recently-added-page-left").removeClass("disabled");
+        }
+
+        if (leftTotal === leftMax) {
+            $("#recently-added-page-right").addClass("disabled").blur();
+        } else {
+            $("#recently-added-page-right").removeClass("disabled");
+        }
+    });
+
     $('#recently-added-toggles').on('change', function () {
         $('#recently-added-toggles > label').removeClass('active');
         selected_filter = $('input[name=recently-added-toggle]:checked', '#recently-added-toggles');
         $(selected_filter).closest('label').addClass('active');
         recently_added_type = $(selected_filter).val();
+        resetScroller();
         setLocalStorage('home_stats_recently_added_type', recently_added_type);
         recentlyAdded(recently_added_count, recently_added_type);
     });
@@ -977,6 +962,7 @@
     $('#recently-added-count').change(function () {
         forceMinMax($(this));
         recently_added_count = $(this).val();
+        resetScroller();
         setLocalStorage('home_stats_recently_added_count', recently_added_count);
         recentlyAdded(recently_added_count, recently_added_type);
     });
@@ -1008,4 +994,4 @@
     });
 </script>
 % endif
-</%def>
+</%def>

data/interfaces/default/info_children_list.html

@@ -28,91 +28,19 @@ DOCUMENTATION :: END
 
 % if data != None:
 <%
-    from plexpy.helpers import cast_to_int, page, short_season
+    from plexpy.helpers import page
 %>
 % if data['children_count'] > 0:
 <div class="item-children-wrapper">
-    <% max_height ='max-height' if data['children_type'] in ('track', 'photo') or media_type == 'playlist' else '' %>
-    <ul class="item-children-instance ${max_height} list-unstyled">
+    <ul class="item-children-instance list-unstyled">
         % for child in data['children_list']:
         % if child['rating_key']:
-        % if data['children_type'] in ('track', 'photo') or media_type == 'playlist':
+        % if data['children_type'] == 'track':
         <li class="item-children-list-item">
         % else:
         <li>
         % endif
-            % if media_type == 'playlist':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${loop.index + 1}</span>
-                    <span class="item-children-list-item-title">
-                        % if child['media_type'] == 'movie':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (${child['year']})</span>
-                        % elif child['media_type'] == 'episode':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a> -
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${short_season(child['parent_title'])}</a> &middot; <a class="no-highlight" href="${page('info', child['rating_key'])}" title="${child['title']}">E${child['media_index']}</a>)</span>
-                        % elif child['media_type'] == 'track':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a> -
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['media_type'] == 'photo':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                            % if child['grandparent_title']:
-                            - <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                                <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                    ${child['grandparent_title']}
-                                </span>
-                            </a>
-                            % endif
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['media_type'] == 'clip':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % endif
-                    </span>
-                    % if child['duration']:
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
-                    % endif
-                </div>
-            % elif child['media_type'] == 'movie':
+            % if data['children_type'] == 'movie':
             <a href="${page('info', child['rating_key'])}" title="${child['title']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
@@ -127,7 +55,7 @@ DOCUMENTATION :: END
                 </h3>
                 <h3 class="text-muted">${child['year']}</h3>
             </div>
-            % elif child['media_type'] == 'show':
+            % elif data['children_type'] == 'show':
             <a href="${page('info', child['rating_key'])}" title="${child['title']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
@@ -141,8 +69,8 @@ DOCUMENTATION :: END
                      <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
                 </h3>
             </div>
-            % elif child['media_type'] == 'season':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+            % elif data['children_type'] == 'season':
+            <a href="${page('info', child['rating_key'])}" title="Season ${child['media_index']}">
                 <div class="item-children-poster">
                     % if child['thumb']:
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});">
@@ -151,7 +79,7 @@ DOCUMENTATION :: END
                     % endif
                         <div class="item-children-card-overlay">
                             <div class="item-children-overlay-text">
-                                ${child['title']}
+                                Season ${child['media_index']}
                             </div>
                         </div>
                     </div>
@@ -160,17 +88,7 @@ DOCUMENTATION :: END
                     % endif
                 </div>
             </a>
-            <div class="item-children-instance-text-wrapper poster-item">
-                <h3>
-                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a class="text-muted" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>
-                </h3>
-                % endif
-            </div>
-            % elif child['media_type'] == 'episode':
+            % elif data['children_type'] == 'episode':
             <a href="${page('info', child['rating_key'])}" title="Episode ${child['media_index']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});">
@@ -189,17 +107,8 @@ DOCUMENTATION :: END
                 <h3>
                      <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
                 </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">${child['grandparent_title']}</a>
-                </h3>
-                <h3 class="text-muted">
-                    <a href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${short_season(child['parent_title'])}</a>
-                        &middot; <a href="${page('info', child['rating_key'])}" title="Episode ${child['media_index']}">E${child['media_index']}</a>
-                </h3>
-                % endif
             </div>
-            % elif child['media_type'] == 'artist':
+            % elif data['children_type'] == 'album':
             <a href="${page('info', child['rating_key'])}" title="${child['title']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
@@ -213,102 +122,38 @@ DOCUMENTATION :: END
                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
                 </h3>
             </div>
-            % elif child['media_type'] == 'album':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
-                </div>
-            </a>
-            <div class="item-children-instance-text-wrapper cover-item">
-                <h3>
-                    <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a class="text-muted" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>
-                </h3>
-                % endif
-            </div>
-            % elif child['media_type'] == 'track':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${child['media_index']}</span>
-                    <span class="item-children-list-item-title">
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        % if media_type == 'collection':
-                        -
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['original_title']:
+            % elif data['children_type'] == 'track':
+                % if loop.index % 2 == 0:
+                <div class="item-children-list-item-even">
+                    <span class="item-children-list-item-index">&nbsp;${child['media_index']}</span>
+                    <span class="item-children-list-item-title"><a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
+                    % if child['original_title']:
                         <span class="text-muted"> - ${child['original_title']}</span>
-                        % endif
-                    </span>
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
-                </div>
-            % elif child['media_type'] == 'photo':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${loop.index + 1}</span>
-                    <span class="item-children-list-item-title">
-                        % if child['media_type'] == 'photo_album':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-camera fa-fw"></i></span>
-                        % elif child['media_type'] == 'clip':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-video-camera fa-fw"></i></span>
-                        % else:
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
-                        % endif
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                    </span>
-                    % if child['duration']:
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
                     % endif
+                    </span>
+                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
+                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                    </span>
                 </div>
+                % else:
+                <div class="item-children-list-item-odd">
+                    <span class="item-children-list-item-index">&nbsp;${child['media_index']}</span>
+                    <span class="item-children-list-item-title"><a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
+                    % if child['original_title']:
+                        <span class="text-muted"> - ${child['original_title']}</span>
+                    % endif
+                    </span>
+                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
+                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                    </span>
+                </div>
+                % endif
             % endif
         </li>
         % endif
         % endfor
     </ul>
 </div>
-<script>
-    $('body').tooltip({
-        selector: '[data-toggle="tooltip"]',
-        container: 'body'
-    });
-    $('body').popover({
-        selector: '[data-toggle="popover"]',
-        html: true,
-        sanitize: false,
-        container: 'body',
-        trigger: 'hover',
-        placement: 'right',
-        template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-        content: function () {
-            return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-        }
-    });
-</script>
 % endif
 % endif
 

data/interfaces/default/info_search_results_list.html

@@ -54,7 +54,7 @@ DOCUMENTATION :: END
 
 % if data != None:
 <%
-    from plexpy.helpers import page, short_season
+    from plexpy.helpers import page
 %>
 % if data['results_count'] > 0:
 % if 'collection' in data['results_list'] and data['results_list']['collection']:
@@ -65,7 +65,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['collection']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -90,7 +90,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['movie']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -115,7 +115,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['show']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -140,7 +140,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['season']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -149,7 +149,7 @@ DOCUMENTATION :: END
                 </div>
                 <div class="item-children-instance-text-wrapper poster-item">
                     <h3 title="${child['parent_title']}">${child['parent_title']}</h3>
-                    <h3 class="text-muted">${short_season(child['title'])}</h3>
+                    <h3 class="text-muted">S${child['media_index']}</h3>
                 </div>
             </a>
         </li>
@@ -165,7 +165,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['episode']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -175,7 +175,7 @@ DOCUMENTATION :: END
                 <div class="item-children-instance-text-wrapper episode-item">
                     <h3 title="${child['grandparent_title']}">${child['grandparent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
-                    <h3 class="text-muted">${short_season(child['parent_title'])} &middot; E${child['media_index']}</h3>
+                    <h3 class="text-muted">S${child['parent_media_index']} &middot; E${child['media_index']}</h3>
                 </div>
             </a>
         </li>
@@ -191,7 +191,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['artist']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -215,7 +215,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['album']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
                     % if _session['user_group'] == 'admin':
@@ -240,7 +240,7 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['track']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="${page('info', child['rating_key'])}" id="${child['rating_key']}">
                 <div class="item-children-poster">
                     <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')});">
                         <div class="item-children-card-overlay">

data/interfaces/default/ip_address_modal.html

@@ -13,25 +13,9 @@
             </h4>
         </div>
         <div class="modal-body" id="modal-text">
-            % if kwargs:
             <div class="col-sm-12">
                 <h4>
-                    <strong>Connection Details</strong>
-                </h4>
-            </div>
-            <div class="col-sm-12">
-                <ul class="list-unstyled">
-                    <% icon = {'0': 'times', '1': 'check'} %>
-                    <li>Location: <strong>${(kwargs['location'] or 'unknown').upper()}</strong></li>
-                    <li>Secure Connection: <i class="fa fa-${icon.get(kwargs['secure'], 'question')}"></i></li>
-                    <li>Plex Relay: <i class="fa fa-${icon.get(kwargs['relayed'], 'question')}"></i></li>
-                </ul>
-            </div>
-            % endif
-            % if public:
-            <div class="col-sm-12">
-                <h4>
-                    <strong>Geolocation Lookup</strong>
+                    <strong>Location Details</strong>
                     % if data:
                     <span id="ip_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
                     % endif
@@ -40,7 +24,6 @@
             <div id="ip_error" class="col-sm-12 text-muted"></div>
             <div class="col-sm-6">
                 <ul class="list-unstyled">
-                    <li>Continent: <strong><span id="continent"></span></strong></li>
                     <li>Country: <strong><span id="country"></span></strong></li>
                     <li>Region: <strong><span id="region"></span></strong></li>
                     <li>City: <strong><span id="city"></span></strong></li>
@@ -56,7 +39,7 @@
             </div>
             <div class="col-sm-12">
                 <h4>
-                    <strong>Whois Lookup</strong>
+                    <strong>Connection Details</strong>
                     % if data:
                     <span id="isp_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
                     % endif
@@ -74,17 +57,13 @@
                     <li>Address: <strong><span id="isp_address"></span></strong></li>
                 </ul>
             </div>
-            % endif
         </div>
         <div class="modal-footer">
-            % if data == '127.0.0.1' and kwargs.get('location') == 'wan':
-            <div style="float: right;"><span class="text-muted" id="rquote">We've traced the call. It's coming from inside the house!</span></div>
-            % endif
         </div>
     </div>
 </div>
 
-% if data and public:
+% if data:
 <script>
     function getUserLocation(ip_address) {
         $.ajax({
@@ -104,7 +83,6 @@
                     $('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
                 } else {
                     var data = result.data;
-                    $('#continent').html(data.continent);
                     $('#country').html(data.country);
                     $('#region').html(data.region);
                     $('#city').html(data.city);

data/interfaces/default/js/ajaxNotifications.js

@@ -36,3 +36,7 @@ function check_notifications() {
         check_notifications();
     }, 5000);
 }
+
+$(document).ready(function () {
+    check_notifications();
+});

data/interfaces/default/js/blurhash_pure_js_port.min.js

@@ -1 +0,0 @@
-const blurhash=function(t){const e=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","#","$","%","*","+",",","-",".",":",";","=","?","@","[","]","^","_","{","|","}","~"],a=t=>{let a=0;for(let r=0;r<t.length;r++){const o=t[r];a=83*a+e.indexOf(o)}return a},r=(t,a)=>{var r="";for(let o=1;o<=a;o++){let h=Math.floor(t)/Math.pow(83,a-o)%83;r+=e[Math.floor(h)]}return r},o=t=>{let e=t/255;return e<=.04045?e/12.92:Math.pow((e+.055)/1.055,2.4)},h=t=>{let e=Math.max(0,Math.min(1,t));return e<=.0031308?Math.round(12.92*e*255+.5):Math.round(255*(1.055*Math.pow(e,1/2.4)-.055)+.5)},n=(t,e)=>(t=>t<0?-1:1)(t)*Math.pow(Math.abs(t),e),l=t=>{if(!t||t.length<6)throw new Error("The blurhash string must be at least 6 characters");const e=a(t[0]),r=Math.floor(e/9)+1,o=e%9+1;if(t.length!==4+2*o*r)throw new Error(`blurhash length mismatch: length is ${t.length} but it should be ${4+2*o*r}`)},s=t=>{const e=t>>8&255,a=255&t;return[o(t>>16),o(e),o(a)]},m=(t,e)=>{const a=Math.floor(t/361),r=Math.floor(t/19)%19,o=t%19;return[n((a-9)/9,2)*e,n((r-9)/9,2)*e,n((o-9)/9,2)*e]},c=(t,e,a,r)=>{let h=0,n=0,l=0;const s=4*e;for(let m=0;m<e;m++)for(let e=0;e<a;e++){const a=r(m,e);h+=a*o(t[4*m+0+e*s]),n+=a*o(t[4*m+1+e*s]),l+=a*o(t[4*m+2+e*s])}let m=1/(e*a);return[h*m,n*m,l*m]};return t.decodePromise=((e,a,r,o=1)=>new Promise((h,n)=>{h(t.decode(e,a,r,o))})),t.decode=((t,e,r,o=1)=>{l(t),o|=1;const n=a(t[0]),c=Math.floor(n/9)+1,i=n%9+1,M=(a(t[1])+1)/166,g=new Array(i*c);for(let e=0;e<g.length;e++)if(0===e){const r=a(t.substring(2,6));g[e]=s(r)}else{const r=a(t.substring(4+2*e,6+2*e));g[e]=m(r,M*o)}const f=4*e,d=new Uint8ClampedArray(f*r);for(let t=0;t<r;t++)for(let a=0;a<e;a++){let o=0,n=0,l=0;for(let h=0;h<c;h++)for(let s=0;s<i;s++){const m=Math.cos(Math.PI*a*s/e)*Math.cos(Math.PI*t*h/r);let c=g[s+h*i];o+=c[0]*m,n+=c[1]*m,l+=c[2]*m}let s=h(o),m=h(n),M=h(l);d[4*a+0+t*f]=s,d[4*a+1+t*f]=m,d[4*a+2+t*f]=M,d[4*a+3+t*f]=255}return d}),t.encodePromise=((e,a,r,o,h)=>new Promise((n,l)=>{n(t.encode(e,a,r,o,h))})),t.encode=((t,e,a,o,l)=>{if(o<1||o>9||l<1||l>9)throw new Error("BlurHash must have between 1 and 9 components");if(e*a*4!==t.length)throw new Error("Width and height must match the pixels array");let s=[];for(let r=0;r<l;r++)for(let h=0;h<o;h++){const o=0==h&&0==r?1:2,n=c(t,e,a,(t,n)=>o*Math.cos(Math.PI*h*t/e)*Math.cos(Math.PI*r*n/a));s.push(n)}const m=s[0],i=s.slice(1);let M,g="";if(g+=r(o-1+9*(l-1),1),i.length>0){let t=Math.max(...i.map(t=>Math.max(...t))),e=Math.floor(Math.max(0,Math.min(82,Math.floor(166*t-.5))));M=(e+1)/166,g+=r(e,1)}else M=1,g+=r(0,1);return g+=r((t=>{return(h(t[0])<<16)+(h(t[1])<<8)+h(t[2])})(m),4),i.forEach(t=>{g+=r(((t,e)=>{return 19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[0]/e,.5)+9.5))))*19+19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[1]/e,.5)+9.5))))+Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[2]/e,.5)+9.5))))})(t,M),2)}),g}),t.getImageData=(t=>{const e=t.width,a=t.height,r=document.createElement("canvas"),o=r.getContext("2d");return r.width=e,r.height=a,o.width=e,o.height=a,o.drawImage(t,0,0),o.getImageData(0,0,e,a).data}),t.drawImageDataOnNewCanvas=((t,e,a)=>{const r=document.createElement("canvas"),o=r.getContext("2d");return r.width=e,r.height=a,o.width=e,o.height=a,o.putImageData(new ImageData(t,e,a),0,0),r}),t.getImageDataAsImageWithOnloadPromise=((e,a,r)=>new Promise((o,h)=>{t.getImageDataAsImage(e,a,r,(t,e)=>{o(e)})})),t.getImageDataAsImage=((e,a,r,o)=>{const h=t.drawImageDataOnNewCanvas(e,a,r).toDataURL(),n=new Image(a,r);return n.onload=(t=>o(t,n)),n.width=a,n.height=r,n.src=h,n}),t}({});