Merge pull request #878 from oddstr13/pr-editorconfig-1

Editorconfig pre-commit and indentation adjustment
jellyfin · Jun 11, 2024 · d731c80 · d731c80
2 parents ae5caa6 + 5e68c5b
commit d731c80
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 107 deletions.
diff --git a/.build/template.xml b/.build/template.xml
@@ -1,42 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.jellyfin"
-        name="Jellyfin"
-        version=""
-        provider-name="Jellyfin Contributors, angelblue05">
-  <requires>
-  </requires>
-  <extension    point="xbmc.python.pluginsource"
-                library="default.py">
-        <provides>video audio image</provides>
-  </extension>
-  <extension point="xbmc.service" library="service.py" start="login">
-  </extension>
-  <extension point="kodi.context.item">
-    <menu id="kodi.core.main">
-      <item library="context.py">
-        <label>30401</label>
-        <visible>[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(jellyfinid))] + !String.IsEmpty(Window(10000).Property(jellyfin_context))</visible>
-      </item>
-      <item library="context_play.py">
-        <label>30402</label>
-        <visible>[[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(jellyfinid))] + [String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,episode)]] + !String.IsEmpty(Window(10000).Property(jellyfin_context_transcode))</visible>
-      </item>
-    </menu>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <platform>all</platform>
-    <language>en</language>
-    <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
-    <forum>https://forum.jellyfin.org</forum>
-    <website>https://jellyfin.org/</website>
-    <source>https://github.com/jellyfin/jellyfin-kodi</source>
-    <summary lang="en"></summary>
-    <description lang="en">Welcome to Jellyfin for Kodi!&#10;A whole new way to manage and view your media library. The Jellyfin addon for Kodi combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Jellyfin - the most powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Jellyfin for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with the power of Jellyfin's centralized database. Features:&#10;* Direct integration with the Kodi library for native Kodi speed&#10;* Instant synchronization with the Jellyfin server&#10;* Full support for Movie, TV and Music collections&#10;* Jellyfin Server direct stream and transcoding support - use Kodi when you are away from home!</description>
-    <news>
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-    </assets>
-  </extension>
+<addon id="plugin.video.jellyfin"
+	name="Jellyfin"
+	version=""
+	provider-name="Jellyfin Contributors, angelblue05">
+	<requires>
+	</requires>
+	<extension point="xbmc.python.pluginsource"
+		library="default.py">
+		<provides>video audio image</provides>
+	</extension>
+	<extension point="xbmc.service" library="service.py" start="login">
+	</extension>
+	<extension point="kodi.context.item">
+		<menu id="kodi.core.main">
+			<item library="context.py">
+				<label>30401</label>
+				<visible>[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) |
+					!String.IsEmpty(ListItem.Property(jellyfinid))] +
+					!String.IsEmpty(Window(10000).Property(jellyfin_context))</visible>
+			</item>
+			<item library="context_play.py">
+				<label>30402</label>
+				<visible>[[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) |
+					!String.IsEmpty(ListItem.Property(jellyfinid))] + [String.IsEqual(ListItem.DBTYPE,movie) |
+					String.IsEqual(ListItem.DBTYPE,episode)]] +
+					!String.IsEmpty(Window(10000).Property(jellyfin_context_transcode))</visible>
+			</item>
+		</menu>
+	</extension>
+	<extension point="xbmc.addon.metadata">
+		<platform>all</platform>
+		<language>en</language>
+		<license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+		<forum>https://forum.jellyfin.org</forum>
+		<website>https://jellyfin.org/</website>
+		<source>https://github.com/jellyfin/jellyfin-kodi</source>
+		<summary lang="en"></summary>
+		<description lang="en">Welcome to Jellyfin for Kodi!&#10;A whole new way to manage and view your
+			media library. The Jellyfin addon for Kodi combines the best of Kodi - ultra smooth
+			navigation, beautiful UIs and playback of any file under the sun, and Jellyfin - the most
+			powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Jellyfin
+			for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with
+			the power of Jellyfin's centralized database. Features:&#10;* Direct integration with the Kodi
+			library for native Kodi speed&#10;* Instant synchronization with the Jellyfin server&#10;*
+			Full support for Movie, TV and Music collections&#10;* Jellyfin Server direct stream and
+			transcoding support - use Kodi when you are away from home!</description>
+		<news>
+		</news>
+		<assets>
+			<icon>resources/icon.png</icon>
+			<fanart>resources/fanart.png</fanart>
+		</assets>
+	</extension>
 </addon>
diff --git a/.editorconfig b/.editorconfig
@@ -23,19 +23,13 @@ indent_size = 2
 # XML indentation
 [*.xml]
 indent_size = 2
