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

Editorconfig pre-commit and indentation adjustment
2024-06-11 04:35:10 +02:00 · 2024-06-11 04:35:10 +02:00 · d731c80ee7
parent ae5caa6831 5e68c5b8b6
commit d731c80ee7
11 changed files with 131 additions and 107 deletions
--- a/.build/template.xml
+++ b/.build/template.xml
@ -15,11 +15,16 @@
 		<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>
+				<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>
+				<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>
@ -31,7 +36,15 @@
 		<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>
+		<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>
--- 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]
+# JSON indentation
+[*.json]
+indent_size = 2
 indent_style = tab


-[jellyfin_kodi/objects/obj_map.json]
-indent_style = tab
-
-[.devcontainer/Python 3.11/devcontainer.json]
-indent_style = tab
-
 [README.md]
 indent_size = 2
--- 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
--- 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. -->
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -10,17 +10,28 @@
 	"packageRules": [
 		{
 			"description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
-            "matchManagers": ["github-actions"],
-            "labels": ["ci", "github-actions"]
+			"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"]
+			"matchManagers": [
+				"pip_requirements"
+			],
+			"labels": [
+				"pip",
+				"dependencies"
+			]
 		}
-
 	],
 	"pip_requirements": {
-        "fileMatch": ["requirements(-[a-z0-9]+)?\\.txt$"]
+		"fileMatch": [
+			"requirements(-[a-z0-9]+)?\\.txt$"
+		]
 	}
 }
--- 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"
--- 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>