Detect directory separators in paths

This reverts commit 6e24a61623.

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -0,0 +1,55 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to help improve this project! Please read the [how to open an issue](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#how-to-open-an-issue) guide carefully before continuing.
+
+  - type: checkboxes
+    id: latest
+    attributes:
+      label: "I've read the documentation"
+      options:
+        - label: I'm running the latest version of tubearchivist-jf-plugin.
+          required: true
+        - label: I have read the [how to open an issue](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#how-to-open-an-issue) guide, particularly the [bug report](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#bug-report) section.
+          required: true
+
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      description: On what operating system are you running Tube Archivist on?
+      placeholder: eg. Linux, Windows, ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Your Bug Report
+      value: "## Describe the bug\n\n## Steps To Reproduce\n\n## Expected behavior"
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Jellyfin log output
+      description: Please copy and paste any relevant Jellyfin logs. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml

@@ -0,0 +1,34 @@
+name: Feature Request
+description: I have an idea for a great addition to this project
+title: "[Feature Request]: "
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to help improve this project! This project is *very* selective with accepting new feature requests. Please read the [how to open an issue](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#how-to-open-an-issue) guide carefully before continuing.
+
+  - type: checkboxes
+    id: already
+    attributes:
+      label: "I've read the documentation"
+      options:
+        - label: I have read the [how to open an issue](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#how-to-open-an-issue) guide, particularly the [feature request](https://github.com/tubearchivist/tubearchivist/blob/master/CONTRIBUTING.md#feature-request) section.
+          required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Your Feature Request
+      value: "## Is your feature request related to a problem? Please describe.\n\n## Describe the solution you'd like\n\n## Additional context"
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: help
+    attributes:
+      label: Your help is needed!
+      description: This project is ambitious as it is, please contribute.
+      options:
+        - label: Yes I will work on this in the next few days or weeks.

.github/workflows/build.yaml

@@ -0,0 +1,76 @@
+name: TubeArchivistMetadata Release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build & Release
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+
+      - name: Get release version
+        id: newtag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+
+      - name: Setup .Net
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Get version number only
+        run: |
+          TAG=${{ steps.newtag.outputs.tag }}
+          echo "VERSION=${TAG#v}" >> $GITHUB_ENV
+
+      - name: Generate release message
+        run: |
+          # Read the YAML file and extract the value of the 'changelog' field
+          changelog=$(awk '/changelog:/ {flag=1; next} /^[^ ]/ {flag=0} flag' build.yaml | awk '{$1=$1};1')
+
+          # Check if changelog contains multiple lines
+          if [[ $(echo "$changelog" | wc -l) -gt 1 ]]; then
+              changelog=$(echo "$changelog" | sed 's/^/* /')
+          else
+              changelog="* $changelog"
+          fi
+
+          # Create release-changelog.md
+          echo "Changelog:" > release-changelog.md
+          echo "$changelog" >> release-changelog.md
+
+
+      - name: Build Jellyfin Plugin
+        uses: oddstr13/jellyfin-plugin-repository-manager@843260fcdfda7cba229c5abd77bdd9c6fc4e850b # v1.1.0
+        id: jprm
+        with:
+          dotnet-target: net6.0
+          version: ${VERSION}
+
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: ${{ steps.jprm.outputs.artifact }}
+          makeLatest: latest
+          bodyFile: release-changelog.md
+          tag: ${{ steps.newtag.outputs.tag }}
+          allowUpdates: true
+
+      - name: Update manifest.json
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: master
+          commit_message: "Update manifest.json"
+          file_pattern: manifest.json
+          skip_fetch: true

Jellyfin.Plugin.TubeArchivistMetadata/Providers/EpisodeImageProvider.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -59,7 +60,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
         {
             var list = new List<RemoteImageInfo>();
             var taApi = TubeArchivistApi.GetInstance();
-            var videoTAId = item.Path.Split("/").Last().Split(".").First();
+            var videoTAId = Utils.GetVideoNameFromPath(item.Path);
             var video = await taApi.GetVideo(videoTAId).ConfigureAwait(true);
             _logger.LogInformation("{Message}", string.Format(CultureInfo.CurrentCulture, "Getting images for video: {0} ({1})", video?.Title, videoTAId));
             _logger.LogInformation("{Message}", "Thumb URI: " + video?.VidThumbUrl);

Jellyfin.Plugin.TubeArchivistMetadata/Providers/EpisodeMetadataProvider.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -50,7 +51,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
         {
             var result = new MetadataResult<Episode>();
             var taApi = TubeArchivistApi.GetInstance();
-            var videoTAId = info.Path.Split("/").Last().Split(".").First();
+            var videoTAId = Utils.GetVideoNameFromPath(info.Path);
             var video = await taApi.GetVideo(videoTAId).ConfigureAwait(true);
             _logger.LogInformation("{Message}", string.Format(CultureInfo.CurrentCulture, "Getting metadata for video: {0} ({1})", video?.Title, videoTAId));
             _logger.LogInformation("{Message}", "Received metadata: \n" + JsonConvert.SerializeObject(video));
@@ -79,7 +80,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
             var results = new List<RemoteSearchResult>();
 
             var taApi = TubeArchivistApi.GetInstance();
-            var videoTAId = searchInfo.Path.Split("/").Last().Split(".").First();
+            var videoTAId = Utils.GetVideoNameFromPath(searchInfo.Path);
             var video = await taApi.GetVideo(videoTAId).ConfigureAwait(true);
             if (video != null)
             {

Jellyfin.Plugin.TubeArchivistMetadata/Providers/SeriesImageProvider.cs

@@ -58,7 +58,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
         {
             var list = new List<RemoteImageInfo>();
             var taApi = TubeArchivistApi.GetInstance();
-            var channelTAId = item.Path.Split("/").Last();
+            var channelTAId = Utils.GetChannelNameFromPath(item.Path);
             var channel = await taApi.GetChannel(channelTAId).ConfigureAwait(true);
             _logger.LogInformation("{Message}", string.Format(CultureInfo.CurrentCulture, "Getting images for channel: {0} ({1})", channel?.Name, channelTAId));
             _logger.LogInformation("{Message}", "Thumb URI: " + channel?.ThumbUrl);

Jellyfin.Plugin.TubeArchivistMetadata/Providers/SeriesMetadataProvider.cs

@@ -50,7 +50,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
         {
             var result = new MetadataResult<Series>();
             var taApi = TubeArchivistApi.GetInstance();
-            var channelTAId = info.Path.Split("/").Last();
+            var channelTAId = Utils.GetChannelNameFromPath(info.Path);
             var channel = await taApi.GetChannel(channelTAId).ConfigureAwait(true);
             _logger.LogInformation("{Message}", string.Format(CultureInfo.CurrentCulture, "Getting metadata for channel: {0} ({1})", channel?.Name, channelTAId));
             _logger.LogInformation("{Message}", "Received metadata: \n" + JsonConvert.SerializeObject(channel));
@@ -79,7 +79,7 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Providers
             var results = new List<RemoteSearchResult>();
 
             var taApi = TubeArchivistApi.GetInstance();
-            var channelTAId = searchInfo.Path.Split("/").Last();
+            var channelTAId = Utils.GetChannelNameFromPath(searchInfo.Path);
             var channel = await taApi.GetChannel(channelTAId).ConfigureAwait(true);
             if (channel != null)
             {

Jellyfin.Plugin.TubeArchivistMetadata/Utils/Utils.cs

@@ -1,3 +1,5 @@
+using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace Jellyfin.Plugin.TubeArchivistMetadata.Utilities
@@ -53,5 +55,40 @@ namespace Jellyfin.Plugin.TubeArchivistMetadata.Utilities
 
             return description;
         }
+
+        /// <summary>
+        /// Get video name from file path on the disk.
+        /// </summary>
+        /// <param name="path">File path on disk.</param>
+        /// <returns>The video name.</returns>
+        public static string GetVideoNameFromPath(string path)
+        {
+            return path.Split(DetectDirectorySeparator(path)).Last().Split(".").First();
+        }
+
+        /// <summary>
+        /// Get channel name from directory path on the disk.
+        /// </summary>
+        /// <param name="path">Directory path on disk.</param>
+        /// <returns>The channel name.</returns>
+        public static string GetChannelNameFromPath(string path)
+        {
+            return path.Split(DetectDirectorySeparator(path)).Last();
+        }
+
+        private static char DetectDirectorySeparator(string path)
+        {
+            int backslashCount = path.Count(c => c == '\\');
+            int forwardSlashCount = path.Count(c => c == '/');
+
+            if (backslashCount > forwardSlashCount)
+            {
+                return '\\'; // Windows directory separator
+            }
+            else
+            {
+                return '/'; // Unix directory separator
+            }
+        }
     }
 }

README.md

@@ -30,11 +30,11 @@ The plugin interacts with TubeArchivist APIs to fetch videos and channels metada
 
 3. Go to the `Catalog` tab
 4. Find `TubeArchivistMetadata` in the `Metadata` section and install it
-![Find plugin](https://github.com/tubearchivist/tubearchivist-jf-plugin/assets/31162436/86897215-bac5-4cef-8bd3-ffec731b0875)
+![Find plugin](https://github.com/tubearchivist/tubearchivist-jf-plugin/assets/31162436/a30a14c2-33cd-44c1-b96a-406662726e5e)
 5. Restart Jellyfin to apply the changes
 
 ### From ZIP in GitHub releases
-1. Download the latest available release (`TubeArchivistMetadata-*.zip`) from the repository releases section
+1. Download the latest available release (`tubearchivistmetadata_*.zip`) from the repository releases section
 2. Extract the contained files in the `plugins/TubeArchivistMetadata` folder (you might need to create the folders) of your Jellyfin installation
 3. Restart Jellyfin to apply the changes
 
@@ -68,7 +68,7 @@ _NOTE: If you are using Docker containers, it is important to mount the TubeArch
 
 2. Build plugin with following command
   ```
-  dotnet publish Jellyfin.Plugin.tubearchivist-jf-plugin --configuration Release --output bin
+  $ dotnet publish Jellyfin.Plugin.TubeArchivistMetadata --configuration Release --output bin
   ```
 
 3. Place the dll-file in the `plugins/tubearchivist-jf-plugin` folder (you might need to create the folders) of your Jellyfin installation

TubeArchivistMetadata.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Plugin.TubeArchivistMetadata", "Jellyfin.Plugin.TubeArchivistMetadata\Jellyfin.Plugin.TubeArchivistMetadata.csproj", "{7A112ACB-79E8-4FC9-BCF6-B3AC849DA2D4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7A112ACB-79E8-4FC9-BCF6-B3AC849DA2D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A112ACB-79E8-4FC9-BCF6-B3AC849DA2D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A112ACB-79E8-4FC9-BCF6-B3AC849DA2D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A112ACB-79E8-4FC9-BCF6-B3AC849DA2D4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

build.yaml

@@ -1,7 +1,8 @@
 ---
 name: "TubeArchivistMetadata"
 guid: "dc97d0c6-28b0-4242-afb4-5833ae1b3715"
-version: "1.2.3.0"
+imageUrl: https://raw.githubusercontent.com/tubearchivist/tubearchivist-jf-plugin/master/images/logo.png
+version: "1.2.4.0"
 targetAbi: "10.8.0.0"
 framework: "net6.0"
 overview: "Metadata for your TubeArchivist library on Jellyfin"
@@ -13,4 +14,4 @@ owner: "DarkFighterLuke"
 artifacts:
 - "Jellyfin.Plugin.TubeArchivistMetadata.dll"
 changelog: >
-  Add fix for unclosed HTML breaks
+  Fix issues with directory separators

manifest.json

@@ -3,7 +3,7 @@
         "category": "Metadata",
         "guid": "dc97d0c6-28b0-4242-afb4-5833ae1b3715",
         "name": "TubeArchivistMetadata",
-        "description": "A new and fully integrated way to manage metadata and organize your TubeArchivist library videos on Jellyfin.",
+        "description": "TubeArchivistMetadata is a plugin that automatically manages metadata for videos downloaded with TubeArchivist from YouTube.\n",
         "owner": "DarkFighterLuke",
         "overview": "Metadata for your TubeArchivist library on Jellyfin",
         "imageUrl": "https://raw.githubusercontent.com/tubearchivist/tubearchivist-jf-plugin/master/images/logo.png",