-
-[resources/settings.xml]
-indent_style = tab
-
-[resources/skins/**.xml]
 indent_style = tab
 
-
-[jellyfin_kodi/objects/obj_map.json]
+# JSON indentation
+[*.json]
+indent_size = 2
 indent_style = tab
 
-[.devcontainer/Python 3.11/devcontainer.json]
-indent_style = tab
 
 [README.md]
 indent_size = 2
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,6 @@
 # Tool: black
 77637622125a187c5b9cbe72b78c8bd3b26f754a
+# Fix editorconfig lints
+be8333a80c2650c75444281a9b720da438b2b6d0
+# Change indentation of XML and JSON files
+7c0e986bd283c764cc16f0c756a03a04e4073ad0
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -18,11 +18,11 @@
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **System (please complete the following information):**
- - OS: [e.g. Android, Debian, Windows]
- - Jellyfin Version: [e.g. 10.0.1]
- - Kodi Version: [e.g. 18.3]
- - Addon Version: [e.g. 0.2.1]
- - Playback Mode: [e.g. Add-On or Native]
+- OS: [e.g. Android, Debian, Windows]
+- Jellyfin Version: [e.g. 10.0.1]
+- Kodi Version: [e.g. 18.3]
+- Addon Version: [e.g. 0.2.1]
+- Playback Mode: [e.g. Add-On or Native]
 
 **Additional context**
 <!-- Add any other context about the problem here. -->
diff --git a/.github/releasing.md b/.github/releasing.md
@@ -1,7 +1,7 @@
 # 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`)
+    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)

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,26 +1,37 @@
 {
-    "extends": [
-        "config:base",
-        ":dependencyDashboard",
-        ":timezone(Etc/UTC)",
-        ":preserveSemverRanges"
-    ],
-    "internalChecksFilter": "strict",
-    "rebaseWhen": "conflicted",
-    "packageRules": [
-        {
-            "description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
-            "matchManagers": ["github-actions"],
-            "labels": ["ci", "github-actions"]
-        },
-        {
-            "description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
-            "matchManagers": ["pip_requirements"],
-            "labels": ["pip", "dependencies"]
-        }
-
-    ],
-    "pip_requirements": {
-        "fileMatch": ["requirements(-[a-z0-9]+)?\\.txt$"]
-    }
-}
+	"extends": [
+		"config:base",
+		":dependencyDashboard",
+		":timezone(Etc/UTC)",
+		":preserveSemverRanges"
+	],
+	"internalChecksFilter": "strict",
+	"rebaseWhen": "conflicted",
+	"packageRules": [
+		{
+			"description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
+			"matchManagers": [
+				"github-actions"
+			],
+			"labels": [
+				"ci",
+				"github-actions"
+			]
+		},
+		{
+			"description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
+			"matchManagers": [
+				"pip_requirements"
+			],
+			"labels": [
+				"pip",
+				"dependencies"
+			]
+		}
+	],
+	"pip_requirements": {
+		"fileMatch": [
+			"requirements(-[a-z0-9]+)?\\.txt$"
+		]
+	}
+}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,11 +9,11 @@ repos:
       - id: check-added-large-files
       - id: no-commit-to-branch
 
-  # - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-  #   rev: "2.7.3"
-  #   hooks:
-  #     - id: editorconfig-checker
-  #       exclude: '^LICENSE\.txt$'
+  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
+    rev: "2.7.3"
+    hooks:
+      - id: editorconfig-checker
+        exclude: '^(LICENSE\.txt|resources/language/.*\.po)$'
 
   - repo: https://github.com/psf/black
     rev: "24.4.2"

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
-    "recommendations": [
-        "ms-vscode-remote.remote-containers",
-        "ms-python.black-formatter"
-    ]
+	"recommendations": [
+		"ms-vscode-remote.remote-containers",
+		"ms-python.black-formatter"
+	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,16 +1,16 @@
 {
-    "editor.formatOnSave": true,
-    "python.formatting.provider": "black",
-    "python.linting.enabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.linting.mypyEnabled": true,
-    "python.testing.pytestEnabled": true,
-    "python.analysis.diagnosticMode": "workspace",
-    "files.associations": {
-        "requirements-*.txt": "pip-requirements"
-    },
-    "sonarlint.connectedMode.project": {
-        "connectionId": "jellyfin",
-        "projectKey": "jellyfin_jellyfin-kodi"
-    },
+	"editor.formatOnSave": true,
+	"python.formatting.provider": "black",
+	"python.linting.enabled": true,
+	"python.linting.flake8Enabled": true,
+	"python.linting.mypyEnabled": true,
+	"python.testing.pytestEnabled": true,
+	"python.analysis.diagnosticMode": "workspace",
+	"files.associations": {
+		"requirements-*.txt": "pip-requirements"
+	},
+	"sonarlint.connectedMode.project": {
+		"connectionId": "jellyfin",
+		"projectKey": "jellyfin_jellyfin-kodi"
+	},
 }
diff --git a/jellyfin_kodi/objects/obj.py b/jellyfin_kodi/objects/obj.py
@@ -44,7 +44,7 @@ def map(self, item, mapping_name):
         "?": split filters and key name from the query part, i.e. MediaSources/0?$Name
         "$": lead the key name with $. Only one key value can be requested per element.
         ":": indicates it's a list of elements [], i.e. MediaSources/0/MediaStreams:?$Name
-             MediaStreams is a list.
+            MediaStreams is a list.
         "/": indicates where to go directly
         """
         self.mapped_item = {}

diff --git a/resources/skins/default/1080i/script-jellyfin-context.xml b/resources/skins/default/1080i/script-jellyfin-context.xml
@@ -15,11 +15,13 @@
 			</control>
 			<control type="group">
 				<animation type="WindowOpen" reversible="false">
-					<effect type="zoom" start="80" end="100" center="960,540" delay="160" tween="circle" easin="out" time="240" />
+					<effect type="zoom" start="80" end="100" center="960,540" delay="160" tween="circle"
+						easin="out" time="240" />
 					<effect type="fade" delay="160" end="100" time="240" />
 				</animation>
 				<animation type="WindowClose" reversible="false">
-					<effect type="zoom" start="100" end="80" center="960,540" easing="in" tween="circle" easin="out" time="240" />
+					<effect type="zoom" start="100" end="80" center="960,540" easing="in" tween="circle"
+						easin="out" time="240" />
 					<effect type="fade" start="100" end="0" time="240" />
 				</animation>
 				<centerleft>50%</centerleft>
@@ -98,4 +100,4 @@
 			</control>
 		</control>
 	</controls>
-</window>
+</window>