.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,54 @@
+name: "Bug report"
+description: "Create a report to help us improve"
+labels: [bug]
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: Also tell us, what did you expect to happen?
+      placeholder: |
+        The more information that you are able to provide, the better. Did you do anything before this happened? Did you upgrade or change anything? Any screenshots or logs you can provide will be helpful.
+
+        This is my issue.
+
+        Steps to Reproduce
+          1. In this environment...
+          2. With this config...
+          3. Run '...'
+          4. See error...
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Operating system
+      placeholder: Debian 11, Windows 11, etc.
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Jellyfin installation method
+      placeholder: Docker, Windows installer, etc.
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Container image and tag
+      description: Only fill in this field if you are running Jellyfin in a container
+      placeholder: jellyfin/jellyfin:10.8.7, jellyfin-intro-skipper:latest, etc.
+
+  - type: textarea
+    attributes:
+      label: Support Bundle
+      placeholder: go to Dashboard -> Plugins -> Intro Skipper -> Support Bundle (at the bottom of the page) and paste the contents of the textbox here
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Jellyfin logs
+      placeholder: Paste any relevant logs here
+      render: shell
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,6 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feature] "
 labels: enhancement
 assignees: ''
 

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: 'Build Plugin'
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "analyzers" ]
   pull_request:
     branches: [ "master" ]
 
@@ -29,7 +29,7 @@ jobs:
       run: dotnet build --no-restore
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3.1.0
+      uses: actions/upload-artifact@v3.1.2
       with:
         name: intro-skipper-${{ github.sha }}.dll
         path: ConfusedPolarBear.Plugin.IntroSkipper/bin/Debug/net6.0/ConfusedPolarBear.Plugin.IntroSkipper.dll

.github/workflows/container.yml

@@ -7,77 +7,112 @@ on:
 
 env:
   REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository_owner }}/jellyfin-intro-skipper
 
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
+      contents: read
       packages: write
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
+        jellyfin-container-version: [10.8.10]
+        jellyfin-web-version: [10.8.10]
 
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-    - name: Login to GHCR
-      uses: docker/login-action@v2.0.0
-      with:
-        registry: ${{ env.REGISTRY }}
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
+      - name: Get npm cache directory
+        id: npm-cache-dir
+        run: |
+          echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Configure npm cache
+        uses: actions/cache@v3
+        id: npm-cache
+        with:
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Checkout modified web interface
+        uses: actions/checkout@v3
+        with:
+          repository: ConfusedPolarBear/jellyfin-web
+          ref: intros
+          path: web
 
-    - name: Get npm cache directory
-      id: npm-cache-dir
-      run: |
-        echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Store commit of web interface
+        id: web-commit
+        run: |
+          cd web
+          echo "commit=$(git log -1 --format='%H' | cut -c -10)" >> $GITHUB_OUTPUT
+      - name: Build and copy web interface
+        run: |
+          cd web
+          npm install
+          cp -r dist ../docker/
+          tar czf dist.tar.gz dist
+      - name: Upload web interface
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: jellyfin-web-${{ matrix.jellyfin-web-version }}+${{ steps.web-commit.outputs.commit }}.tar.gz
+          path: web/dist.tar.gz
+          if-no-files-found: error
 
-    - name: Configure npm cache
-      uses: actions/cache@v3
-      id: npm-cache
-      with:
-        path: ${{ steps.npm-cache-dir.outputs.dir }}
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-    - name: Checkout modified web interface
-      uses: actions/checkout@v3
-      with:
-        repository: ConfusedPolarBear/jellyfin-web
-        ref: intros
-        path: web
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
 
-    - name: Store commit of web interface
-      id: web-commit
-      run: |
-        cd web
-        echo "commit=$(git log -1 --format='%H' | cut -c -10)" >> $GITHUB_OUTPUT
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into ghcr.io registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Build and copy web interface
-      run: |
-        cd web
-        npm install
-        cp -r dist ../docker/
-        tar czf dist.tar.gz dist
-
-    - name: Upload web interface
-      uses: actions/upload-artifact@v3.1.0
-      with:
-        name: jellyfin-web-10.8.0+${{ steps.web-commit.outputs.commit }}.tar.gz
-        path: web/dist.tar.gz
-        if-no-files-found: error
-
-    - name: Publish container
-      uses: docker/build-push-action@v3.1.1
-      with:
-        file: docker/Dockerfile
-        context: docker/
-        push: true
-        tags: ${{ env.REGISTRY}}/confusedpolarbear/jellyfin-intro-skipper:${{ steps.web-commit.outputs.commit }}
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type-raw,value=${{ steps.web-commit.outputs.commit }}
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}},value=${{ matrix.jellyfin-container-version }}
+      # Build and push Docker image with Buildx
+      # https://github.com/docker/build-push-action
+      - name: Publish container image
+        id: build-and-push
+        uses: docker/build-push-action@v4.0.0
+        with:
+          file: docker/Dockerfile
+          context: docker
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            JELLYFIN_TAG=${{ matrix.jellyfin-container-version }}
+          platforms: |
+            linux/amd64
+            linux/arm/v7
+            linux/arm64/v8
+          push: ${{ github.event_name != 'pull_request' }}
+          pull: true
+          no-cache: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          provenance: false

.github/workflows/publish.yml

@@ -5,9 +5,7 @@ on:
 
 jobs:
   build:
-
-    # 18.04 = bionic LTS, supported until April 2023
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     # set fetch-depth to 0 in order to clone all tags instead of just the current commit
@@ -34,7 +32,7 @@ jobs:
       run: .github/workflows/package.sh ${{ steps.tag.outputs.tag }}
 
     - name: Upload plugin archive
-      uses: actions/upload-artifact@v3.1.0
+      uses: actions/upload-artifact@v3.1.2
       with:
         name: intro-skipper-bundle-${{ steps.tag.outputs.tag }}.zip
         path: |

ACKNOWLEDGEMENTS.md

@@ -0,0 +1,6 @@
+Intro Skipper is made possible by the following open source projects:
+
+* [acoustid-match](https://github.com/dnknth/acoustid-match) (MIT)
+* [chromaprint](https://github.com/acoustid/chromaprint) (LGPL 2.1)
+* [JellyScrub](https://github.com/nicknsy/jellyscrub) (MIT)
+* [Jellyfin](https://github.com/jellyfin/jellyfin) (GPL)

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.1.8.0 (no eta)
+* New features
+  * Support adding skip intro button to web interface without using a fork
+  * Add localization support for the skip intro button and the automatic skip notification message
+  * Detect ending credits in television episodes
+  * Add support for using chapter names to locate introductions and ending credits
+  * Add support for using black frames to locate ending credits
+  * Show skip button when on screen controls are visible (#149 by @DualScorch)
+* Internal changes
+  * Move Chromaprint analysis code out of the episode analysis task
+  * Add support for multiple analysis techinques
+
 ## v0.1.7.0 (2022-10-26)
 * New features
   * Rewrote fingerprint comparison algorithm to be faster (~30x speedup) and detect more introductions

ConfusedPolarBear.Plugin.IntroSkipper.Tests/ConfusedPolarBear.Plugin.IntroSkipper.Tests.csproj

@@ -1,27 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ConfusedPolarBear.Plugin.IntroSkipper\ConfusedPolarBear.Plugin.IntroSkipper.csproj" />
-  </ItemGroup>
-
-</Project>
+  </ItemGroup>
+
+</Project>