Merge pull request #106 from mcarlton00/track-ordering

Only set the cast if they exist

.ci/azure-pipelines.yml

@@ -1,22 +0,0 @@
-trigger:
-  batch: true
-  branches:
-    include:
-      - '*'
-  tags:
-    include:
-      - '*'
-
-jobs:
-  - job: Build
-    steps:
-      # On every PR, build the addon and make it available for download as an artifact
-      - template: build.yml
-        parameters:
-          py_versions: [ 'py2', 'py3' ]
-
-      # When triggered by a tag, publish the built addon to the repo server
-      - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags') }}:
-        - template: publish.yml
-          parameters:
-            py_versions: [ 'py2', 'py3' ]

.ci/build.yml

@@ -1,45 +0,0 @@
-parameters:
-  python_versions : []
-
-steps:
-  - ${{ each py_version in parameters.py_versions }}:
-    - task: usePythonVersion@0
-      inputs:
-        versionSpec: '3.6'
-
-    - checkout: self
-      clean: true
-
-    - script: python3 -m pip install --user -r jellycon/requirements-dev.txt
-      displayName: 'Install dev dependencies'
-
-    - task: CopyFiles@2
-      displayName: 'Create clean addon directory'
-      inputs:
-        sourceFolder: 'jellycon'
-        cleanTargetFolder: true
-        contents: |
-          **/*
-          !.ci/*
-          !.git/**/*
-          !.github/*
-        TargetFolder: '$(Build.ArtifactStagingDirectory)/plugin.video.jellycon'
-
-    - script: python3 '$(Build.ArtifactStagingDirectory)/plugin.video.jellycon/build.py' --version ${{ py_version }} --target '$(Build.ArtifactStagingDirectory)/'
-      displayName: 'Create ${{ py_version }} addon.xml'
-
-    - task: ArchiveFiles@2
-      displayName: 'Create ${{ py_version }} zip file'
-      inputs:
-        rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/plugin.video.jellycon'
-        includeRootFolder: True
-        archiveType: 'zip'
-        tarCompression: 'none'
-        archiveFile: '$(Build.ArtifactStagingDirectory)/plugin.video.jellycon-${{ py_version }}.zip'
-
-    - task: PublishPipelineArtifact@1
-      displayName: 'Publish ${{ py_version }} artifact'
-      inputs:
-        targetPath: '$(Build.ArtifactStagingDirectory)/plugin.video.jellycon'
-        artifactName: 'plugin.video.jellycon-${{ py_version }}-$(Build.BuildNumber)'
-

.ci/publish.yml

@@ -1,27 +0,0 @@
-parameters:
-  python_version : []
-
-steps:
-  - ${{ each py_version in parameters.py_versions }}:
-    - task: CopyFilesOverSSH@0
-      displayName: 'Upload to repo server'
-      inputs:
-        sshEndpoint: repository
-        sourceFolder: '$(Build.ArtifactStagingDirectory)'
-        contents: 'plugin.video.jellycon-${{ py_version }}.zip'
-        targetFolder: '/srv/repository/incoming/kodi'
-
-    - task: SSH@0
-      displayName: 'Add to Kodi repo'
-      inputs:
-        sshEndpoint: repository
-        runOptions: 'commands'
-        commands: 'python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellycon-${{ py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ py_version }}'
-        failOnStdErr: false
-
-    - task: SSH@0
-      displayName: 'Clean up zip files'
-      inputs:
-        sshEndpoint: repository
-        runOptions: 'commands'
-        commands: 'rm /srv/repository/incoming/kodi/plugin.video.jellycon-${{ py_version }}.zip'

.config/generate_xml.py

@@ -1,70 +0,0 @@
-import xml.etree.ElementTree as ET
-import sys
-import os
-from datetime import datetime
-
-import yaml
-
-
-def indent(elem, level=0):
-    '''
-    Nicely formats output xml with newlines and spaces
-    https://stackoverflow.com/a/33956544
-    '''
-    i = "\n" + level*"  "
-    if len(elem):
-        if not elem.text or not elem.text.strip():
-            elem.text = i + "  "
-        if not elem.tail or not elem.tail.strip():
-            elem.tail = i
-        for elem in elem:
-            indent(elem, level+1)
-        if not elem.tail or not elem.tail.strip():
-            elem.tail = i
-    else:
-        if level and (not elem.tail or not elem.tail.strip()):
-            elem.tail = i
-
-
-try:
-    py_version = sys.argv[1]
-except IndexError:
-    print('No version specified')
-    sys.exit(1)
-
-dir_path = os.path.dirname(os.path.realpath(__file__))
-
-# Load template file
-with open('{dir_path}/template.xml'.format(**locals()), 'r') as f:
-    tree = ET.parse(f)
-    root = tree.getroot()
-
-# Load version dependencies
-with open('{dir_path}/{py_version}.yaml'.format(**locals()), 'r') as f:
-    deps = yaml.safe_load(f)
-
-# Load version and changelog
-with open('jellyfin-kodi/release.yaml', 'r') as f:
-    data = yaml.safe_load(f)
-
-# Populate xml template
-for dep in deps:
-    ET.SubElement(root.find('requires'), 'import', attrib=dep)
-
-# Update version string
-addon_version = data.get('version')
-root.attrib['version'] = '{addon_version}+{py_version}'.format(**locals())
-
-# Changelog
-date = datetime.today().strftime('%Y-%m-%d')
-changelog = data.get('changelog')
-for section in root.findall('extension'):
-    news = section.findall('news')
-    if news:
-        news[0].text = 'v{addon_version} ({date}):\n{changelog}'.format(**locals())
-
-# Format xml tree
-indent(root)
-
-# Write addon.xml
-tree.write('jellyfin-kodi/addon.xml', encoding='utf-8', xml_declaration=True)

.github/dependabot.yaml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    labels:
+      - ci
+      - github-actions
+  - package-ecosystem: pip
+    directory: /
+    schedule:
+      interval: weekly
+    labels:
+      - pip
+      - dependencies

.github/release-drafter.yml

@@ -0,0 +1,22 @@
+_extends: jellyfin/jellyfin-meta-plugins
+
+name-template: "Release $RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
+version-template: "$MAJOR.$MINOR.$PATCH"
+
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+
+template: |
+  ## :sparkles: What's New
+
+  $CHANGES

.github/releasing.md

@@ -0,0 +1,12 @@
+# Releasing a new Version via GitHub Actions
+
+0. (optional) label the PRs you want to include in this release (if you want to group them in the GH release based on topics). \
+   Supported labels can be found in the Release Drafter [config-file](https://github.com/jellyfin/jellyfin-meta-plugins/blob/master/.github/release-drafter.yml) (currently inherited from `jellyfin/jellyfin-meta-plugins`)
+1. ensure you have merged the PRs you want to include in the release and that the so far drafted GitHub release has captured them
+2. Create a `release-prep` PR by manually triggering the 'Create Prepare-Release PR' Workflow from the Actions tab on GitHub
+3. check the newly created `Prepare for release vx.y.z` PR if updated the `release.yaml` properly (update it manually if need be)
+4. merge the `Prepare for release vx.y.z` and let the Actions triggered by doing that finis (should just be a couple of seconds)
+5. FINALLY, trigger the `Publish JellyCon` manually from the Actions tab on GitHub.
+    1. this will release the up to that point drafted GitHub Release and tag the default branch accordingly
+    2. this will package and deploy `JellyCon` in the new version to the deployment server and trigger the 'kodirepo' script on it
+6. Done, assuming everything ran successfully, you have now successfully published a new version! :tada:

.github/tools/reformat_changelog.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3.8
+
+import argparse
+import sys
+import re
+from typing import Dict, List, Pattern, Union, TypedDict
+
+from emoji.core import emojize, demojize, replace_emoji
+
+
+ITEM_FORMAT = "+ {title} (#{issue}) @{username}"
+OUTPUT_EMOJI = False
+
+ITEM_PATTERN: Pattern = re.compile(
+    r"^\s*(?P<old_listchar>[-*+])\s*(?P<title>.*?)\s*\(#(?P<issue>[0-9]+)\)\s*@(?P<username>[^\s]*)$"
+)
+
+
+class SectionType(TypedDict):
+    title: str
+    items: List[Dict[str, str]]
+
+
+def reformat(item_format: str, output_emoji: bool) -> None:
+    data = [
+        emojize(x.strip(), use_aliases=True, variant="emoji_type")
+        for x in sys.stdin.readlines()
+        if x.strip()
+    ]
+
+    sections = []
+
+    section: Union[SectionType, Dict] = {}
+    for line in data:
+        if line.startswith("## "):
+            pass
+        if line.startswith("### "):
+            if section:
+                sections.append(section)
+            _section: SectionType = {
+                "title": line.strip("# "),
+                "items": [],
+            }
+            section = _section
+
+        m = ITEM_PATTERN.match(line)
+        if m:
+            gd = m.groupdict()
+            section["items"].append(gd)
+
+    sections.append(section)
+
+    first = True
+
+    for section in sections:
+        if not section:
+            continue
+        if first:
+            first = False
+        else:
+            print()
+
+        title = section["title"]
+        if not output_emoji:
+            title = replace_emoji(title).strip()
+
+        print(title)
+        print("-" * len(title))
+
+        for item in section["items"]:
+            formatted_item = item_format.format(**item)
+            if not output_emoji:
+                formatted_item = demojize(formatted_item)
+            print(formatted_item)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--format", type=str, default=ITEM_FORMAT)
+
+    parser.add_argument("--no-emoji", dest="emoji", action="store_false")
+    parser.add_argument("--emoji", dest="emoji", action="store_true")
+    parser.set_defaults(emoji=OUTPUT_EMOJI)
+
+    args = parser.parse_args()
+
+    reformat(args.format, args.emoji)

.github/workflows/build.yaml

@@ -0,0 +1,39 @@
+name: Build JellyCon
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        py_version: [ 'py2', 'py3' ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pyyaml
+
+      - name: Create ${{ matrix.py_version }} addon.xml
+        run: python build.py --version ${{ matrix.py_version }}
+
+      - name: Publish Build Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          retention-days: 14
+          name: ${{ matrix.py_version }}-build-artifact
+          path: |
+            *.zip

.github/workflows/codeql.yaml

@@ -0,0 +1,41 @@
+name: CodeQL Analysis
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '38 8 * * 6'
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'jellyfin/jellycon' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        version: ['2.7', '3.9']
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.version }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/create-prepare-release-pr.yaml

@@ -0,0 +1,72 @@
+name: Create Prepare-Release PR
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create_pr:
+    name: "Create Pump Version PR"
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Update Draft
+        uses: release-drafter/release-drafter@v5.15.0
+        id: draft
+        env:
+          GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
+
+      - name: Setup YQ
+        uses: chrisdickinson/setup-yq@latest
+        with:
+          yq-version: v4.9.1
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Parse Changlog
+        run: |
+          pip install emoji
+          cat << EOF >> cl.md
+          ${{ steps.draft.outputs.body }}
+          EOF
+          TAG="${{ steps.draft.outputs.tag_name }}"
+          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
+          echo "YAML_CHANGELOG<<EOF" >> $GITHUB_ENV
+          cat cl.md | python .github/tools/reformat_changelog.py --no-emoji >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+          echo "CHANGELOG<<EOF" >> $GITHUB_ENV
+          cat cl.md | python .github/tools/reformat_changelog.py --emoji --format='+ #{issue} by @{username}' >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+          rm cl.md
+
+      - name: Update release.yaml
+        run: |
+          yq eval '.version = env(VERSION) | .changelog = strenv(YAML_CHANGELOG) | .changelog style="literal"' -i release.yaml
+
+      - name: Commit Changes
+        run: |
+          git config user.name "jellyfin-bot"
+          git config user.email "team@jellyfin.org"
+
+          git checkout -b prepare-${{ env.VERSION }}
+          git commit -am "bump version to ${{ env.VERSION }}"
+
+          if [[ -z "$(git ls-remote --heads origin prepare-${{ env.VERSION }})" ]]; then
+            git push origin prepare-${{ env.VERSION }}
+          else
+            git push -f origin prepare-${{ env.VERSION }}
+          fi
+
+      - name: Create or Update PR
+        uses: k3rnels-actions/pr-update@v1
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          pr_title: Prepare for release ${{ steps.draft.outputs.tag_name }}
+          pr_source: prepare-${{ env.VERSION }}
+          pr_labels: 'release-prep,skip-changelog'
+          pr_body: |
+            :robot: This is a generated PR to bump the `release.yaml` version and update the changelog.
+
+            ---
+
+            ${{ env.CHANGELOG }}

.github/workflows/publish.yaml

@@ -0,0 +1,64 @@
+name: Publish JellyCon
+
+on:
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        py_version: [ 'py2', 'py3' ]
+    steps:
+      - name: Update Draft
+        uses: release-drafter/release-drafter@v5.15.0
+        if: ${{ matrix.py_version == 'py3' }}
+        with:
+          publish: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pyyaml
+
+      - name: Create ${{ matrix.py_version }} addon.xml
+        run: python build.py --version ${{ matrix.py_version }}
+
+      - name: Publish Build Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          retention-days: 14
+          name: ${{ matrix.py_version }}-build-artifact
+          path: |
+            *.zip
+
+      - name: Upload to repo server
+        uses: burnett01/rsync-deployments@5.1
+        with:
+          switches: -vrptz
+          path: '*.zip'
+          remote_path: /srv/repository/incoming/kodi
+          remote_host: ${{ secrets.DEPLOY_HOST }}
+          remote_user: ${{ secrets.DEPLOY_USER }}
+          remote_key: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Add to Kodi repo and clean up
+        uses: appleboy/ssh-action@v0.1.4
+        with:
+          host: ${{ secrets.DEPLOY_HOST  }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_KEY }}
+          script_stop: true
+          script: |
+            python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ matrix.py_version }};
+            rm /srv/repository/incoming/kodi/plugin.video.jellycon+${{ matrix.py_version }}.zip;

.github/workflows/release-drafter.yaml

@@ -0,0 +1,16 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    name: Update release draft
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update Release Draft
+        uses: release-drafter/release-drafter@v5.15.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/test.yaml

@@ -0,0 +1,49 @@
+name: Test JellyCon
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  PR_TRIGGERED: ${{ github.event_name == 'pull_request' && github.repository == 'jellyfin/jellycon' }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        py_version: ['2.7', '3.9']
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.py_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.py_version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements-dev.txt
+
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --output-file=flake8.output
+          cat flake8.output
+
+      - name: Publish Test Atrifact
+        uses: actions/upload-artifact@v2
+        with:
+          retention-days: 14
+          name: ${{ matrix.py_version }}-test-results
+          path: |
+            flake8.output

build.py

@@ -1,28 +1,28 @@
 #!/usr/bin/env python
 
 import argparse
-from datetime import datetime
 import os
-from pathlib import Path
 import xml.etree.ElementTree as ET
 import zipfile
+from datetime import datetime
+from pathlib import Path
 
 import yaml
 
 
-def indent(elem, level=0):
-    '''
+def indent(elem: ET.Element, level: int = 0) -> None:
+    """
     Nicely formats output xml with newlines and spaces
     https://stackoverflow.com/a/33956544
-    '''
-    i = "\n" + level*"  "
+    """
+    i = "\n" + level * "  "
     if len(elem):
         if not elem.text or not elem.text.strip():
             elem.text = i + "  "
         if not elem.tail or not elem.tail.strip():
             elem.tail = i
         for elem in elem:
-            indent(elem, level+1)
+            indent(elem, level + 1)
         if not elem.tail or not elem.tail.strip():
             elem.tail = i
     else:
@@ -30,10 +30,10 @@ def indent(elem, level=0):
             elem.tail = i
 
 
-def create_addon_xml(config, source, py_version):
-    '''
+def create_addon_xml(config: dict, source: str, py_version: str) -> None:
+    """
     Create addon.xml from template file
-    '''
+    """
     # Load template file
     with open('{}/.config/template.xml'.format(source), 'r') as f:
         tree = ET.parse(f)
@@ -63,21 +63,54 @@ def create_addon_xml(config, source, py_version):
     tree.write('{}/addon.xml'.format(source), encoding='utf-8', xml_declaration=True)
 
 
-def zip_files(py_version, source, target):
-    '''
+def zip_files(py_version: str, source: str, target: str, dev: bool) -> None:
+    """
     Create installable addon zip archive
-    '''
-    archive_name = 'plugin.video.jellyfin+{}.zip'.format(py_version)
+    """
+    archive_name = 'plugin.video.jellycon+{}.zip'.format(py_version)
 
     with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:
         for root, dirs, files in os.walk(args.source):
-            for filename in files:
-                if 'plugin.video.jellyfin' not in filename and 'pyo' not in filename:
-                    file_path = os.path.join(root, filename)
-                    relative_path = os.path.join('plugin.video.jellyfin', os.path.relpath(file_path, source))
+            for filename in filter(file_filter, files):
+                file_path = os.path.join(root, filename)
+                if dev or folder_filter(file_path):
+                    relative_path = os.path.join('plugin.video.jellycon', os.path.relpath(file_path, source))
                     z.write(file_path, relative_path)
 
 
+def file_filter(file_name: str) -> bool:
+    """
+    True if file_name is meant to be included
+    """
+    return (
+        not (file_name.startswith('plugin.video.jellycon') and file_name.endswith('.zip'))
+        and not file_name.endswith('.pyo')
+        and not file_name.endswith('.pyc')
+        and not file_name.endswith('.pyd')
+    )
+
+
+def folder_filter(folder_name: str) -> bool:
+    """
+    True if folder_name is meant to be included
+    """
+    filters = [
+        '.ci',
+        '.git',
+        '.github',
+        '.config',
+        '.mypy_cache',
+        '.pytest_cache',
+        '__pycache__',
+    ]
+    for f in filters:
+        if f in folder_name.split(os.path.sep):
+            return False
+
+    return True
+
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Build flags:')
     parser.add_argument(
@@ -96,13 +129,16 @@ if __name__ == '__main__':
         type=Path,
         default=Path(__file__).absolute().parent)
 
+    parser.add_argument('--dev', dest='dev', action='store_true')
+    parser.set_defaults(dev=False)
+
     args = parser.parse_args()
 
     # Load config file
     config_path = os.path.join(args.source, 'release.yaml')
     with open(config_path, 'r') as fh:
-        config = yaml.safe_load(fh)
+        release_config = yaml.safe_load(fh)
 
-    create_addon_xml(config, args.source, args.version)
+    create_addon_xml(release_config, args.source, args.version)
 
-    zip_files(args.version, args.source, args.target)
+    zip_files(args.version, args.source, args.target, args.dev)

release.yaml

@@ -1,6 +1,29 @@
-version: '0.4.1'
-changelog: |
-  - #57 - Fix browsing by pages
+version: '0.4.5'
+changelog: |-
+  New features and improvements
+  -----------------------------
+  + Attempt to reestablish websocket connection if it fails (#93) @mcarlton00
+  + Combine NextUp and InProgress (#82) @Ozymandyaz
+
+  Bug Fixes
+  ---------
+  + Report tracks correctly when a playlist is playing (#102) @mcarlton00
+  + Fix image caching (#101) @mcarlton00
+  + Properly report stopped playback to the server (#95) @mcarlton00
+  + Make API calls respect limits indicated in UI (#90) @mcarlton00
+  + Fix #87 (#88) @oddstr13
+  + Fix direct play logic for 10.8 (#84) @mcarlton00
+
+  Code or Repo Maintenance
+  ------------------------
+  + Move inprogress call into relevant if block (#91) @mcarlton00
+  + Disable screensaver settings by default (#85) @mcarlton00
+
+  CI & build changes
+  ------------------
+  + Ci dependencies (#100) @mcarlton00
+  + Migrate CI to github actions (#96) @mcarlton00
+  + Correct addon name in build.py (#89) @mcarlton00
 dependencies:
   py2:
     - addon: 'xbmc.python'

requirements-dev.txt

@@ -1 +1,16 @@
 pyyaml
+setuptools >= 44.1.1  # Old setuptools causes script.module.addon.signals to fail installing
+six >= 1.13
+python-dateutil >= 2.8.1
+requests >= 2.22
+futures >= 2.2; python_version < '3.0'
+
+Kodistubs ~= 18.0; python_version < '3.0'
+Kodistubs ~= 19.0; python_version >= '3.6'
+
+git+https://github.com/romanvm/kodi.six
+git+https://github.com/ruuk/script.module.addon.signals
+
+flake8 >= 3.8
+flake8-import-order >= 0.18
+websocket-client >= 0.57.0

resources/language/resource.language.ar/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.cy/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.de/strings.po

@@ -0,0 +1,149 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2021-11-12 19:59+0000\n"
+"Last-Translator: Moritz <moritz.leick@googlemail.com>\n"
+"Language-Team: German <https://translate.jellyfin.org/projects/jellycon/"
+"jellycon/de/>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.5.2\n"
+
+msgctxt "#30120"
+msgid "Show load progress"
+msgstr "Anzeige des Ladefortschritts"
+
+msgctxt "#30114"
+msgid "Jump back seconds"
+msgstr "Sekunden zurückspringen"
+
+msgctxt "#30113"
+msgid "Retrieving Data"
+msgstr "Abrufen von Daten"
+
+msgctxt "#30112"
+msgid "Loading Content"
+msgstr "Laden von Inhalten"
+
+msgctxt "#30111"
+msgid "Services"
+msgstr "Dienste"
+
+msgctxt "#30110"
+msgid "Interface"
+msgstr "Schnittstelle"
+
+msgctxt "#30092"
+msgid "Warning: This action will delete the media files from the server."
+msgstr ""
+"Warnung: Bei dieser Aktion werden die Mediendateien vom Server gelöscht."
+
+msgctxt "#30091"
+msgid "Confirm delete?"
+msgstr "Bestätigen Sie das Löschen?"
+
+msgctxt "#30053"
+msgid "Waiting for server to delete"
+msgstr "Warten auf Server zum Löschen"
+
+msgctxt "#30052"
+msgid "Deleting"
+msgstr "Löschen"
+
+msgctxt "#30045"
+msgid "Username not found"
+msgstr "Benutzername nicht gefunden"
+
+msgctxt "#30044"
+msgid "Incorrect Username/Password"
+msgstr "Falscher Benutzername/Passwort"
+
+msgctxt "#30027"
+msgid "Enable debug logging"
+msgstr "Debug-Protokollierung einschalten"
+
+msgctxt "#30025"
+msgid "Password:"
+msgstr "Passwort:"
+
+msgctxt "#30024"
+msgid "Username:"
+msgstr "Benutzername:"
+
+msgctxt "#30023"
+msgid "Hide unwatched episode details"
+msgstr "Details zu nicht gesehenen Episoden ausblenden"
+
+msgctxt "#30022"
+msgid "Advanced"
+msgstr "Erweiterte"
+
+msgctxt "#30020"
+msgid "Flatten single season"
+msgstr "Einzelne Staffel reduzieren"
+
+msgctxt "#30019"
+msgid "Filtered episode name format"
+msgstr "Gefiltertes Format für Episodennamen"
+
+msgctxt "#30018"
+msgid "Number of items to show in filtered lists"
+msgstr "Anzahl der Elemente, die in gefilterten Listen angezeigt werden sollen"
+
+msgctxt "#30017"
+msgid "Show connected clients"
+msgstr "Verbundene Clients anzeigen"
+
+msgctxt "#30016"
+msgid "Device display name"
+msgstr "Anzeigename des Geräts"
+
+msgctxt "#30015"
+msgid "Log timing data"
+msgstr "Zeitdaten protokollieren"
+
+msgctxt "#30014"
+msgid "Jellyfin"
+msgstr "Jellyfin"
+
+msgctxt "#30012"
+msgid "[Change user]"
+msgstr "[Benutzer wechseln]"
+
+msgctxt "#30011"
+msgid "[Detect local server]"
+msgstr "[Lokalen Server ermitteln]"
+
+msgctxt "#30010"
+msgid "Number of performance profiles to capture"
+msgstr "Anzahl der zu erfassenden Leistungsprofile"
+
+msgctxt "#30008"
+msgid "Samba password"
+msgstr "Samba-Passwort"
+
+msgctxt "#30007"
+msgid "Samba username"
+msgstr "Samba-Benutzername"
+
+msgctxt "#30006"
+msgid "Password"
+msgstr "Passwort"
+
+msgctxt "#30005"
+msgid "Username"
+msgstr "Benutzername"
+
+msgctxt "#30003"
+msgid "Verify HTTPS certificate"
+msgstr "HTTPS-Zertifikat prüfen"
+
+msgctxt "#30001"
+msgid "Port"
+msgstr "Port"
+
+msgctxt "#30000"
+msgid "Host"
+msgstr "Host"

resources/language/resource.language.el/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.es/strings.po

@@ -0,0 +1,988 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2021-12-07 18:05+0000\n"
+"Last-Translator: oxixes <adrianquevedobenito@gmail.com>\n"
+"Language-Team: Spanish <https://translate.jellyfin.org/projects/jellycon/"
+"jellycon/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.5.2\n"
+
+msgctxt "#30442"
+msgid "Simple new content check"
+msgstr "Comprobación simple de nuevo contenido"
+
+msgctxt "#30440"
+msgid "Play next"
+msgstr "Reproducir siguiente"
+
+msgctxt "#30439"
+msgid "Show play next episode at time left"
+msgstr "Mostrar reproducir siguiente episodio al tiempo restante"
+
+#, fuzzy
+msgctxt "#30438"
+msgid "Play cinema intros"
+msgstr "Reproducir introducciones de cine"
+
+msgctxt "#30437"
+msgid "Playback options"
+msgstr "Opciones de reproducción"
+
+msgctxt "#30436"
+msgid "Speed test data size (MB)"
+msgstr "Tamaño de los datos de la prueba de velocidad (MB)"
+
+msgctxt "#30435"
+msgid "Connection speed test"
+msgstr "Prueba de velocidad de conexión"
+
+msgctxt "#30434"
+msgid "Force transcode stream bitrate (Kbits)"
+msgstr "Tasa de bits de la transcodificación forzada (Kbps)"
+
+msgctxt "#30433"
+msgid "Allow direct file playback"
+msgstr "Permitir reproducción directa de archivo"
+
+msgctxt "#30432"
+msgid "Hide watched items in lists"
+msgstr "Esconder elementos vistos en las listas"
+
+msgctxt "#30431"
+msgid "Seasons"
+msgstr "Temporadas"
+
+msgctxt "#30430"
+msgid "Label"
+msgstr "Etiqueta"
+
+msgctxt "#30429"
+msgid "Genre"
+msgstr "Género"
+
+msgctxt "#30428"
+msgid "Rating"
+msgstr "Calificación"
+
+msgctxt "#30427"
+msgid "Added"
+msgstr "Añadido"
+
+msgctxt "#30426"
+msgid "Title"
+msgstr "Título"
+
+msgctxt "#30425"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "#30424"
+msgid "Default"
+msgstr "Por defecto"
+
+msgctxt "#30422"
+msgid "Sorting"
+msgstr "Ordenado"
+
+msgctxt "#30420"
+msgid "Audio max channels"
+msgstr "Máximos canales de audio"
+
+msgctxt "#30419"
+msgid "Audio codec"
+msgstr "Códec de audio"
+
+msgctxt "#30418"
+msgid "Audio bitrate (Kbits)"
+msgstr "Tasa de bits de audio (Kbps)"
+
+msgctxt "#30417"
+msgid "You do not have permision to delete this item"
+msgstr "No tienes permiso para borrar este elemento"
+
+msgctxt "#30416"
+msgid "HTTP timeout seconds"
+msgstr "Segundos del tiempo de espera de HTTP"
+
+msgctxt "#30415"
+msgid " - Favorite Collections"
+msgstr "- Colecciones favoritas"
+
+msgctxt "#30414"
+msgid " - Favorites"
+msgstr "- Favoritos"
+
+msgctxt "#30413"
+msgid " - Tags"
+msgstr "- Etiquetas"
+
+msgctxt "#30412"
+msgid " - Decades"
+msgstr "- Décadas"
+
+msgctxt "#30411"
+msgid " - Years"
+msgstr "- Años"
+
+msgctxt "#30410"
+msgid " - Collections"
+msgstr "- Colecciones"
+
+msgctxt "#30409"
+msgid "Add-on Actions"
+msgstr "Acciones del complemento"
+
+msgctxt "#30407"
+msgid "Global Lists"
+msgstr "Listas globales"
+
+msgctxt "#30406"
+msgid "Jellyfin Libraries"
+msgstr "Bibliotecas de Jellyfin"
+
+msgctxt "#30405"
+msgid " - Show All"
+msgstr "- Mostrar todo"
+
+msgctxt "#30404"
+msgid " - A-Z"
+msgstr "- A-Z"
+
+msgctxt "#30403"
+msgid "Movies - Recommendations"
+msgstr "Películas - Recomendaciones"
+
+msgctxt "#30402"
+msgid "Add to Kodi Playlist"
+msgstr "Añadir a la lista de reproducción de Kodi"
+
+msgctxt "#30401"
+msgid "Info"
+msgstr "Información"
+
+msgctxt "#30399"
+msgid "Hide"
+msgstr "Esconder"
+
+msgctxt "#30398"
+msgid "Refresh Jellyfin Metadata"
+msgstr "Recargar metadatos de Jellyfin"
+
+msgctxt "#30397"
+msgid " - Pages"
+msgstr "- Páginas"
+
+msgctxt "#30395"
+msgid "Clear cached server data"
+msgstr "Borrar datos del servidor en caché"
+
+msgctxt "#30394"
+msgid "Cache files deleted"
+msgstr "Archivos del caché borrados"
+
+msgctxt "#30393"
+msgid "Clear Cache Result"
+msgstr "Borrar caché del resultado"
+
+msgctxt "#30392"
+msgid "HTTPS"
+msgstr "HTTPS"
+
+msgctxt "#30391"
+msgid "HTTP"
+msgstr "HTTP"
+
+msgctxt "#30390"
+msgid "Protocol"
+msgstr "Protocolo"
+
+msgctxt "#30389"
+msgid "User details"
+msgstr "Detalles del usuario"
+
+msgctxt "#30388"
+msgid "Server details"
+msgstr "Detalles del servidor"
+
+msgctxt "#30387"
+msgid "Unused images removed : "
+msgstr "Imágenes no usadas eliminadas:"
+
+msgctxt "#30386"
+msgid "Unused Jellyfin images : "
+msgstr "Imágenes de Jellyfin no usadas:"
+
+msgctxt "#30385"
+msgid "Existing images before delete : "
+msgstr "Imágenes existentes antes de borrar:"
+
+msgctxt "#30383"
+msgid "System - "
+msgstr "Sistema -"
+
+msgctxt "#30382"
+msgid "Always"
+msgstr "Siempre"
+
+msgctxt "#30381"
+msgid "More than one"
+msgstr "Más de una"
+
+msgctxt "#30380"
+msgid "Never"
+msgstr "Nunca"
+
+msgctxt "#30378"
+msgid "Persist user details"
+msgstr "Conservar detalles del usuario"
+
+msgctxt "#30377"
+msgid "Sending request"
+msgstr "Enviando petición"
+
+msgctxt "#30376"
+msgid "Checking server url"
+msgstr "Comprobando la URL del servidor"
+
+msgctxt "#30375"
+msgid "Receiving data packet"
+msgstr "Recibiendo paquete de datos"
+
+msgctxt "#30374"
+msgid "Sending request"
+msgstr "Enviando petición"
+
+msgctxt "#30373"
+msgid "Scanning for local servers"
+msgstr "Escaneando servidores locales"
+
+msgctxt "#30372"
+msgid "Server URL"
+msgstr "URL del servidor"
+
+msgctxt "#30371"
+msgid "Could not connect to the URL you entered, do you want to try again?"
+msgstr ""
+"No se ha podido conectar a la URL introducida, ¿quieres intentarlo otra vez?"
+
+msgctxt "#30370"
+msgid "Do you want to manually enter a server url?"
+msgstr "¿Quieres introducir una URL de servidor manualmente?"
+
+msgctxt "#30369"
+msgid "Do you want to clear your saved password?"
+msgstr "¿Quieres borrar tu contraseña guardada?"
+
+msgctxt "#30368"
+msgid "Clear Password?"
+msgstr "¿Borrar contraseña?"
+
+#, fuzzy
+msgctxt "#30367"
+msgid "Allow fast user switching password saving"
+msgstr "Permitir guardado rápido de la contraseña de usuario cambiada"
+
+msgctxt "#30366"
+msgid "Manually enter user details"
+msgstr "Introduce los detalles del usuario manualmente"
+
+msgctxt "#30365"
+msgid "Manual Login"
+msgstr "Inicio de sesión manual"
+
+msgctxt "#30364"
+msgid "Do you want to save the password?"
+msgstr "¿Quieres guardar la contraseña?"
+
+msgctxt "#30363"
+msgid "Save Password?"
+msgstr "¿Guardar contraseña?"
+
+msgctxt "#30362"
+msgid " - Recordings"
+msgstr "- Grabaciones"
+
+msgctxt "#30361"
+msgid " - Programs"
+msgstr "- Programas"
+
+msgctxt "#30360"
+msgid " - Channels"
+msgstr "- Canales"
+
+msgctxt "#30359"
+msgid "Building full image list"
+msgstr "Construyendo la lista de imágenes completa"
+
+msgctxt "#30358"
+msgid "Retreiving remote image list"
+msgstr "Recuperando la lista de imágenes remota"
+
+msgctxt "#30357"
+msgid "Processing existing image list"
+msgstr "Procesando la lista de imágenes existentes"
+
+msgctxt "#30356"
+msgid "Loading existing image list"
+msgstr "Cargando lista de imágenes existentes"
+
+msgctxt "#30355"
+msgid "Kodi Settings->Services->Allow remote control via HTTP"
+msgstr ""
+"Configuración de Kodi -> Servicios -> Permitir control remoto mediante HTTP"
+
+msgctxt "#30354"
+msgid "Go To Series"
+msgstr "Ir a las series"
+
+msgctxt "#30353"
+msgid " - Frequently Played"
+msgstr "- Reproducido frecuentemente"
+
+msgctxt "#30321"
+msgid " - Album Artists"
+msgstr "- Artistas del álbum"
+
+msgctxt "#30319"
+msgid "Music - All Album Artists"
+msgstr "Música - Todos los artistas del álbum"
+
+msgctxt "#30352"
+msgid "Music - Frequently Played"
+msgstr "Música - Frecuentemente reproducida"
+
+msgctxt "#30351"
+msgid "Music - Recently Played"
+msgstr "Música - Recientemente reproducida"
+
+msgctxt "#30350"
+msgid "Music - Recently Added"
+msgstr "Música - Recientemente añadida"
+
+msgctxt "#30349"
+msgid " - Recently Played"
+msgstr "- Reproducido recientemente"
+
+msgctxt "#30348"
+msgid "Add user ratings"
+msgstr "Añadir valoración de los usuarios"
+
+msgctxt "#30347"
+msgid "Getting Existing Images"
+msgstr "Obteniendo las imágenes existentes"
+
+msgctxt "#30346"
+msgid "Deleteing Cached Images"
+msgstr "Borrando imágenes en caché"
+
+msgctxt "#30344"
+msgid "Number of images removed from cache"
+msgstr "Número de imágenes eliminadas del caché"
+
+msgctxt "#30343"
+msgid "Changes Require Kodi Restart"
+msgstr "Los cambios requieren que Kodi se reinicie"
+
+msgctxt "#30342"
+msgid "New content check interval (0 = disabled)"
+msgstr "Intervalo de comprobación de nuevo contenido (0 = deshabilitado)"
+
+msgctxt "#30341"
+msgid "Background image update interval (0 = disabled)"
+msgstr "Intervalo de actualización de la imagen de fondo (0 = deshabilitado)"
+
+msgctxt "#30340"
+msgid "Group movies into collections"
+msgstr "Agrupar películas en colecciones"
+
+msgctxt "#30339"
+msgid "Person"
+msgstr "Persona"
+
+msgctxt "#30338"
+msgid "Album"
+msgstr "Álbum"
+
+msgctxt "#30337"
+msgid "Song"
+msgstr "Canción"
+
+msgctxt "#30334"
+msgid "Use JellyCon context menu"
+msgstr "Usar el menú contextual de JellyCon"
+
+msgctxt "#30332"
+msgid "Stop media playback on screensaver activation"
+msgstr "Parar la reproducción de medios al activar el salvapantallas"
+
+msgctxt "#30331"
+msgid "Movies per page"
+msgstr "Películas por página"
+
+msgctxt "#30330"
+msgid "Show change user dialog"
+msgstr "Mostrar diálogo de cambio de usuario"
+
+msgctxt "#30329"
+msgid "Screensaver"
+msgstr "Salvapantallas"
+
+msgctxt "#30328"
+msgid "Show empty folders (shows, seasons, collections)"
+msgstr "Mostrar carpetas vacías (series, temporadas, colecciones)"
+
+msgctxt "#30327"
+msgid "Go To Season"
+msgstr "Ir a la temporada"
+
+msgctxt "#30325"
+msgid " - Genres"
+msgstr "- Géneros"
+
+msgctxt "#30322"
+msgid "Auto resume"
+msgstr "Reanudar automáticamente"
+
+msgctxt "#30320"
+msgid " - Albums"
+msgstr "- Álbumes"
+
+msgctxt "#30318"
+msgid "Music - Albums"
+msgstr "Música - Álbumes"
+
+msgctxt "#30317"
+msgid "Play All"
+msgstr "Reproducir todo"
+
+msgctxt "#30316"
+msgid "Connection Error"
+msgstr "Error de conexión"
+
+msgctxt "#30315"
+msgid "Suppress notifications for connection errors"
+msgstr "Suprimir notificaciones por errores de conexión"
+
+msgctxt "#30314"
+msgid "Play"
+msgstr "Reproducir"
+
+msgctxt "#30313"
+msgid "Menu"
+msgstr "Menú"
+
+msgctxt "#30312"
+msgid "All - "
+msgstr "Todo -"
+
+msgctxt "#30311"
+msgid "Library - "
+msgstr "Biblioteca -"
+
+msgctxt "#30310"
+msgid "Enable Jellyfin remote control"
+msgstr "Activar el control remoto de Jellyfin"
+
+msgctxt "#30309"
+msgid "Select Media Source"
+msgstr "Elegir fuente de medios"
+
+msgctxt "#30308"
+msgid "Select Trailer"
+msgstr "Elegir tráiler"
+
+msgctxt "#30307"
+msgid "Play Trailer"
+msgstr "Reproducir tráiler"
+
+msgctxt "#30306"
+msgid "Playback starting"
+msgstr "Empezando la reproducción"
+
+msgctxt "#30305"
+msgid "Not Found"
+msgstr "No encontrado"
+
+msgctxt "#30304"
+msgid "Cached Jellyfin images : "
+msgstr "Imágenes de Jellyfin en caché:"
+
+msgctxt "#30303"
+msgid "Missing Jellyfin images : "
+msgstr "Imágenes de Jellyfin faltantes:"
+
+msgctxt "#30302"
+msgid "Existing images : "
+msgstr "Imágenes existentes:"
+
+msgctxt "#30301"
+msgid "Caching Images"
+msgstr "Guardando imágenes en caché"
+
+msgctxt "#30300"
+msgid "Cache all Jellyfin images as local Kodi images?"
+msgstr ""
+"¿Guardar en caché todas las imágenes de Jellyfin como imágenes de Kodi "
+"locales?"
+
+msgctxt "#30298"
+msgid "Deleting Kodi Images"
+msgstr "Borrando las imágenes de Kodi"
+
+msgctxt "#30297"
+msgid "Delete unused images?"
+msgstr "¿Borrar imágenes no usadas?"
+
+msgctxt "#30296"
+msgid "Delete"
+msgstr "Borrar"
+
+#, fuzzy
+msgctxt "#30295"
+msgid "To use this feature you need HTTP control enabled"
+msgstr "Para usar esta característica necesitas activar el control HTTP"
+
+msgctxt "#30294"
+msgid "Notice"
+msgstr "Aviso"
+
+msgctxt "#30293"
+msgid "Cache images"
+msgstr "Guardar imágenes en caché"
+
+msgctxt "#30292"
+msgid "Select Subtitle Stream"
+msgstr "Seleccionar pista de subtítulos"
+
+msgctxt "#30291"
+msgid "Select Audio Stream"
+msgstr "Seleccionar pista de audio"
+
+msgctxt "#30290"
+msgid "All"
+msgstr "Todo"
+
+msgctxt "#30289"
+msgid "TV Shows - Genres"
+msgstr "Series - Generos"
+
+msgctxt "#30288"
+msgid " - Latest"
+msgstr "- Último"
+
+msgctxt "#30287"
+msgid "TV Shows - Latest"
+msgstr "Series - Último"
+
+msgctxt "#30286"
+msgid "Movies - Unwatched"
+msgstr "Películas - No vistas"
+
+msgctxt "#30285"
+msgid " - Unwatched"
+msgstr "- No visto"
+
+msgctxt "#30283"
+msgid "Play Next Episode?"
+msgstr "¿Reproducir episodio siguiente?"
+
+msgctxt "#30282"
+msgid "No Jellyfin servers detected on your local network."
+msgstr "No se han detectado servidores de Jellyfin en tu red local."
+
+msgctxt "#30281"
+msgid "Refresh Cached Images"
+msgstr "Actualizar imágenes en caché"
+
+msgctxt "#30280"
+msgid "Missing Title"
+msgstr "Título faltante"
+
+msgctxt "#30279"
+msgid "TV Shows - Unwatched"
+msgstr "Series - No vistas"
+
+msgctxt "#30278"
+msgid " - Next Up"
+msgstr "- A continuación"
+
+msgctxt "#30275"
+msgid "Force Transcode"
+msgstr "Forzar transcodificación"
+
+msgctxt "#30274"
+msgid "Delete"
+msgstr "Borrar"
+
+msgctxt "#30273"
+msgid "Unset Favourite"
+msgstr "Quitar favorito"
+
+msgctxt "#30272"
+msgid "Set Favourite"
+msgstr "Establecer como favorito"
+
+msgctxt "#30271"
+msgid "Mark Unwatched"
+msgstr "Marcar como no visto"
+
+msgctxt "#30270"
+msgid "Mark Watched"
+msgstr "Marcar como visto"
+
+msgctxt "#30269"
+msgid "Movies - Random"
+msgstr "Películas - Al azar"
+
+msgctxt "#30268"
+msgid " - Recently Added"
+msgstr "- Añadido recientemente"
+
+msgctxt "#30267"
+msgid " - In Progress"
+msgstr "- En progreso"
+
+msgctxt "#30266"
+msgid "Movies - Pages"
+msgstr "Películas - Páginas"
+
+msgctxt "#30265"
+msgid "Episodes - Next Up"
+msgstr "Episodios - A continuación"
+
+msgctxt "#30264"
+msgid "Episodes - In Progress"
+msgstr "Episodios - En progreso"
+
+msgctxt "#30263"
+msgid "Episodes - Recently Added"
+msgstr "Episodios - Añadidos recientemente"
+
+msgctxt "#30262"
+msgid "TV Shows - Favorites"
+msgstr "Series - Favoritos"
+
+msgctxt "#30261"
+msgid "TV Shows"
+msgstr "Series"
+
+msgctxt "#30259"
+msgid "Movies - Favorites"
+msgstr "Películas - Favoritos"
+
+msgctxt "#30258"
+msgid "Movies - In Progress"
+msgstr "Películas - En progreso"
+
+msgctxt "#30257"
+msgid "Movies - Recently Added"
+msgstr "Películas - Añadidas recientemente"
+
+msgctxt "#30256"
+msgid "Movies"
+msgstr "Películas"
+
+msgctxt "#30255"
+msgid "TV Shows - A-Z"
+msgstr "Series - A-Z"
+
+msgctxt "#30254"
+msgid "Show add-on settings"
+msgstr "Mostrar configuración del complemento"
+
+msgctxt "#30252"
+msgid "Movies - A-Z"
+msgstr "Películas - A-Z"
+
+msgctxt "#30251"
+msgid "Movies - Genres"
+msgstr "Películas - Géneros"
+
+msgctxt "#30250"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "#30246"
+msgid "Search"
+msgstr "Buscar"
+
+msgctxt "#30241"
+msgid "Force transcode mpeg4"
+msgstr "Forzar transcodificación MPEG4"
+
+msgctxt "#30240"
+msgid "Force transcode msmpeg4v3 (divx)"
+msgstr "Forzar transcodificación MSMPEG4v3 (DivX)"
+
+msgctxt "#30239"
+msgid "Force transcode mpeg2"
+msgstr "Forzar transcodificación MPEG2"
+
+msgctxt "#30238"
+msgid "Playback stream options"
+msgstr "Opciones de reproducción"
+
+msgctxt "#30237"
+msgid "Start from beginning"
+msgstr "Empezar desde el principio"
+
+msgctxt "#30236"
+msgid "Force transcode h265 (hevc)"
+msgstr "Forzar transcodificación H.265 (HEVC)"
+
+msgctxt "#30235"
+msgid "Episodes"
+msgstr "Episodios"
+
+msgctxt "#30231"
+msgid "Movies"
+msgstr "Películas"
+
+msgctxt "#30229"
+msgid "TV Shows"
+msgstr "Series"
+
+msgctxt "#30224"
+msgid "Interaction"
+msgstr "Interacción"
+
+msgctxt "#30223"
+msgid "Page Size and Filtering"
+msgstr "Tamaño de página y filtrado"
+
+msgctxt "#30222"
+msgid "Item Layout"
+msgstr "Disposición del elemento"
+
+msgctxt "#30220"
+msgid "Prompt to delete movie after %"
+msgstr "Preguntar para borrar la película después de %"
+
+msgctxt "#30219"
+msgid " - Prompt before play"
+msgstr "- Preguntar antes de reproducir"
+
+msgctxt "#30218"
+msgid "Play next episode after %"
+msgstr "Reproducir siguiente episodio después de %"
+
+msgctxt "#30217"
+msgid "Prompt to delete episode after %"
+msgstr "Preguntar para borrar el episodio después de %"
+
+msgctxt "#30216"
+msgid "Item Details"
+msgstr "Detalles del elemento"
+
+msgctxt "#30214"
+msgid "Events"
+msgstr "Eventos"
+
+msgctxt "#30213"
+msgid "Video force 8 bit"
+msgstr "Forzar 8 bits en el vídeo"
+
+msgctxt "#30212"
+msgid "Video max width"
+msgstr "Ancho máximo del vídeo"
+
+msgctxt "#30211"
+msgid "Transcode options"
+msgstr "Opciones de transcodificación"
+
+#, fuzzy
+msgctxt "#30209"
+msgid "File direct path"
+msgstr "Ruta directa al archivo"
+
+msgctxt "#30208"
+msgid "Max stream bitrate (Kbits)"
+msgstr "Máxima tasa de bits (Kbps)"
+
+msgctxt "#30207"
+msgid "Playback"
+msgstr "Reproducción"
+
+msgctxt "#30206"
+msgid "Playback type"
+msgstr "Tipo de reproducción"
+
+msgctxt "#30201"
+msgid "Unable to connect to server"
+msgstr "No se ha podido conectar al servidor"
+
+msgctxt "#30200"
+msgid "URL error"
+msgstr "Error de URL"
+
+msgctxt "#30183"
+msgid "Include people"
+msgstr "Incluir gente"
+
+msgctxt "#30181"
+msgid "Include plot"
+msgstr "Incluir trama"
+
+msgctxt "#30180"
+msgid "Select User"
+msgstr "Usuario seleccionado"
+
+msgctxt "#30169"
+msgid "Address: "
+msgstr "Dirección:"
+
+msgctxt "#30167"
+msgid "Selected Server Address"
+msgstr "Dirección del servidor seleccionado"
+
+msgctxt "#30166"
+msgid "Select Server"
+msgstr "Seleccionar servidor"
+
+msgctxt "#30135"
+msgid "Error"
+msgstr "Error"
+
+msgctxt "#30126"
+msgid "Processing Item : "
+msgstr "Procesando el elemento:"
+
+msgctxt "#30125"
+msgid "Done"
+msgstr "Hecho"
+
+msgctxt "#30120"
+msgid "Show load progress"
+msgstr "Mostrar el progreso de carga"
+
+msgctxt "#30118"
+msgid "Add resume percent to names"
+msgstr "Añadir el porcentaje de reanudación a los nombres"
+
+msgctxt "#30113"
+msgid "Retrieving Data"
+msgstr "Recuperando los datos"
+
+msgctxt "#30112"
+msgid "Loading Content"
+msgstr "Cargando contenido"
+
+msgctxt "#30111"
+msgid "Services"
+msgstr "Servicios"
+
+msgctxt "#30110"
+msgid "Interface"
+msgstr "Interfaz"
+
+msgctxt "#30092"
+msgid "Warning: This action will delete the media files from the server."
+msgstr "Aviso: Esta acción borrará los archivos de los medios del servidor."
+
+msgctxt "#30091"
+msgid "Confirm delete?"
+msgstr "¿Confirmar borrado?"
+
+msgctxt "#30063"
+msgid "N/A"
+msgstr "N/A"
+
+msgctxt "#30053"
+msgid "Waiting for server to delete"
+msgstr "Esperando al servidor para borrar"
+
+msgctxt "#30052"
+msgid "Deleting"
+msgstr "Borrando"
+
+msgctxt "#30045"
+msgid "Username not found"
+msgstr "Nombre de usuario no encontrado"
+
+msgctxt "#30044"
+msgid "Incorrect Username/Password"
+msgstr "Nombre de usuario/Contraseña incorrectos"
+
+msgctxt "#30027"
+msgid "Enable debug logging"
+msgstr "Activar registro de depuración"
+
+msgctxt "#30025"
+msgid "Password:"
+msgstr "Contraseña:"
+
+msgctxt "#30024"
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+msgctxt "#30023"
+msgid "Hide unwatched episode details"
+msgstr "Esconder los detalles de los episodios no vistos"
+
+msgctxt "#30022"
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgctxt "#30021"
+msgid "Show all episodes item"
+msgstr "Mostrar todos los episodios"
+
+msgctxt "#30019"
+msgid "Filtered episode name format"
+msgstr "Formato de nombre de episodio filtrado"
+
+msgctxt "#30018"
+msgid "Number of items to show in filtered lists"
+msgstr "Número de elementos a mostrar en las listas filtradas"
+
+msgctxt "#30017"
+msgid "Show connected clients"
+msgstr "Mostrar clientes conectados"
+
+msgctxt "#30016"
+msgid "Device display name"
+msgstr "Nombre a mostrar del dispositivo"
+
+msgctxt "#30014"
+msgid "Jellyfin"
+msgstr "Jellyfin"
+
+msgctxt "#30012"
+msgid "[Change user]"
+msgstr "[Cambiar de usuario]"
+
+msgctxt "#30011"
+msgid "[Detect local server]"
+msgstr "[Detectar servidor local]"
+
+msgctxt "#30010"
+msgid "Number of performance profiles to capture"
+msgstr "Número de perfiles de rendimiento a capturar"
+
+msgctxt "#30008"
+msgid "Samba password"
+msgstr "Contraseña de Samba"
+
+msgctxt "#30007"
+msgid "Samba username"
+msgstr "Nombre de usuario de Samba"
+
+msgctxt "#30006"
+msgid "Password"
+msgstr "Contraseña"
+
+msgctxt "#30005"
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgctxt "#30003"
+msgid "Verify HTTPS certificate"
+msgstr "Verificar certificado HTTPS"
+
+msgctxt "#30001"
+msgid "Port"
+msgstr "Puerto"

resources/language/resource.language.fr/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.hi/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.it/strings.po

@@ -0,0 +1,428 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2021-12-02 18:05+0000\n"
+"Last-Translator: Alfonso Scarpino <alfonso.scarpino@gmail.com>\n"
+"Language-Team: Italian <https://translate.jellyfin.org/projects/jellycon/"
+"jellycon/it/>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.5.2\n"
+
+msgctxt "#30120"
+msgid "Show load progress"
+msgstr "Mostra avanzamento del caricamento"
+
+msgctxt "#30118"
+msgid "Add resume percent to names"
+msgstr "Aggiungi percentuale guardata ai nomi"
+
+msgctxt "#30116"
+msgid "Add unwatched counts to names"
+msgstr "Aggiungi il contatore non guardati ai nomi"
+
+msgctxt "#30113"
+msgid "Retrieving Data"
+msgstr "Recupero dati in corso"
+
+msgctxt "#30112"
+msgid "Loading Content"
+msgstr "Caricamento contenuto in corso"
+
+msgctxt "#30111"
+msgid "Services"
+msgstr "Servizi"
+
+msgctxt "#30110"
+msgid "Interface"
+msgstr "Interfaccia"
+
+msgctxt "#30014"
+msgid "Jellyfin"
+msgstr "Jellyfin"
+
+msgctxt "#30092"
+msgid "Warning: This action will delete the media files from the server."
+msgstr "Attenzione: questa operazione eliminerà i file multimediali dal server."
+
+msgctxt "#30091"
+msgid "Confirm delete?"
+msgstr "Confermi l'eliminazione?"
+
+msgctxt "#30063"
+msgid "N/A"
+msgstr "N/D"
+
+msgctxt "#30053"
+msgid "Waiting for server to delete"
+msgstr "In attesa di eliminazione sul server"
+
+msgctxt "#30052"
+msgid "Deleting"
+msgstr "Eliminazione in corso"
+
+msgctxt "#30045"
+msgid "Username not found"
+msgstr "Nome utente sconosciuto"
+
+msgctxt "#30044"
+msgid "Incorrect Username/Password"
+msgstr "Nome utente/Password errati"
+
+msgctxt "#30027"
+msgid "Enable debug logging"
+msgstr "Attiva log a debug"
+
+msgctxt "#30026"
+msgid "Widget item select action"
+msgstr "Azione di selezione elemento widget"
+
+msgctxt "#30025"
+msgid "Password:"
+msgstr "Password:"
+
+msgctxt "#30024"
+msgid "Username:"
+msgstr "Nome utente:"
+
+msgctxt "#30023"
+msgid "Hide unwatched episode details"
+msgstr "Nascondi dettagli episodi non guardati"
+
+msgctxt "#30022"
+msgid "Advanced"
+msgstr "Avanzate"
+
+msgctxt "#30021"
+msgid "Show all episodes item"
+msgstr "Mostra elemento tutti gli episodi"
+
+msgctxt "#30020"
+msgid "Flatten single season"
+msgstr "Appiattisci stagione unica"
+
+msgctxt "#30019"
+msgid "Filtered episode name format"
+msgstr "Formato nome episodio filtrato"
+
+msgctxt "#30018"
+msgid "Number of items to show in filtered lists"
+msgstr "Numero di elementi da mostrare nelle liste filtrate"
+
+msgctxt "#30017"
+msgid "Show connected clients"
+msgstr "Mostra client connessi"
+
+msgctxt "#30016"
+msgid "Device display name"
+msgstr "Nome dispositivo visualizzato"
+
+msgctxt "#30015"
+msgid "Log timing data"
+msgstr "Dati di temporizzazione dei log"
+
+msgctxt "#30012"
+msgid "[Change user]"
+msgstr "[Cambia utente]"
+
+msgctxt "#30011"
+msgid "[Detect local server]"
+msgstr "[Rileva server locale]"
+
+msgctxt "#30010"
+msgid "Number of performance profiles to capture"
+msgstr "Numero di profili di performance da acquisire"
+
+msgctxt "#30008"
+msgid "Samba password"
+msgstr "Password Samba"
+
+msgctxt "#30007"
+msgid "Samba username"
+msgstr "Nome utente Samba"
+
+msgctxt "#30006"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "#30005"
+msgid "Username"
+msgstr "Nome utente"
+
+msgctxt "#30003"
+msgid "Verify HTTPS certificate"
+msgstr "Verifica certificato HTTPS"
+
+msgctxt "#30001"
+msgid "Port"
+msgstr "Porta"
+
+msgctxt "#30000"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30207"
+msgid "Playback"
+msgstr "Riproduzione"
+
+msgctxt "#30206"
+msgid "Playback type"
+msgstr "Tipo riproduzione"
+
+msgctxt "#30201"
+msgid "Unable to connect to server"
+msgstr "Impossibile connettersi al server"
+
+msgctxt "#30200"
+msgid "URL error"
+msgstr "Errore URL"
+
+msgctxt "#30183"
+msgid "Include people"
+msgstr "Includi persone"
+
+msgctxt "#30182"
+msgid "Include media stream info"
+msgstr "Includi info flusso multimediale"
+
+msgctxt "#30181"
+msgid "Include plot"
+msgstr "Includi trama"
+
+msgctxt "#30180"
+msgid "Select User"
+msgstr "Seleziona Utente"
+
+msgctxt "#30169"
+msgid "Address: "
+msgstr "Indirizzo:"
+
+msgctxt "#30167"
+msgid "Selected Server Address"
+msgstr "Indirizzo server selezionato"
+
+msgctxt "#30166"
+msgid "Select Server"
+msgstr "Seleziona Server"
+
+msgctxt "#30163"
+msgid "Add (cc) if subtitle is available"
+msgstr "Aggiungi (cc) se sono disponibili i sottotitoli"
+
+msgctxt "#30139"
+msgid "No Media Type Set"
+msgstr "Nessun formato media impostato"
+
+msgctxt "#30135"
+msgid "Error"
+msgstr "Errore"
+
+msgctxt "#30126"
+msgid "Processing Item : "
+msgstr "Elaborazione Elemento:"
+
+msgctxt "#30125"
+msgid "Done"
+msgstr "Finito"
+
+msgctxt "#30275"
+msgid "Force Transcode"
+msgstr "Forza transcodifica"
+
+msgctxt "#30274"
+msgid "Delete"
+msgstr "Elimina"
+
+msgctxt "#30273"
+msgid "Unset Favourite"
+msgstr "Rimuovi dai preferiti"
+
+msgctxt "#30272"
+msgid "Set Favourite"
+msgstr "Aggiungi ai preferiti"
+
+msgctxt "#30271"
+msgid "Mark Unwatched"
+msgstr "Segna come non guardato"
+
+msgctxt "#30270"
+msgid "Mark Watched"
+msgstr "Segna come guardato"
+
+msgctxt "#30269"
+msgid "Movies - Random"
+msgstr "Film - Casuale"
+
+msgctxt "#30268"
+msgid " - Recently Added"
+msgstr "- Aggiunti di recente"
+
+msgctxt "#30267"
+msgid " - In Progress"
+msgstr "- In corso"
+
+msgctxt "#30266"
+msgid "Movies - Pages"
+msgstr "Film - Pagine"
+
+msgctxt "#30265"
+msgid "Episodes - Next Up"
+msgstr "Episodi - Prossimo"
+
+msgctxt "#30264"
+msgid "Episodes - In Progress"
+msgstr "Episodi - In corso"
+
+msgctxt "#30263"
+msgid "Episodes - Recently Added"
+msgstr "Episodi - Aggiunti di recente"
+
+msgctxt "#30262"
+msgid "TV Shows - Favorites"
+msgstr "Serie TV - Preferiti"
+
+msgctxt "#30261"
+msgid "TV Shows"
+msgstr "Serie TV"
+
+msgctxt "#30260"
+msgid "BoxSets"
+msgstr "Collezioni"
+
+msgctxt "#30259"
+msgid "Movies - Favorites"
+msgstr "Film - Preferiti"
+
+msgctxt "#30258"
+msgid "Movies - In Progress"
+msgstr "Film - In corso"
+
+msgctxt "#30257"
+msgid "Movies - Recently Added"
+msgstr "Film - Aggiunti di recente"
+
+msgctxt "#30256"
+msgid "Movies"
+msgstr "Film"
+
+msgctxt "#30255"
+msgid "TV Shows - A-Z"
+msgstr "Serie TV - A-Z"
+
+msgctxt "#30254"
+msgid "Show add-on settings"
+msgstr "Mostra impostazioni add-on"
+
+msgctxt "#30252"
+msgid "Movies - A-Z"
+msgstr "Film - A-Z"
+
+msgctxt "#30251"
+msgid "Movies - Genres"
+msgstr "Film - Generi"
+
+msgctxt "#30250"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "#30247"
+msgid "Custom Widget Content"
+msgstr "Contenuto personalizzato widget"
+
+msgctxt "#30246"
+msgid "Search"
+msgstr "Cerca"
+
+msgctxt "#30241"
+msgid "Force transcode mpeg4"
+msgstr "Forza transcodifica mpeg4"
+
+msgctxt "#30240"
+msgid "Force transcode msmpeg4v3 (divx)"
+msgstr "Forza transcodifica msmpeg4v3 (divx)"
+
+msgctxt "#30239"
+msgid "Force transcode mpeg2"
+msgstr "Forza transcodifica mpeg2"
+
+msgctxt "#30238"
+msgid "Playback stream options"
+msgstr "Opzioni di riproduzione flusso"
+
+msgctxt "#30237"
+msgid "Start from beginning"
+msgstr "Ricomincia dall'inizio"
+
+msgctxt "#30236"
+msgid "Force transcode h265 (hevc)"
+msgstr "Forza transcodifica h265 (hevc)"
+
+msgctxt "#30235"
+msgid "Episodes"
+msgstr "Episodi"
+
+msgctxt "#30231"
+msgid "Movies"
+msgstr "Film"
+
+msgctxt "#30229"
+msgid "TV Shows"
+msgstr "Serie TV"
+
+msgctxt "#30224"
+msgid "Interaction"
+msgstr "Interazione"
+
+msgctxt "#30223"
+msgid "Page Size and Filtering"
+msgstr "Dimensione pagina e filtri"
+
+msgctxt "#30222"
+msgid "Item Layout"
+msgstr "Disposizione elemento"
+
+msgctxt "#30220"
+msgid "Prompt to delete movie after %"
+msgstr "Chiedi se eliminare il film dopo %"
+
+msgctxt "#30219"
+msgid " - Prompt before play"
+msgstr "- Chiedi prima di riprodurre"
+
+msgctxt "#30218"
+msgid "Play next episode after %"
+msgstr "Riproduci il prossimo episodio dopo %"
+
+msgctxt "#30217"
+msgid "Prompt to delete episode after %"
+msgstr "Chiedi se eliminare l'episodio dopo %"
+
+msgctxt "#30216"
+msgid "Item Details"
+msgstr "Dettagli elemento"
+
+msgctxt "#30214"
+msgid "Events"
+msgstr "Eventi"
+
+msgctxt "#30212"
+msgid "Video max width"
+msgstr "Larghezza massima video"
+
+msgctxt "#30211"
+msgid "Transcode options"
+msgstr "Opzioni di transcodifica"
+
+msgctxt "#30210"
+msgid "HTTP direct stream"
+msgstr "Flusso diretto HTTP"
+
+msgctxt "#30209"
+msgid "File direct path"
+msgstr "Percorso diretto del file"
+
+msgctxt "#30208"
+msgid "Max stream bitrate (Kbits)"
+msgstr "Bitrate massimo del flusso (Kbits)"

resources/language/resource.language.nl/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.pl/strings.po

@@ -0,0 +1,661 @@
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2021-11-23 03:05+0000\n"
+"Last-Translator: Marcin Woliński <cierdek@gmail.com>\n"
+"Language-Team: Polish <https://translate.jellyfin.org/projects/jellycon/"
+"jellycon/pl/>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.5.2\n"
+
+msgctxt "#30313"
+msgid "Menu"
+msgstr "Menu"
+
+msgctxt "#30312"
+msgid "All - "
+msgstr "Wszystko -"
+
+msgctxt "#30311"
+msgid "Library - "
+msgstr "Biblioteka -"
+
+msgctxt "#30310"
+msgid "Enable Jellyfin remote control"
+msgstr "Włącz zdalne sterowanie Jellyfin"
+
+msgctxt "#30309"
+msgid "Select Media Source"
+msgstr "Wybierz źródło multimediów"
+
+msgctxt "#30308"
+msgid "Select Trailer"
+msgstr "Wybierz zwiastun"
+
+msgctxt "#30307"
+msgid "Play Trailer"
+msgstr "Odtwórz zwiastun"
+
+msgctxt "#30306"
+msgid "Playback starting"
+msgstr "Rozpoczęcie odtwarzania"
+
+msgctxt "#30305"
+msgid "Not Found"
+msgstr "Nie znaleziono"
+
+msgctxt "#30304"
+msgid "Cached Jellyfin images : "
+msgstr "Buforowane obrazy Jellyfin:"
+
+msgctxt "#30303"
+msgid "Missing Jellyfin images : "
+msgstr "Brakujące obrazy Jellyfin:"
+
+msgctxt "#30302"
+msgid "Existing images : "
+msgstr "Istniejące obrazy:"
+
+msgctxt "#30301"
+msgid "Caching Images"
+msgstr "Buforowanie obrazów"
+
+msgctxt "#30300"
+msgid "Cache all Jellyfin images as local Kodi images?"
+msgstr "Buforować wszystkie obrazy Jellyfin jako lokalne obrazy Kodi?"
+
+msgctxt "#30299"
+msgid "Cache Images"
+msgstr "Obrazy w pamięci podręcznej"
+
+msgctxt "#30298"
+msgid "Deleting Kodi Images"
+msgstr "Usuwanie obrazów Kodi"
+
+msgctxt "#30297"
+msgid "Delete unused images?"
+msgstr "Usunąć nieużywane obrazy?"
+
+msgctxt "#30296"
+msgid "Delete"
+msgstr "Usuń"
+
+msgctxt "#30295"
+msgid "To use this feature you need HTTP control enabled"
+msgstr "Aby korzystać z tej funkcji, musisz mieć włączoną kontrolę HTTP"
+
+msgctxt "#30294"
+msgid "Notice"
+msgstr "Uwagi"
+
+msgctxt "#30293"
+msgid "Cache images"
+msgstr "Pamięć podręczna obrazów"
+
+msgctxt "#30292"
+msgid "Select Subtitle Stream"
+msgstr "Wybierz ścieżkę napisów"
+
+msgctxt "#30291"
+msgid "Select Audio Stream"
+msgstr "Wybierz ścieżkę audio"
+
+msgctxt "#30290"
+msgid "All"
+msgstr "Wszystko"
+
+msgctxt "#30289"
+msgid "TV Shows - Genres"
+msgstr "Seriale - Gatunki"
+
+msgctxt "#30288"
+msgid " - Latest"
+msgstr "- Ostatnie"
+
+msgctxt "#30287"
+msgid "TV Shows - Latest"
+msgstr "Seriale — ostatnie"
+
+msgctxt "#30286"
+msgid "Movies - Unwatched"
+msgstr "Filmy – nieobejrzane"
+
+msgctxt "#30285"
+msgid " - Unwatched"
+msgstr "- Nieobejrzane"
+
+msgctxt "#30283"
+msgid "Play Next Episode?"
+msgstr "Odtworzyć kolejny odcinek?"
+
+msgctxt "#30282"
+msgid "No Jellyfin servers detected on your local network."
+msgstr "W twojej sieci lokalnej nie wykryto serwerów Jellyfin."
+
+msgctxt "#30281"
+msgid "Refresh Cached Images"
+msgstr "Odśwież obrazy z pamięci podręcznej"
+
+msgctxt "#30280"
+msgid "Missing Title"
+msgstr "Brak tytułu"
+
+msgctxt "#30279"
+msgid "TV Shows - Unwatched"
+msgstr "Seriale - Nieoglądane"
+
+msgctxt "#30278"
+msgid " - Next Up"
+msgstr "- Następna w górę"
+
+msgctxt "#30277"
+msgid "JellyCon needs to prompt for resume on partily played items, Kodi can also prompt, this can cause a double prompt. Do you want to remove the double prompt?"
+msgstr ""
+"JellyCon musi monitować o wznowienie w przypadku częściowo odtwarzanych "
+"elementów, Kodi może również monitować, co może spowodować podwójny monit. "
+"Czy chcesz usunąć podwójny monit?"
+
+msgctxt "#30276"
+msgid "Extra Resume Prompt Detected"
+msgstr "Wykryto dodatkowy monit o wznowienie"
+
+msgctxt "#30275"
+msgid "Force Transcode"
+msgstr "Wymuś transkodowanie"
+
+msgctxt "#30274"
+msgid "Delete"
+msgstr "Usuń"
+
+msgctxt "#30273"
+msgid "Unset Favourite"
+msgstr "Usuń z ulubionych"
+
+msgctxt "#30272"
+msgid "Set Favourite"
+msgstr "Ustaw ulubione"
+
+msgctxt "#30271"
+msgid "Mark Unwatched"
+msgstr "Oznacz nieoglądane"
+
+msgctxt "#30270"
+msgid "Mark Watched"
+msgstr "Zaznacz obserwowane"
+
+msgctxt "#30269"
+msgid "Movies - Random"
+msgstr "Filmy — losowe"
+
+msgctxt "#30268"
+msgid " - Recently Added"
+msgstr "- Niedawno dodany"
+
+msgctxt "#30267"
+msgid " - In Progress"
+msgstr "- W trakcie"
+
+msgctxt "#30266"
+msgid "Movies - Pages"
+msgstr "Filmy – Strony"
+
+msgctxt "#30265"
+msgid "Episodes - Next Up"
+msgstr "Odcinki — Następny"
+
+msgctxt "#30264"
+msgid "Episodes - In Progress"
+msgstr "Odcinki — w toku"
+
+msgctxt "#30263"
+msgid "Episodes - Recently Added"
+msgstr "Odcinki — ostatnio dodane"
+
+msgctxt "#30262"
+msgid "TV Shows - Favorites"
+msgstr "Seriale – Ulubione"
+
+msgctxt "#30261"
+msgid "TV Shows"
+msgstr "Seriale"
+
+msgctxt "#30260"
+msgid "BoxSets"
+msgstr "Zestawy pudełek"
+
+msgctxt "#30259"
+msgid "Movies - Favorites"
+msgstr "Filmy - Ulubione"
+
+msgctxt "#30258"
+msgid "Movies - In Progress"
+msgstr "Filmy – w toku"
+
+msgctxt "#30257"
+msgid "Movies - Recently Added"
+msgstr "Filmy — ostatnio dodane"
+
+msgctxt "#30256"
+msgid "Movies"
+msgstr "Filmy"
+
+msgctxt "#30255"
+msgid "TV Shows - A-Z"
+msgstr "Seriale - A-Z"
+
+msgctxt "#30254"
+msgid "Show add-on settings"
+msgstr "Pokaż ustawienia dodatków"
+
+msgctxt "#30252"
+msgid "Movies - A-Z"
+msgstr "Filmy - A-Z"
+
+msgctxt "#30251"
+msgid "Movies - Genres"
+msgstr "Filmy – Gatunki"
+
+msgctxt "#30250"
+msgid "Unknown"
+msgstr "Nieznane"
+
+msgctxt "#30247"
+msgid "Custom Widget Content"
+msgstr "Niestandardowa treść widżetu"
+
+msgctxt "#30246"
+msgid "Search"
+msgstr "Szukaj"
+
+msgctxt "#30241"
+msgid "Force transcode mpeg4"
+msgstr "Wymuś transkodowanie mpeg4"
+
+msgctxt "#30240"
+msgid "Force transcode msmpeg4v3 (divx)"
+msgstr "Wymuś transkodowanie msmpeg4v3 (divx)"
+
+msgctxt "#30239"
+msgid "Force transcode mpeg2"
+msgstr "Wymuś transkodowanie mpeg2"
+
+msgctxt "#30238"
+msgid "Playback stream options"
+msgstr "Opcje strumienia odtwarzania"
+
+msgctxt "#30237"
+msgid "Start from beginning"
+msgstr "Zacznij od początku"
+
+msgctxt "#30236"
+msgid "Force transcode h265 (hevc)"
+msgstr "Wymuś transkodowanie h265 (hevc)"
+
+msgctxt "#30235"
+msgid "Episodes"
+msgstr "Odcinki"
+
+msgctxt "#30231"
+msgid "Movies"
+msgstr "Filmy"
+
+msgctxt "#30229"
+msgid "TV Shows"
+msgstr "Seriale"
+
+msgctxt "#30213"
+msgid "Video force 8 bit"
+msgstr "Wymuś video 8 bit"
+
+msgctxt "#30224"
+msgid "Interaction"
+msgstr "Interakcja"
+
+msgctxt "#30223"
+msgid "Page Size and Filtering"
+msgstr "Rozmiar strony i filtrowanie"
+
+msgctxt "#30222"
+msgid "Item Layout"
+msgstr "Układ przedmiotu"
+
+msgctxt "#30220"
+msgid "Prompt to delete movie after %"
+msgstr "Pytaj o usunięcie filmu po %"
+
+msgctxt "#30219"
+msgid " - Prompt before play"
+msgstr "- Pytaj przed odtworzeniem"
+
+msgctxt "#30218"
+msgid "Play next episode after %"
+msgstr "Odtwórz następny odcinek po %"
+
+msgctxt "#30217"
+msgid "Prompt to delete episode after %"
+msgstr "Monituj o usunięcie odcinka po %"
+
+msgctxt "#30216"
+msgid "Item Details"
+msgstr "Szczegóły produktu"
+
+msgctxt "#30215"
+msgid "On playback stop (100% = disabled)"
+msgstr "Po odtworzeniu zatrzymaj (100% = wyłączone)"
+
+msgctxt "#30214"
+msgid "Events"
+msgstr "Zdarzenia"
+
+msgctxt "#30212"
+msgid "Video max width"
+msgstr "Maksymalna szerokość wideo"
+
+msgctxt "#30211"
+msgid "Transcode options"
+msgstr "Opcje transkodowania"
+
+msgctxt "#30210"
+msgid "HTTP direct stream"
+msgstr "Bezpośredni strumień HTTP"
+
+msgctxt "#30209"
+msgid "File direct path"
+msgstr "Bezpośrednia ścieżka pliku"
+
+msgctxt "#30208"
+msgid "Max stream bitrate (Kbits)"
+msgstr "Maksymalna transmisja strumienia (Kb/s)"
+
+msgctxt "#30207"
+msgid "Playback"
+msgstr "Odtwarzanie"
+
+msgctxt "#30000"
+msgid "Host"
+msgstr "Host"
+
+msgctxt "#30206"
+msgid "Playback type"
+msgstr "Typ odtwarzania"
+
+msgctxt "#30201"
+msgid "Unable to connect to server"
+msgstr "Niemożna połączyć z serwerem"
+
+msgctxt "#30200"
+msgid "URL error"
+msgstr "Błąd adresu URL"
+
+msgctxt "#30183"
+msgid "Include people"
+msgstr "Uwzględnij osoby"
+
+msgctxt "#30182"
+msgid "Include media stream info"
+msgstr "Dołącz informacje o strumieniu multimediów"
+
+msgctxt "#30181"
+msgid "Include plot"
+msgstr "Uwzględnij fabułę"
+
+msgctxt "#30180"
+msgid "Select User"
+msgstr "Wybierz użytkownika"
+
+msgctxt "#30169"
+msgid "Address: "
+msgstr "Adres:"
+
+msgctxt "#30167"
+msgid "Selected Server Address"
+msgstr "Wybierz adres serwera"
+
+msgctxt "#30166"
+msgid "Select Server"
+msgstr "Wybierz serwer"
+
+msgctxt "#30163"
+msgid "Add (cc) if subtitle is available"
+msgstr "Dodaj (cc), jeśli napisy są dostępne"
+
+msgctxt "#30139"
+msgid "No Media Type Set"
+msgstr "Brak zestawu typu nośnika"
+
+msgctxt "#30321"
+msgid " - Album Artists"
+msgstr "- Artyści albumów"
+
+msgctxt "#30319"
+msgid "Music - All Album Artists"
+msgstr "Muzyka — wszyscy wykonawcy albumów"
+
+msgctxt "#30332"
+msgid "Stop media playback on screensaver activation"
+msgstr "Zatrzymaj odtwarzanie multimediów po aktywacji wygaszacza ekranu"
+
+msgctxt "#30331"
+msgid "Movies per page"
+msgstr "Filmów na stronę"
+
+msgctxt "#30330"
+msgid "Show change user dialog"
+msgstr "Pokaż okno dialogowe zmiany użytkownika"
+
+msgctxt "#30329"
+msgid "Screensaver"
+msgstr "Wygaszacz ekranu"
+
+msgctxt "#30328"
+msgid "Show empty folders (shows, seasons, collections)"
+msgstr "Pokaż puste foldery (seriale, sezony, kolekcje)"
+
+msgctxt "#30327"
+msgid "Go To Season"
+msgstr "Przejdź do sezonu"
+
+msgctxt "#30325"
+msgid " - Genres"
+msgstr "- Gatunki"
+
+msgctxt "#30322"
+msgid "Auto resume"
+msgstr "Automatyczne wznawianie"
+
+msgctxt "#30320"
+msgid " - Albums"
+msgstr "- Albumy"
+
+msgctxt "#30318"
+msgid "Music - Albums"
+msgstr "Muzyka - Albumy"
+
+msgctxt "#30317"
+msgid "Play All"
+msgstr "Włącz wszystko"
+
+msgctxt "#30316"
+msgid "Connection Error"
+msgstr "Błąd połączenia"
+
+msgctxt "#30315"
+msgid "Suppress notifications for connection errors"
+msgstr "Pomiń powiadomienia o błędach połączenia"
+
+msgctxt "#30314"
+msgid "Play"
+msgstr "Włącz"
+
+msgctxt "#30135"
+msgid "Error"
+msgstr "Błąd"
+
+msgctxt "#30126"
+msgid "Processing Item : "
+msgstr "Przetwarzanie przedmiotu:"
+
+msgctxt "#30125"
+msgid "Done"
+msgstr "Gotowe"
+
+msgctxt "#30121"
+msgid "On resume"
+msgstr "Po wznowieniu"
+
+msgctxt "#30120"
+msgid "Show load progress"
+msgstr "Pokaż postęp ładowania"
+
+msgctxt "#30118"
+msgid "Add resume percent to names"
+msgstr "Dodaj wznowiony procent do nazwisk"
+
+msgctxt "#30116"
+msgid "Add unwatched counts to names"
+msgstr "Dodaj nieobejrzane liczby do nazwisk"
+
+msgctxt "#30114"
+msgid "Jump back seconds"
+msgstr "Cofnij się o kilka sekund"
+
+msgctxt "#30113"
+msgid "Retrieving Data"
+msgstr "Pobieranie danych"
+
+msgctxt "#30112"
+msgid "Loading Content"
+msgstr "Ładowanie treści"
+
+msgctxt "#30111"
+msgid "Services"
+msgstr "Usługi"
+
+msgctxt "#30110"
+msgid "Interface"
+msgstr "Interfejs"
+
+msgctxt "#30092"
+msgid "Warning: This action will delete the media files from the server."
+msgstr ""
+"Ostrzeżenie: Ta akcja spowoduje usunięcie plików multimedialnych z serwera."
+
+msgctxt "#30091"
+msgid "Confirm delete?"
+msgstr "Potwierdź usunięcie?"
+
+msgctxt "#30063"
+msgid "N/A"
+msgstr "N/A"
+
+msgctxt "#30053"
+msgid "Waiting for server to delete"
+msgstr "Czekam na usunięcie serwera"
+
+msgctxt "#30052"
+msgid "Deleting"
+msgstr "Kasowanie"
+
+msgctxt "#30045"
+msgid "Username not found"
+msgstr "Nazwa użytkownika nie znaleziona"
+
+msgctxt "#30044"
+msgid "Incorrect Username/Password"
+msgstr "Nieprawidłowa nazwa użytkownika / hasło"
+
+msgctxt "#30027"
+msgid "Enable debug logging"
+msgstr "Włącz rejestrowanie debugowania"
+
+msgctxt "#30026"
+msgid "Widget item select action"
+msgstr "Akcja wyboru elementu widżetu"
+
+msgctxt "#30025"
+msgid "Password:"
+msgstr "Hasło:"
+
+msgctxt "#30024"
+msgid "Username:"
+msgstr "Nazwa użytkownika:"
+
+msgctxt "#30023"
+msgid "Hide unwatched episode details"
+msgstr "Ukryj szczegóły nieobejrzanych odcinków"
+
+msgctxt "#30022"
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+msgctxt "#30021"
+msgid "Show all episodes item"
+msgstr "Pokaż wszystkie odcinki"
+
+msgctxt "#30020"
+msgid "Flatten single season"
+msgstr "Spłaszcz jeden sezon"
+
+msgctxt "#30019"
+msgid "Filtered episode name format"
+msgstr "Filtrowany format nazwy odcinka"
+
+msgctxt "#30018"
+msgid "Number of items to show in filtered lists"
+msgstr "Liczba pozycji do pokazania na przefiltrowanych listach"
+
+msgctxt "#30017"
+msgid "Show connected clients"
+msgstr "Pokaż połączonych klientów"
+
+msgctxt "#30016"
+msgid "Device display name"
+msgstr "Wyświetlana nazwa urządzenia"
+
+msgctxt "#30015"
+msgid "Log timing data"
+msgstr "Rejestruj dane czasowe"
+
+msgctxt "#30014"
+msgid "Jellyfin"
+msgstr "Jellyfin"
+
+msgctxt "#30012"
+msgid "[Change user]"
+msgstr "[Zmień użytkownika]"
+
+msgctxt "#30011"
+msgid "[Detect local server]"
+msgstr "[Wykryj serwer lokalny]"
+
+msgctxt "#30010"
+msgid "Number of performance profiles to capture"
+msgstr "Liczba profili wydajności do uchwycenia"
+
+msgctxt "#30008"
+msgid "Samba password"
+msgstr "Hasło użytkownika Samby"
+
+msgctxt "#30007"
+msgid "Samba username"
+msgstr "Nazwa użytkownika Samby"
+
+msgctxt "#30006"
+msgid "Password"
+msgstr "Hasło"
+
+msgctxt "#30005"
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+msgctxt "#30003"
+msgid "Verify HTTPS certificate"
+msgstr "Zweryfikuj certyfikat HTTPS"
+
+msgctxt "#30001"
+msgid "Port"
+msgstr "Port"

resources/language/resource.language.tr/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.uk/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/language/resource.language.zh_Hant/strings.po

@@ -0,0 +1,2 @@
+msgid ""
+msgstr "X-Generator: Weblate\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit"

resources/lib/cache_images.py

@@ -19,7 +19,7 @@ from .loghandler import LazyLogger
 from .jsonrpc import JsonRpc, get_value
 from .translation import string_load
 from .datamanager import DataManager
-from .utils import get_art, double_urlencode
+from .utils import get_art
 from .kodi_utils import HomeWindow
 
 downloadUtils = DownloadUtils()
@@ -326,8 +326,7 @@ class CacheArtwork(threading.Thread):
 
         count_done = 0
         for index, get_url in enumerate(missing_texture_urls, 1):
-            url = double_urlencode(get_url)
-            kodi_texture_url = ("/image/image://%s" % url)
+            kodi_texture_url = "/image/image://{0}".format(get_url)
             log.debug("kodi_texture_url: {0}".format(kodi_texture_url))
 
             percentage = int((float(index) / float(total)) * 100)

resources/lib/downloadutils.py

@@ -14,6 +14,7 @@ from base64 import b64encode
 from collections import defaultdict
 from traceback import format_exc
 from kodi_six.utils import py2_decode
+from six import ensure_text
 
 from .kodi_utils import HomeWindow
 from .clientinfo import ClientInformation
@@ -493,7 +494,7 @@ class DownloadUtils:
 
         secure = False
         for user in result:
-            if user.get("Name") == unicode(user_name, "utf-8"):
+            if user.get("Name") == ensure_text(user_name, "utf-8"):
                 userid = user.get("Id")
                 user_image = self.get_user_artwork(user, 'Primary')
                 log.debug("Username Found: {0}".format(user.get("Name")))

resources/lib/functions.py

@@ -1,7 +1,7 @@
 # Gnu General Public License - see LICENSE.TXT
 from __future__ import division, absolute_import, print_function, unicode_literals
 
-from six.moves.urllib.parse import quote, unquote
+from six.moves.urllib.parse import quote, unquote, parse_qsl
 import sys
 import os
 import time
@@ -69,7 +69,7 @@ def main_entry_point():
     log.debug("Script argument data: {0}".format(sys.argv))
 
     params = get_params()
-    log.debug("Script params: {0}".format(params))
+    log.info("Script params: {0}".format(params))
 
     request_path = params.get("request_path", None)
     param_url = params.get('url', None)
@@ -321,6 +321,9 @@ def delete(item_id):
 
 
 def get_params():
+    '''
+    Retrieve the request data from Kodi
+    '''
 
     plugin_path = sys.argv[0]
     paramstring = sys.argv[2]
@@ -328,27 +331,12 @@ def get_params():
     log.debug("Parameter string: {0}".format(paramstring))
     log.debug("Plugin Path string: {0}".format(plugin_path))
 
-    param = {}
+    param = dict(parse_qsl(paramstring[1:]))
 
     # add plugin path
     request_path = plugin_path.replace("plugin://plugin.video.jellycon", "")
     param["request_path"] = request_path
 
-    if len(paramstring) >= 2:
-        if paramstring[0] == "?":
-            paramstring = paramstring[1:]
-
-        if paramstring[len(paramstring) - 1] == '/':
-            paramstring = paramstring[0:len(paramstring) - 2]
-
-        pairsofparams = paramstring.split('&')
-        for i in range(len(pairsofparams)):
-            splitparams = pairsofparams[i].split('=')
-            if (len(splitparams)) == 2:
-                param[splitparams[0]] = splitparams[1]
-            elif (len(splitparams)) == 3:
-                param[splitparams[0]] = splitparams[1] + "=" + splitparams[2]
-
     log.debug("JellyCon -> Detected parameters: {0}".format(param))
     return param
 

resources/lib/item_functions.py

@@ -16,6 +16,7 @@ from .utils import get_art, datetime_from_string
 from .loghandler import LazyLogger
 from .downloadutils import DownloadUtils
 from .kodi_utils import HomeWindow
+from six import ensure_text
 
 log = LazyLogger(__name__)
 kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2])
@@ -178,7 +179,7 @@ def extract_item_info(item, gui_options):
         name_info["SeasonIndex"] = u"%02d" % item_details.season_number
         name_info["EpisodeIndex"] = u"%02d" % item_details.episode_number
         log.debug("FormatName: {0} | {1}".format(name_format, name_info))
-        item_details.name = unicode(name_format).format(**name_info).strip()
+        item_details.name = ensure_text(name_format).format(**name_info).strip()
 
     year = item.get("ProductionYear")
     prem_date = item.get("PremiereDate")
@@ -470,7 +471,7 @@ def add_gui_item(url, item_details, display_options, folder=True, default_sort=F
     info_labels = {}
 
     # add cast
-    if item_details.cast is not None:
+    if item_details.cast:
         if kodi_version >= 17:
             list_item.setCast(item_details.cast)
         else:

resources/lib/play_utils.py

@@ -37,6 +37,8 @@ def play_all_files(items, play_items=True):
     playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
     playlist.clear()
 
+    playlist_data = {}
+
     for item in items:
 
         item_id = item.get("Id")
@@ -84,13 +86,17 @@ def play_all_files(items, play_items=True):
         list_item = xbmcgui.ListItem(label=item_title)
 
         # add playurl and data to the monitor
-        data = {}
-        data["item_id"] = item_id
-        data["source_id"] = source_id
-        data["playback_type"] = playback_type_string
-        data["play_session_id"] = play_session_id
-        data["play_action_type"] = "play_all"
-        home_window.set_property('now_playing', json.dumps(data))
+        playlist_data[playurl] = {}
+        playlist_data[playurl]["item_id"] = item_id
+        playlist_data[playurl]["source_id"] = source_id
+        playlist_data[playurl]["playback_type"] = playback_type_string
+        playlist_data[playurl]["play_session_id"] = play_session_id
+        playlist_data[playurl]["play_action_type"] = "play_all"
+        home_window.set_property('playlist', json.dumps(playlist_data))
+
+        # Set now_playing to the first track
+        if len(playlist_data) == 1:
+            home_window.set_property('now_playing', json.dumps(playlist_data[playurl]))
 
         list_item.setPath(playurl)
         list_item = set_list_item_props(item_id, list_item, item, server, listitem_props, item_title)
@@ -427,6 +433,12 @@ def play_file(play_info):
     data["play_action_type"] = "play"
     data["item_type"] = result.get("Type", None)
     data["can_delete"] = result.get("CanDelete", False)
+
+    # Check for next episodes
+    if result.get('Type') == 'Episode':
+        next_episode = get_next_episode(result)
+        data["next_episode"] = next_episode
+
     home_window.set_property('now_playing', json.dumps(data))
 
     list_item.setPath(playurl)
@@ -494,10 +506,6 @@ def play_file(play_info):
             else:
                 log.info("PlaybackResumrAction : Playback resumed")
 
-    next_episode = get_next_episode(result)
-    data["next_episode"] = next_episode
-    send_next_episode_details(result, next_episode)
-
 
 def __build_label2_from(source):
     videos = [item for item in source.get('MediaStreams', {}) if item.get('Type') == "Video"]
@@ -525,18 +533,18 @@ def __build_label2_from(source):
 
 
 def get_next_episode(item):
-    if item.get("Type", "na") != "Episode":
+    if item.get("Type") != "Episode":
         log.debug("Not an episode, can not get next")
         return None
 
-    parent_id = item.get("ParentId", "na")
-    item_index = item.get("IndexNumber", -1)
+    parent_id = item.get("ParentId")
+    item_index = item.get("IndexNumber")
 
-    if parent_id == "na":
+    if parent_id is None:
         log.debug("No parent id, can not get next")
         return None
 
-    if item_index == -1:
+    if item_index is None:
         log.debug("No episode number, can not get next")
         return None
 
@@ -557,12 +565,11 @@ def get_next_episode(item):
         log.debug("get_next_episode no results")
         return None
 
-    item_list = items_result.get("Items", [])
+    item_list = items_result.get("Items") or []
 
     for item in item_list:
-        index = item.get("IndexNumber", -1)
         # find the very next episode in the season
-        if index == item_index + 1:
+        if item.get("IndexNumber") == item_index + 1:
             log.debug("get_next_episode, found next episode: {0}".format(item))
             return item
 
@@ -630,7 +637,7 @@ def send_next_episode_details(item, next_episode):
             "force_transcode": False
         }
     }
-    send_event_notification("upnext_data", next_info)
+    send_event_notification("upnext_data", next_info, True)
 
 
 def set_list_item_props(item_id, list_item, result, server, extra_props, title):
@@ -835,10 +842,10 @@ def external_subs(media_source, list_item, item_id):
 
             url_root = '{}/Videos/{}/{}/Subtitles/{}'.format(server, item_id, source_id, index)
             if language:
-                url = '{}/Stream.{}.{}?api_key={}'.format(
+                url = '{}/0/Stream.{}.{}?api_key={}'.format(
                     url_root, language, codec, token)
             else:
-                url = '{}/Stream.{}?api_key={}'.format(url_root, codec, token)
+                url = '{}/0/Stream.{}?api_key={}'.format(url_root, codec, token)
 
             default = ""
             if stream['IsDefault']:
@@ -870,8 +877,7 @@ def external_subs(media_source, list_item, item_id):
 
 def send_progress():
     home_window = HomeWindow()
-    play_data_string = home_window.get_property('now_playing')
-    play_data = json.loads(play_data_string)
+    play_data = get_playing_data()
 
     if play_data is None:
         return
@@ -879,15 +885,18 @@ def send_progress():
     log.debug("Sending Progress Update")
 
     player = xbmc.Player()
+    item_id = play_data.get("item_id")
+
+    if item_id is None:
+        return
+
     play_time = player.getTime()
     total_play_time = player.getTotalTime()
-    play_data["currentPossition"] = play_time
+    play_data["current_position"] = play_time
     play_data["duration"] = total_play_time
     play_data["currently_playing"] = True
 
-    item_id = play_data.get("item_id")
-    if item_id is None:
-        return
+    home_window.set_property('now_playing', json.dumps(play_data))
 
     source_id = play_data.get("source_id")
 
@@ -940,7 +949,7 @@ def prompt_for_stop_actions(item_id, data):
     log.debug("prompt_for_stop_actions Called : {0}".format(data))
 
     settings = xbmcaddon.Addon()
-    current_position = data.get("currentPossition", 0)
+    current_position = data.get("current_position", 0)
     duration = data.get("duration", 0)
     # media_source_id = data.get("source_id")
     next_episode = data.get("next_episode")
@@ -1001,24 +1010,31 @@ def prompt_for_stop_actions(item_id, data):
                 xbmc.executebuiltin("Container.Refresh")
 
 
-def stop_all_playback(played_information):
+def stop_all_playback():
+
+    home_window = HomeWindow()
+    played_information_string = home_window.get_property('played_information')
+    if played_information_string:
+        played_information = json.loads(played_information_string)
+    else:
+        played_information = {}
+
     log.debug("stop_all_playback : {0}".format(played_information))
 
     if len(played_information) == 0:
         return
 
     log.debug("played_information: {0}".format(played_information))
+    clear_entries = []
 
-    home_screen = HomeWindow()
-    home_screen.clear_property("currently_playing_id")
+    home_window.clear_property("currently_playing_id")
 
-    for item_url in played_information:
-        data = played_information.get(item_url)
+    for item in played_information:
+        data = played_information.get(item)
         if data.get("currently_playing", False) is True:
-            log.debug("item_url: {0}".format(item_url))
             log.debug("item_data: {0}".format(data))
 
-            current_position = data.get("currentPossition", 0)
+            current_position = data.get("current_position", 0)
             duration = data.get("duration", 0)
             jellyfin_item_id = data.get("item_id")
             jellyfin_source_id = data.get("source_id")
@@ -1041,37 +1057,75 @@ def stop_all_playback(played_information):
                 if data.get("play_action_type", "") == "play":
                     prompt_for_stop_actions(jellyfin_item_id, data)
 
+                clear_entries.append(item)
+
             if data.get('playback_type') == 'Transcode':
                 device_id = ClientInformation().get_device_id()
                 url = "{server}/Videos/ActiveEncodings?DeviceId=%s" % device_id
                 download_utils.download_url(url, method="DELETE")
 
+    for entry in clear_entries:
+        del played_information[entry]
+
+    home_window.set_property('played_information', json.dumps(played_information))
+
 
 def get_playing_data():
+    player = xbmc.Player()
+    home_window = HomeWindow()
+    play_data_string = home_window.get_property('now_playing')
+    play_data = json.loads(play_data_string)
+
+    played_information_string = home_window.get_property('played_information')
+    if played_information_string:
+        played_information = json.loads(played_information_string)
+    else:
+        played_information = {}
+
+    playlist_data_string = home_window.get_property('playlist')
+    if playlist_data_string:
+        playlist_data = json.loads(playlist_data_string)
+    else:
+        playlist_data = {}
+
+    item_id = play_data.get("item_id")
+
     settings = xbmcaddon.Addon()
     server = settings.getSetting('server_address')
     try:
-        playing_file = xbmc.Player().getPlayingFile()
+        playing_file = player.getPlayingFile()
     except Exception as e:
         log.error("get_playing_data : getPlayingFile() : {0}".format(e))
         return None
     log.debug("get_playing_data : getPlayingFile() : {0}".format(playing_file))
-    if server in playing_file:
-        url_data = urlparse(playing_file)
-        query = parse_qs(url_data.query)
+    if server in playing_file and item_id is not None:
+        play_time = player.getTime()
+        total_play_time = player.getTotalTime()
 
-    return play_data_map.get(playing_file)
+        if item_id is not None and item_id not in playing_file and playing_file in playlist_data:
+            # if the current now_playing data isn't correct, pull it from the playlist_data
+            play_data = playlist_data.pop(playing_file)
+            # Update now_playing data
+            home_window.set_property('playlist', json.dumps(playlist_data))
+
+        play_data["current_position"] = play_time
+        play_data["duration"] = total_play_time
+        played_information[item_id] = play_data
+        home_window.set_property('now_playing', json.dumps(play_data))
+        home_window.set_property('played_information', json.dumps(played_information))
+        return play_data
+
+    return {}
 
 
 class Service(xbmc.Player):
 
     def __init__(self, *args):
         log.debug("Starting monitor service: {0}".format(args))
-        self.played_information = {}
 
     def onPlayBackStarted(self):
         # Will be called when xbmc starts playing a file
-        stop_all_playback(self.played_information)
+        stop_all_playback()
 
         if not xbmc.Player().isPlaying():
             log.debug("onPlayBackStarted: not playing file!")
@@ -1094,6 +1148,12 @@ class Service(xbmc.Player):
         if jellyfin_item_id is None:
             return
 
+        home_window = HomeWindow()
+        played_information_string = home_window.get_property('played_information')
+        played_information = json.loads(played_information_string)
+        played_information[jellyfin_item_id] = play_data
+        home_window.set_property('played_information', json.dumps(played_information))
+
         log.debug("Sending Playback Started")
         postdata = {
             'QueueableMediaTypes': "Video",
@@ -1115,12 +1175,12 @@ class Service(xbmc.Player):
     def onPlayBackEnded(self):
         # Will be called when kodi stops playing a file
         log.debug("onPlayBackEnded")
-        stop_all_playback(self.played_information)
+        stop_all_playback()
 
     def onPlayBackStopped(self):
         # Will be called when user stops kodi playing a file
         log.debug("onPlayBackStopped")
-        stop_all_playback(self.played_information)
+        stop_all_playback()
 
     def onPlayBackPaused(self):
         # Will be called when kodi pauses the video
@@ -1166,7 +1226,7 @@ class PlaybackService(xbmc.Monitor):
             home_window.set_property('exit', 'True')
             return
 
-        if sender[-7:] != '.SIGNAL':
+        if sender != 'plugin.video.jellycon':
             return
 
         signal = method.split('.', 1)[-1]
@@ -1174,16 +1234,12 @@ class PlaybackService(xbmc.Monitor):
             return
 
         data_json = json.loads(data)
-        message_data = data_json[0]
-        log.debug("PlaybackService:onNotification:{0}".format(message_data))
-        decoded_data = base64.b64decode(message_data)
-        play_info = json.loads(decoded_data)
+        play_info = data_json[0]
+        log.debug("PlaybackService:onNotification:{0}".format(play_info))
 
         if signal == "jellycon_play_action":
-            log.info("Received jellycon_play_action : {0}".format(play_info))
-            play_file(play_info, self.monitor)
+            play_file(play_info)
         elif signal == "jellycon_play_youtube_trailer_action":
-            log.info("Received jellycon_play_trailer_action : {0}".format(play_info))
             trailer_link = play_info["url"]
             xbmc.executebuiltin(trailer_link)
         elif signal == "set_view":

resources/lib/playnext.py

@@ -1,5 +1,6 @@
 from __future__ import division, absolute_import, print_function, unicode_literals
 
+import json
 import os
 import threading
 
@@ -9,6 +10,7 @@ import xbmcaddon
 
 from .loghandler import LazyLogger
 from .play_utils import send_event_notification
+from .kodi_utils import HomeWindow
 
 log = LazyLogger(__name__)
 
@@ -32,6 +34,8 @@ class PlayNextService(threading.Thread):
         play_next_triggered = False
         is_playing = False
 
+        now_playing = None
+
         while not xbmc.Monitor().abortRequested() and not self.stop_thread:
 
             player = xbmc.Player()
@@ -42,6 +46,13 @@ class PlayNextService(threading.Thread):
                     play_next_trigger_time = int(settings.getSetting('play_next_trigger_time'))
                     log.debug("New play_next_trigger_time value: {0}".format(play_next_trigger_time))
 
+                now_playing_file = player.getPlayingFile()
+                if now_playing_file != now_playing:
+                    # If the playing file has changed, reset the play next values
+                    play_next_dialog = None
+                    play_next_triggered = False
+                    now_playing = now_playing_file
+
                 duration = player.getTotalTime()
                 position = player.getTime()
                 trigger_time = play_next_trigger_time  # 300
@@ -51,7 +62,7 @@ class PlayNextService(threading.Thread):
                     play_next_triggered = True
                     log.debug("play_next_triggered hit at {0} seconds from end".format(time_to_end))
 
-                    play_data = get_playing_data(self.monitor.played_information)
+                    play_data = get_playing_data()
                     log.debug("play_next_triggered play_data : {0}".format(play_data))
 
                     next_episode = play_data.get("next_episode")
@@ -78,6 +89,7 @@ class PlayNextService(threading.Thread):
                     play_next_dialog = None
 
                 is_playing = False
+                now_playing = None
 
             if xbmc.Monitor().waitForAbort(1):
                 break

resources/lib/server_detect.py

@@ -13,6 +13,7 @@ from datetime import datetime
 import xbmcaddon
 import xbmcgui
 import xbmc
+from six import ensure_binary
 from kodi_six.utils import py2_decode
 
 from .kodi_utils import HomeWindow
@@ -132,10 +133,7 @@ def get_server_details():
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     sock.settimeout(4.0)
 
-    sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 3)  # timeout
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-    sock.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP, 1)
-    sock.setsockopt(socket.IPPROTO_IP, socket.SO_REUSEADDR, 1)
 
     log.debug("MutliGroup: {0}".format(multi_group))
     log.debug("Sending UDP Data: {0}".format(message))
@@ -318,7 +316,7 @@ def check_server(force=False, change_user=False, notify=False):
                         user_item.setProperty("secure", "true")
 
                         m = hashlib.md5()
-                        m.update(name)
+                        m.update(ensure_binary(name))
                         hashed_username = m.hexdigest()
                         saved_password = settings.getSetting("saved_user_password_" + hashed_username)
                         if saved_password:

resources/lib/utils.py

@@ -5,6 +5,7 @@ import xbmcaddon
 import xbmc
 import xbmcvfs
 
+import binascii
 import string
 import random
 import json
@@ -14,6 +15,7 @@ import math
 from datetime import datetime
 import calendar
 import re
+from six import ensure_text, ensure_binary
 from six.moves.urllib.parse import urlencode
 
 from .downloadutils import DownloadUtils
@@ -90,8 +92,8 @@ class PlayUtils:
                 playurl = direct_path
                 playback_type = "0"
 
-        # check if file can be direct streamed
-        if can_direct_stream and playurl is None:
+        # check if file can be direct streamed/played
+        if (can_direct_stream or can_direct_play) and playurl is None:
             item_id = media_source.get('Id')
             playurl = ("%s/Videos/%s/stream" +
                        "?static=true" +
@@ -282,12 +284,6 @@ def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
     return ''.join(random.choice(chars) for _ in range(size))
 
 
-def double_urlencode(text):
-    text = single_urlencode(text)
-    text = single_urlencode(text)
-    return text
-
-
 def single_urlencode(text):
     # urlencode needs a utf- string
     text = urlencode({'blahblahblah': text.encode('utf-8')})
@@ -295,14 +291,19 @@ def single_urlencode(text):
     return text.decode('utf-8')  # return the result again as unicode
 
 
-def send_event_notification(method, data):
-    message_data = json.dumps(data)
-    source_id = "jellycon"
-    base64_data = base64.b64encode(message_data.encode())
-    escaped_data = '\\"[\\"{0}\\"]\\"'.format(base64_data)
-    command = 'XBMC.NotifyAll({0}.SIGNAL,{1},{2})'.format(source_id, method, escaped_data)
-    log.debug("Sending notification event data: {0}".format(command))
-    xbmc.executebuiltin(command)
+def send_event_notification(method, data=None, hexlify=False):
+    '''
+    Send events through Kodi's notification system
+    '''
+    data = data or {}
+
+    if hexlify:
+        # Used exclusively for the upnext plugin
+        data = ensure_text(binascii.hexlify(ensure_binary(json.dumps(data))))
+    sender = 'plugin.video.jellycon'
+    data = '"[%s]"' % json.dumps(data).replace('"', '\\"')
+
+    xbmc.executebuiltin('NotifyAll(%s, %s, %s)' % (sender, method, data))
 
 
 def datetime_from_string(time_string):

resources/lib/websocket_client.py

@@ -6,6 +6,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 import json
 import threading
 import websocket
+import time
 
 import xbmc
 import xbmcgui
@@ -32,6 +33,7 @@ class WebSocketClient(threading.Thread):
 
         self.__dict__ = self._shared_state
         self.monitor = xbmc.Monitor()
+        self.retry_count = 0
 
         self.client_info = clientinfo.ClientInformation()
         self.device_id = self.client_info.get_device_id()
@@ -227,11 +229,9 @@ class WebSocketClient(threading.Thread):
             if command in builtin:
                 xbmc.executebuiltin(builtin[command])
 
-    def on_close(self, ws):
-        log.debug("Closed")
-
     def on_open(self, ws):
         log.debug("Connected")
+        self.retry_count = 0
         self.post_capabilities()
 
     def on_error(self, ws, error):
@@ -250,25 +250,25 @@ class WebSocketClient(threading.Thread):
 
         # Get the appropriate prefix for the websocket
         server = download_utils.get_server()
-        if "https" in server:
-            server = server.replace('https', "wss")
+        if "https://" in server:
+            server = server.replace('https://', 'wss://')
         else:
-            server = server.replace('http', "ws")
+            server = server.replace('http://', 'ws://')
 
         websocket_url = "%s/socket?api_key=%s&deviceId=%s" % (server, token, self.device_id)
         log.debug("websocket url: {0}".format(websocket_url))
 
         self._client = websocket.WebSocketApp(
             websocket_url,
-            on_open=lambda ws, message: self.on_open(ws),
+            on_open=lambda ws: self.on_open(ws),
             on_message=lambda ws, message: self.on_message(ws, message),
-            on_error=lambda ws, error: self.on_error(ws, error),
-            on_close=lambda ws, error: self.on_close(ws))
+            on_error=lambda ws, error: self.on_error(ws, error))
 
         log.debug("Starting WebSocketClient")
 
         while not self.monitor.abortRequested():
 
+            time.sleep(self.retry_count * 5)
             self._client.run_forever(ping_interval=10)
 
             if self._stop_websocket:
@@ -278,6 +278,8 @@ class WebSocketClient(threading.Thread):
                 # Abort was requested, exit
                 break
 
+            if self.retry_count < 12:
+                self.retry_count += 1
             log.debug("Reconnecting WebSocket")
 
         log.debug("WebSocketClient Stopped")

resources/lib/widgets.py

@@ -77,7 +77,7 @@ def set_background_image(force=False):
 
     if len(background_items) == 0:
         log.debug("set_background_image: Need to load more backgrounds {0} - {1}".format(
-             len(background_items), background_current_item))
+            len(background_items), background_current_item))
 
         url_params = {}
         url_params["Recursive"] = True
@@ -96,7 +96,8 @@ def set_background_image(force=False):
             background_current_item = 0
             background_items = []
             for item in items:
-                bg_image = downloadUtils.get_artwork(item, "Backdrop", server=server)
+                bg_image = downloadUtils.get_artwork(
+                    item, "Backdrop", server=server)
                 if bg_image:
                     label = item.get("Name")
                     item_background = {}
@@ -104,12 +105,14 @@ def set_background_image(force=False):
                     item_background["name"] = label
                     background_items.append(item_background)
 
-        log.debug("set_background_image: Loaded {0} more backgrounds".format(len(background_items)))
+        log.debug("set_background_image: Loaded {0} more backgrounds".format(
+            len(background_items)))
 
     if len(background_items) > 0:
         bg_image = background_items[background_current_item].get("image")
         label = background_items[background_current_item].get("name")
-        log.debug("set_background_image: {0} - {1} - {2}".format(background_current_item, label, bg_image))
+        log.debug(
+            "set_background_image: {0} - {1} - {2}".format(background_current_item, label, bg_image))
 
         background_current_item += 1
         if background_current_item >= len(background_items):
@@ -126,7 +129,8 @@ def check_for_new_content():
 
     home_window = HomeWindow()
     settings = xbmcaddon.Addon()
-    simple_new_content_check = settings.getSetting("simple_new_content_check") == "true"
+    simple_new_content_check = settings.getSetting(
+        "simple_new_content_check") == "true"
 
     if simple_new_content_check:
         log.debug("Using simple new content check")
@@ -202,7 +206,8 @@ def get_widget_content_cast(handle, params):
 
     item_id = params["id"]
     data_manager = DataManager()
-    result = data_manager.get_content("{server}/Users/{userid}/Items/" + item_id)
+    result = data_manager.get_content(
+        "{server}/Users/{userid}/Items/" + item_id)
     log.debug("ItemInfo: {0}".format(result))
 
     if not result:
@@ -228,7 +233,8 @@ def get_widget_content_cast(handle, params):
             person_tag = person.get("PrimaryImageTag")
             person_thumbnail = None
             if person_tag:
-                person_thumbnail = downloadUtils.image_url(person_id, "Primary", 0, 400, 400, person_tag, server=server)
+                person_thumbnail = downloadUtils.image_url(
+                    person_id, "Primary", 0, 400, 400, person_tag, server=server)
 
             if kodi_version > 17:
                 list_item = xbmcgui.ListItem(label=person_name, offscreen=True)
@@ -264,7 +270,8 @@ def get_widget_content(handle, params):
 
     settings = xbmcaddon.Addon()
     hide_watched = settings.getSetting("hide_watched") == "true"
-    use_cached_widget_data = settings.getSetting("use_cached_widget_data") == "true"
+    use_cached_widget_data = settings.getSetting(
+        "use_cached_widget_data") == "true"
 
     widget_type = params.get("type")
     if widget_type is None:
@@ -279,6 +286,7 @@ def get_widget_content(handle, params):
     url_params["Fields"] = "{field_filters}"
     url_params["ImageTypeLimit"] = 1
     url_params["IsMissing"] = False
+    in_progress = False
 
     if widget_type == "recent_movies":
         xbmcplugin.setContent(handle, 'movies')
@@ -290,6 +298,7 @@ def get_widget_content(handle, params):
             url_params["IsPlayed"] = False
         url_params["IsVirtualUnaired"] = False
         url_params["IncludeItemTypes"] = "Movie"
+        url_params["Limit"] = 20
 
     elif widget_type == "inprogress_movies":
         xbmcplugin.setContent(handle, 'movies')
@@ -299,6 +308,7 @@ def get_widget_content(handle, params):
         url_params["Filters"] = "IsResumable"
         url_params["IsVirtualUnaired"] = False
         url_params["IncludeItemTypes"] = "Movie"
+        url_params["Limit"] = 20
 
     elif widget_type == "random_movies":
         xbmcplugin.setContent(handle, 'movies')
@@ -318,6 +328,7 @@ def get_widget_content(handle, params):
         url_params["IsVirtualUnaired"] = False
         url_params["IncludeItemTypes"] = "Episode"
         url_params["ImageTypeLimit"] = 1
+        url_params["Limit"] = 20
 
     elif widget_type == "recent_episodes":
         xbmcplugin.setContent(handle, 'episodes')
@@ -329,6 +340,7 @@ def get_widget_content(handle, params):
             url_params["IsPlayed"] = False
         url_params["IsVirtualUnaired"] = False
         url_params["IncludeItemTypes"] = "Episode"
+        url_params["Limit"] = 20
 
     elif widget_type == "inprogress_episodes":
         xbmcplugin.setContent(handle, 'episodes')
@@ -338,15 +350,27 @@ def get_widget_content(handle, params):
         url_params["Filters"] = "IsResumable"
         url_params["IsVirtualUnaired"] = False
         url_params["IncludeItemTypes"] = "Episode"
+        url_params["Limit"] = 20
 
     elif widget_type == "nextup_episodes":
         xbmcplugin.setContent(handle, 'episodes')
         url_verb = "{server}/Shows/NextUp"
+        url_params = url_params.copy()
         url_params["Limit"] = "{ItemLimit}"
         url_params["userid"] = "{userid}"
         url_params["Recursive"] = True
-        url_params["Fields"] = "{field_filters}"
         url_params["ImageTypeLimit"] = 1
+        # Collect InProgress items to be combined with NextUp
+        inprogress_url_verb = "{server}/Users/{userid}/Items"
+        inprogress_url_params = url_params.copy()
+        inprogress_url_params["Recursive"] = True
+        inprogress_url_params["SortBy"] = "DatePlayed"
+        inprogress_url_params["SortOrder"] = "Descending"
+        inprogress_url_params["Filters"] = "IsResumable"
+        inprogress_url_params["IsVirtualUnaired"] = False
+        inprogress_url_params["IncludeItemTypes"] = "Episode"
+        inprogress_url_params["Limit"] = 20
+        in_progress = True
 
     elif widget_type == "movie_recommendations":
         suggested_items_url_params = {}
@@ -354,7 +378,8 @@ def get_widget_content(handle, params):
         suggested_items_url_params["categoryLimit"] = 15
         suggested_items_url_params["ItemLimit"] = 20
         suggested_items_url_params["ImageTypeLimit"] = 0
-        suggested_items_url = get_jellyfin_url("{server}/Movies/Recommendations", suggested_items_url_params)
+        suggested_items_url = get_jellyfin_url(
+            "{server}/Movies/Recommendations", suggested_items_url_params)
 
         data_manager = DataManager()
         suggested_items = data_manager.get_content(suggested_items_url)
@@ -362,7 +387,8 @@ def get_widget_content(handle, params):
         set_id = 0
         while len(ids) < 20 and suggested_items:
             items = suggested_items[set_id]
-            log.debug("BaselineItemName : {0} - {1}".format(set_id, items.get("BaselineItemName")))
+            log.debug(
+                "BaselineItemName : {0} - {1}".format(set_id, items.get("BaselineItemName")))
             items = items["Items"]
             rand = random.randint(0, len(items) - 1)
             item = items[rand]
@@ -381,16 +407,18 @@ def get_widget_content(handle, params):
 
     items_url = get_jellyfin_url(url_verb, url_params)
 
-    list_items, detected_type, total_records = process_directory(items_url, None, params, use_cached_widget_data)
+    list_items, detected_type, total_records = process_directory(
+        items_url, None, params, use_cached_widget_data)
 
-    # remove resumable items from next up
+    # Combine In Progress and Next Up Episodes, apend next up after In Progress
     if widget_type == "nextup_episodes":
-        filtered_list = []
-        for item in list_items:
-            resume_time = item[1].getProperty("ResumeTime")
-            if resume_time is None or float(resume_time) == 0.0:
-                filtered_list.append(item)
-        list_items = filtered_list
+        inprogress_url = get_jellyfin_url(
+            inprogress_url_verb, inprogress_url_params)
+
+        list_items_inprogress, detected_type, total_records = process_directory(
+            inprogress_url, None, params, use_cached_widget_data)
+
+        list_items = list_items_inprogress + list_items
 
     if detected_type is not None:
         # if the media type is not set then try to use the detected type

resources/settings.xml

@@ -46,13 +46,6 @@
 		<setting id="audio_playback_bitrate" type="select" label="30418" values="128|160|192|256|320|384|448|640" default="256" visible="true"/>
 		<setting id="audio_max_channels" type="slider" label="30420" default="8" range="2,1,8" option="int" visible="true"/>
 
-		<!--
-		<setting label="30209" type="lsep"/>
-		<setting type="sep" />
-		<setting id="smbusername" type="text" label="30007" default="" enable="true" visible="true"/>
-		<setting id="smbpassword" type="text" label="30008" default="" option="hidden" enable="true" visible="true"/>
-		-->
-
 	</category>
 	<category label="30214">
 
@@ -74,8 +67,8 @@
 
 		<setting label="30329" type="lsep"/>
 		<setting type="sep" />
-		<setting id="stopPlaybackOnScreensaver" type="bool" label="30332" default="true" visible="true" enable="true" />
-		<setting id="changeUserOnScreenSaver" type="bool" label="30330" default="true" visible="true" enable="true" />
+		<setting id="stopPlaybackOnScreensaver" type="bool" label="30332" default="false" visible="true" enable="true" />
+		<setting id="changeUserOnScreenSaver" type="bool" label="30330" default="false" visible="true" enable="true" />
 		<setting id="cacheImagesOnScreenSaver" type="bool" label="30333" default="true" visible="true" enable="true" />
 		<setting id="cacheImagesOnScreenSaver_interval" type="slider" label="30400" default="0" range="0,1,60" option="int" visible="true"/>
 
@@ -155,4 +148,4 @@
 		<setting id="sort-Episodes" type="select" label="30235" lvalues="30423|30424|30426|30425|30427|30429|30430|30428" default="0" visible="true"/>
 
 	</category>
-</settings>
+</settings>

service.py

@@ -67,6 +67,7 @@ image_server = HttpImageServerThread()
 image_server.start()
 
 # set up all the services
+monitor = Service()
 playback_service = PlaybackService(monitor)
 
 home_window = HomeWindow()

tox.ini

@@ -0,0 +1,9 @@
+[flake8]
+max-line-length = 9999
+import-order-style = pep8
+exclude = .git,.vscode,libraries,build.py,.github
+extend-ignore =
+    I202
+per-file-ignores =
+    */__init__.py: F401
+    scripts/process_addon.py: F821