diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1457ee..1275820 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,9 +69,9 @@ jobs: - name: Minify HTML run: | - npx html-minifier-terser --collapse-boolean-attributes --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html - npx terser ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js -c -m - npx terser ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js -c -m + npx html-minifier-terser --collapse-boolean-attributes --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true -o IntroSkipper/Configuration/configPage.html IntroSkipper/Configuration/configPage.html + npx terser IntroSkipper/Configuration/inject.js -o IntroSkipper/Configuration/inject.js -c -m + npx terser IntroSkipper/Configuration/visualizer.js -o IntroSkipper/Configuration/visualizer.js -c -m - name: Restore Beta dependencies if: ${{env.IS_BETA == 'true' }} @@ -87,7 +87,7 @@ jobs: - name: Embed version info run: | GITHUB_SHA=${{ github.sha }} - sed -i "s/string\.Empty/\"$GITHUB_SHA\"/g" ConfusedPolarBear.Plugin.IntroSkipper/Helper/Commit.cs + sed -i "s/string\.Empty/\"$GITHUB_SHA\"/g" IntroSkipper/Helper/Commit.cs - name: Retrieve commit identification run: | @@ -101,22 +101,22 @@ jobs: uses: actions/upload-artifact@v4.3.6 if: github.event_name != 'pull_request' with: - name: ConfusedPolarBear.Plugin.IntroSkipper-${{ env.GIT_HASH }}.dll - path: ConfusedPolarBear.Plugin.IntroSkipper/bin/Debug/net8.0/ConfusedPolarBear.Plugin.IntroSkipper.dll + name: IntroSkipper-${{ env.GIT_HASH }}.dll + path: IntroSkipper/bin/Debug/net8.0/IntroSkipper.dll if-no-files-found: error - name: Upload artifact uses: actions/upload-artifact@v4.3.6 if: github.event_name == 'pull_request' with: - name: ConfusedPolarBear.Plugin.IntroSkipper-${{ env.SANITIZED_BRANCH_NAME }}.dll - path: ConfusedPolarBear.Plugin.IntroSkipper/bin/Debug/net8.0/ConfusedPolarBear.Plugin.IntroSkipper.dll + name: IntroSkipper-${{ env.SANITIZED_BRANCH_NAME }}.dll + path: IntroSkipper/bin/Debug/net8.0/IntroSkipper.dll retention-days: 7 if-no-files-found: error - name: Create archive if: github.event_name != 'pull_request' - run: zip -j "intro-skipper-${{ env.GIT_HASH }}.zip" ConfusedPolarBear.Plugin.IntroSkipper/bin/Debug/net8.0/ConfusedPolarBear.Plugin.IntroSkipper.dll + run: zip -j "intro-skipper-${{ env.GIT_HASH }}.zip" IntroSkipper/bin/Debug/net8.0/IntroSkipper.dll - name: Create/replace the preview release and upload artifacts if: github.event_name != 'pull_request' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 134c91c..f17ced9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,9 +42,9 @@ jobs: - name: Minify HTML run: | - npx html-minifier-terser --collapse-boolean-attributes --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html - npx terser ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js -c -m - npx terser ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js -o ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js -c -m + npx html-minifier-terser --collapse-boolean-attributes --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true -o IntroSkipper/Configuration/configPage.html IntroSkipper/Configuration/configPage.html + npx terser IntroSkipper/Configuration/inject.js -o IntroSkipper/Configuration/inject.js -c -m + npx terser IntroSkipper/Configuration/visualizer.js -o IntroSkipper/Configuration/visualizer.js -c -m - name: Restore Beta dependencies if: ${{env.IS_BETA == 'true' }} @@ -65,13 +65,13 @@ jobs: - name: Embed version info run: | GITHUB_SHA=${{ github.sha }} - sed -i "s/string\.Empty/\"$GITHUB_SHA\"/g" ConfusedPolarBear.Plugin.IntroSkipper/Helper/Commit.cs + sed -i "s/string\.Empty/\"$GITHUB_SHA\"/g" IntroSkipper/Helper/Commit.cs - name: Build run: dotnet build --configuration Release --no-restore - name: Create archive - run: zip -j "intro-skipper-v${{ env.NEW_FILE_VERSION }}.zip" ConfusedPolarBear.Plugin.IntroSkipper/bin/Release/net8.0/ConfusedPolarBear.Plugin.IntroSkipper.dll + run: zip -j "intro-skipper-v${{ env.NEW_FILE_VERSION }}.zip" IntroSkipper/bin/Release/net8.0/IntroSkipper.dll - name: Remove old release if exits if: ${{ github.repository == 'intro-skipper/intro-skipper-test' }} @@ -105,6 +105,6 @@ jobs: run: | git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" - git add README.md manifest.json ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj .github/ISSUE_TEMPLATE/bug_report_form.yml + git add README.md manifest.json IntroSkipper/IntroSkipper.csproj .github/ISSUE_TEMPLATE/bug_report_form.yml git commit -m "release v${{ env.NEW_FILE_VERSION }}" git push diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/ConfusedPolarBear.Plugin.IntroSkipper.Tests.csproj b/IntroSkipper.Tests/IntroSkipper.Tests.csproj similarity index 87% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/ConfusedPolarBear.Plugin.IntroSkipper.Tests.csproj rename to IntroSkipper.Tests/IntroSkipper.Tests.csproj index b6fa741..d4927b6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/ConfusedPolarBear.Plugin.IntroSkipper.Tests.csproj +++ b/IntroSkipper.Tests/IntroSkipper.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs b/IntroSkipper.Tests/TestAudioFingerprinting.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs rename to IntroSkipper.Tests/TestAudioFingerprinting.cs index b3c354a..a8bb4dd 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestAudioFingerprinting.cs +++ b/IntroSkipper.Tests/TestAudioFingerprinting.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; -using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Analyzers; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; using Xunit; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; public class TestAudioFingerprinting { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs b/IntroSkipper.Tests/TestBlackFrames.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs rename to IntroSkipper.Tests/TestBlackFrames.cs index aac27a0..93b390a 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestBlackFrames.cs +++ b/IntroSkipper.Tests/TestBlackFrames.cs @@ -1,9 +1,9 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; using System; using System.Collections.Generic; -using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Analyzers; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; using Xunit; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs b/IntroSkipper.Tests/TestChapterAnalyzer.cs similarity index 94% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs rename to IntroSkipper.Tests/TestChapterAnalyzer.cs index afdb811..a20406c 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestChapterAnalyzer.cs +++ b/IntroSkipper.Tests/TestChapterAnalyzer.cs @@ -1,10 +1,10 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Analyzers; +using IntroSkipper.Data; using MediaBrowser.Model.Entities; using Microsoft.Extensions.Logging; using Xunit; diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs b/IntroSkipper.Tests/TestContiguous.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs rename to IntroSkipper.Tests/TestContiguous.cs index fb59010..cb59d52 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestContiguous.cs +++ b/IntroSkipper.Tests/TestContiguous.cs @@ -1,7 +1,7 @@ -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Xunit; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; public class TestTimeRanges { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs b/IntroSkipper.Tests/TestEdl.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs rename to IntroSkipper.Tests/TestEdl.cs index fe86c00..9269151 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestEdl.cs +++ b/IntroSkipper.Tests/TestEdl.cs @@ -1,8 +1,8 @@ using System; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Xunit; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; public class TestEdl { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs b/IntroSkipper.Tests/TestWarnings.cs similarity index 94% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs rename to IntroSkipper.Tests/TestWarnings.cs index 9dde767..827c1ec 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/TestWarnings.cs +++ b/IntroSkipper.Tests/TestWarnings.cs @@ -1,6 +1,6 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Tests; +namespace IntroSkipper.Tests; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Xunit; public class TestFlags diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/README.txt b/IntroSkipper.Tests/audio/README.txt similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/README.txt rename to IntroSkipper.Tests/audio/README.txt diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/big_buck_bunny_clip.mp3 b/IntroSkipper.Tests/audio/big_buck_bunny_clip.mp3 similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/big_buck_bunny_clip.mp3 rename to IntroSkipper.Tests/audio/big_buck_bunny_clip.mp3 diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/big_buck_bunny_intro.mp3 b/IntroSkipper.Tests/audio/big_buck_bunny_intro.mp3 similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/audio/big_buck_bunny_intro.mp3 rename to IntroSkipper.Tests/audio/big_buck_bunny_intro.mp3 diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/.gitignore b/IntroSkipper.Tests/e2e_tests/.gitignore similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/.gitignore rename to IntroSkipper.Tests/e2e_tests/.gitignore diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/README.md b/IntroSkipper.Tests/e2e_tests/README.md similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/README.md rename to IntroSkipper.Tests/e2e_tests/README.md diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/build.sh b/IntroSkipper.Tests/e2e_tests/build.sh old mode 100755 new mode 100644 similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/build.sh rename to IntroSkipper.Tests/e2e_tests/build.sh diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/config_sample.jsonc b/IntroSkipper.Tests/e2e_tests/config_sample.jsonc similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/config_sample.jsonc rename to IntroSkipper.Tests/e2e_tests/config_sample.jsonc diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/docker-compose.yml b/IntroSkipper.Tests/e2e_tests/docker-compose.yml similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/docker-compose.yml rename to IntroSkipper.Tests/e2e_tests/docker-compose.yml diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/reports/.keep b/IntroSkipper.Tests/e2e_tests/reports/.keep similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/reports/.keep rename to IntroSkipper.Tests/e2e_tests/reports/.keep diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/main.py b/IntroSkipper.Tests/e2e_tests/selenium/main.py similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/main.py rename to IntroSkipper.Tests/e2e_tests/selenium/main.py diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/requirements.txt b/IntroSkipper.Tests/e2e_tests/selenium/requirements.txt similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/requirements.txt rename to IntroSkipper.Tests/e2e_tests/selenium/requirements.txt diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/screenshots/.keep b/IntroSkipper.Tests/e2e_tests/selenium/screenshots/.keep similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/selenium/screenshots/.keep rename to IntroSkipper.Tests/e2e_tests/selenium/screenshots/.keep diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/go.mod b/IntroSkipper.Tests/e2e_tests/verifier/go.mod similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/go.mod rename to IntroSkipper.Tests/e2e_tests/verifier/go.mod diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/http.go b/IntroSkipper.Tests/e2e_tests/verifier/http.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/http.go rename to IntroSkipper.Tests/e2e_tests/verifier/http.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/main.go b/IntroSkipper.Tests/e2e_tests/verifier/main.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/main.go rename to IntroSkipper.Tests/e2e_tests/verifier/main.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report.html b/IntroSkipper.Tests/e2e_tests/verifier/report.html similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report.html rename to IntroSkipper.Tests/e2e_tests/verifier/report.html diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_comparison.go b/IntroSkipper.Tests/e2e_tests/verifier/report_comparison.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_comparison.go rename to IntroSkipper.Tests/e2e_tests/verifier/report_comparison.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_comparison_util.go b/IntroSkipper.Tests/e2e_tests/verifier/report_comparison_util.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_comparison_util.go rename to IntroSkipper.Tests/e2e_tests/verifier/report_comparison_util.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_generator.go b/IntroSkipper.Tests/e2e_tests/verifier/report_generator.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/report_generator.go rename to IntroSkipper.Tests/e2e_tests/verifier/report_generator.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/schema_validation.go b/IntroSkipper.Tests/e2e_tests/verifier/schema_validation.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/schema_validation.go rename to IntroSkipper.Tests/e2e_tests/verifier/schema_validation.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/intro.go b/IntroSkipper.Tests/e2e_tests/verifier/structs/intro.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/intro.go rename to IntroSkipper.Tests/e2e_tests/verifier/structs/intro.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/plugin_configuration.go b/IntroSkipper.Tests/e2e_tests/verifier/structs/plugin_configuration.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/plugin_configuration.go rename to IntroSkipper.Tests/e2e_tests/verifier/structs/plugin_configuration.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/public_info.go b/IntroSkipper.Tests/e2e_tests/verifier/structs/public_info.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/public_info.go rename to IntroSkipper.Tests/e2e_tests/verifier/structs/public_info.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/report.go b/IntroSkipper.Tests/e2e_tests/verifier/structs/report.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/verifier/structs/report.go rename to IntroSkipper.Tests/e2e_tests/verifier/structs/report.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/exec.go b/IntroSkipper.Tests/e2e_tests/wrapper/exec.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/exec.go rename to IntroSkipper.Tests/e2e_tests/wrapper/exec.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/exec_test.go b/IntroSkipper.Tests/e2e_tests/wrapper/exec_test.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/exec_test.go rename to IntroSkipper.Tests/e2e_tests/wrapper/exec_test.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/go.mod b/IntroSkipper.Tests/e2e_tests/wrapper/go.mod similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/go.mod rename to IntroSkipper.Tests/e2e_tests/wrapper/go.mod diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/library.json b/IntroSkipper.Tests/e2e_tests/wrapper/library.json similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/library.json rename to IntroSkipper.Tests/e2e_tests/wrapper/library.json diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/main.go b/IntroSkipper.Tests/e2e_tests/wrapper/main.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/main.go rename to IntroSkipper.Tests/e2e_tests/wrapper/main.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/setup.go b/IntroSkipper.Tests/e2e_tests/wrapper/setup.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/setup.go rename to IntroSkipper.Tests/e2e_tests/wrapper/setup.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/structs.go b/IntroSkipper.Tests/e2e_tests/wrapper/structs.go similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/e2e_tests/wrapper/structs.go rename to IntroSkipper.Tests/e2e_tests/wrapper/structs.go diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/video/credits.mp4 b/IntroSkipper.Tests/video/credits.mp4 similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/video/credits.mp4 rename to IntroSkipper.Tests/video/credits.mp4 diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.Tests/video/rainbow.mp4 b/IntroSkipper.Tests/video/rainbow.mp4 similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper.Tests/video/rainbow.mp4 rename to IntroSkipper.Tests/video/rainbow.mp4 diff --git a/ConfusedPolarBear.Plugin.IntroSkipper.sln b/IntroSkipper.sln similarity index 68% rename from ConfusedPolarBear.Plugin.IntroSkipper.sln rename to IntroSkipper.sln index 394a21f..2df438e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper.sln +++ b/IntroSkipper.sln @@ -1,8 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfusedPolarBear.Plugin.IntroSkipper", "ConfusedPolarBear.Plugin.IntroSkipper\ConfusedPolarBear.Plugin.IntroSkipper.csproj", "{D921B930-CF91-406F-ACBC-08914DCD0D34}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntroSkipper", "IntroSkipper\IntroSkipper.csproj", "{D921B930-CF91-406F-ACBC-08914DCD0D34}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfusedPolarBear.Plugin.IntroSkipper.Tests", "ConfusedPolarBear.Plugin.IntroSkipper.Tests\ConfusedPolarBear.Plugin.IntroSkipper.Tests.csproj", "{9E30DA42-983E-46E0-A3BF-A2BA56FE9718}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntroSkipper.Tests", "IntroSkipper.Tests\IntroSkipper.Tests.csproj", "{9E30DA42-983E-46E0-A3BF-A2BA56FE9718}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs b/IntroSkipper/Analyzers/AnalyzerHelper.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs rename to IntroSkipper/Analyzers/AnalyzerHelper.cs index d7829de..410f7b6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs +++ b/IntroSkipper/Analyzers/AnalyzerHelper.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Analyzer Helper. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs b/IntroSkipper/Analyzers/BlackFrameAnalyzer.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs rename to IntroSkipper/Analyzers/BlackFrameAnalyzer.cs index 8027450..aad9eac 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs +++ b/IntroSkipper/Analyzers/BlackFrameAnalyzer.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +namespace IntroSkipper.Analyzers; /// /// Media file analyzer used to detect end credits that consist of text overlaid on a black background. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs b/IntroSkipper/Analyzers/ChapterAnalyzer.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs rename to IntroSkipper/Analyzers/ChapterAnalyzer.cs index 88a121c..5fe2ffa 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs +++ b/IntroSkipper/Analyzers/ChapterAnalyzer.cs @@ -5,12 +5,12 @@ using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using System.Threading; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using MediaBrowser.Model.Entities; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +namespace IntroSkipper.Analyzers; /// /// Chapter name analyzer. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs b/IntroSkipper/Analyzers/ChromaprintAnalyzer.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs rename to IntroSkipper/Analyzers/ChromaprintAnalyzer.cs index cc4e1a9..9c5899e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs +++ b/IntroSkipper/Analyzers/ChromaprintAnalyzer.cs @@ -4,11 +4,11 @@ using System.IO; using System.Linq; using System.Numerics; using System.Threading; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +namespace IntroSkipper.Analyzers; /// /// Chromaprint audio analyzer. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs b/IntroSkipper/Analyzers/IMediaFileAnalyzer.cs similarity index 88% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs rename to IntroSkipper/Analyzers/IMediaFileAnalyzer.cs index 9c97c4f..f67b3cb 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs +++ b/IntroSkipper/Analyzers/IMediaFileAnalyzer.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +namespace IntroSkipper.Analyzers; /// /// Media file analyzer interface. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs b/IntroSkipper/Analyzers/SegmentAnalyzer.cs similarity index 87% rename from ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs rename to IntroSkipper/Analyzers/SegmentAnalyzer.cs index 0b20f25..67be5d6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs +++ b/IntroSkipper/Analyzers/SegmentAnalyzer.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; +namespace IntroSkipper.Analyzers; /// /// Chapter name analyzer. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs b/IntroSkipper/Configuration/PluginConfiguration.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs rename to IntroSkipper/Configuration/PluginConfiguration.cs index 16306ea..852da07 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs +++ b/IntroSkipper/Configuration/PluginConfiguration.cs @@ -1,8 +1,8 @@ using System.Diagnostics; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using MediaBrowser.Model.Plugins; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +namespace IntroSkipper.Configuration; /// /// Plugin configuration. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/UserInterfaceConfiguration.cs b/IntroSkipper/Configuration/UserInterfaceConfiguration.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Configuration/UserInterfaceConfiguration.cs rename to IntroSkipper/Configuration/UserInterfaceConfiguration.cs index e854257..7fac79d 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/UserInterfaceConfiguration.cs +++ b/IntroSkipper/Configuration/UserInterfaceConfiguration.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +namespace IntroSkipper.Configuration; /// /// User interface configuration. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html b/IntroSkipper/Configuration/configPage.html similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html rename to IntroSkipper/Configuration/configPage.html diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js b/IntroSkipper/Configuration/inject.js similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper/Configuration/inject.js rename to IntroSkipper/Configuration/inject.js diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js b/IntroSkipper/Configuration/visualizer.js similarity index 100% rename from ConfusedPolarBear.Plugin.IntroSkipper/Configuration/visualizer.js rename to IntroSkipper/Configuration/visualizer.js diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/SkipIntroController.cs b/IntroSkipper/Controllers/SkipIntroController.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Controllers/SkipIntroController.cs rename to IntroSkipper/Controllers/SkipIntroController.cs index 03a5c20..c0537a6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/SkipIntroController.cs +++ b/IntroSkipper/Controllers/SkipIntroController.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Net.Mime; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using MediaBrowser.Common.Api; using MediaBrowser.Controller.Entities.TV; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Controllers; +namespace IntroSkipper.Controllers; /// /// Skip intro controller. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs b/IntroSkipper/Controllers/TroubleshootingController.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs rename to IntroSkipper/Controllers/TroubleshootingController.cs index 24fc87d..4eb0bd0 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/TroubleshootingController.cs +++ b/IntroSkipper/Controllers/TroubleshootingController.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.IO; using System.Net.Mime; using System.Text; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; -using ConfusedPolarBear.Plugin.IntroSkipper.Helper; +using IntroSkipper.Data; +using IntroSkipper.Helper; using MediaBrowser.Common; using MediaBrowser.Common.Api; using MediaBrowser.Controller.Library; @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Controllers; +namespace IntroSkipper.Controllers; /// /// Troubleshooting controller. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/VisualizationController.cs b/IntroSkipper/Controllers/VisualizationController.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Controllers/VisualizationController.cs rename to IntroSkipper/Controllers/VisualizationController.cs index 5d3ae9f..4015d5d 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Controllers/VisualizationController.cs +++ b/IntroSkipper/Controllers/VisualizationController.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Net.Mime; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using MediaBrowser.Common.Api; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Controllers; +namespace IntroSkipper.Controllers; /// /// Audio fingerprint visualization controller. Allows browsing fingerprints on a per episode basis. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs b/IntroSkipper/Data/AnalysisMode.cs similarity index 83% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs rename to IntroSkipper/Data/AnalysisMode.cs index 7da010a..9abb7b9 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/AnalysisMode.cs +++ b/IntroSkipper/Data/AnalysisMode.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Type of media file analysis to perform. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs b/IntroSkipper/Data/BlackFrame.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs rename to IntroSkipper/Data/BlackFrame.cs index 5eefe24..99eb1db 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/BlackFrame.cs +++ b/IntroSkipper/Data/BlackFrame.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// A frame of video that partially (or entirely) consists of black pixels. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs b/IntroSkipper/Data/EdlAction.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs rename to IntroSkipper/Data/EdlAction.cs index 165b703..a6393ac 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EdlAction.cs +++ b/IntroSkipper/Data/EdlAction.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Taken from https://kodi.wiki/view/Edit_decision_list#MPlayer_EDL. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs b/IntroSkipper/Data/EpisodeState.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs rename to IntroSkipper/Data/EpisodeState.cs index b5fd801..a7e2491 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeState.cs +++ b/IntroSkipper/Data/EpisodeState.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Represents the state of an episode regarding analysis and blacklist status. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs b/IntroSkipper/Data/EpisodeVisualization.cs similarity index 91% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs rename to IntroSkipper/Data/EpisodeVisualization.cs index 0e67101..2e36a23 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/EpisodeVisualization.cs +++ b/IntroSkipper/Data/EpisodeVisualization.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Episode name and internal ID as returned by the visualization controller. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs b/IntroSkipper/Data/FingerprintException.cs similarity index 94% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs rename to IntroSkipper/Data/FingerprintException.cs index 5878cf2..4c94fc4 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/FingerprintException.cs +++ b/IntroSkipper/Data/FingerprintException.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Exception raised when an error is encountered analyzing audio. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/IgnoreListItem.cs b/IntroSkipper/Data/IgnoreListItem.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/IgnoreListItem.cs rename to IntroSkipper/Data/IgnoreListItem.cs index 933bd3d..4039815 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/IgnoreListItem.cs +++ b/IntroSkipper/Data/IgnoreListItem.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Represents an item to ignore. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs b/IntroSkipper/Data/Intro.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs rename to IntroSkipper/Data/Intro.cs index 912341f..5d19756 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Intro.cs +++ b/IntroSkipper/Data/Intro.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Result of fingerprinting and analyzing two episodes in a season. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs b/IntroSkipper/Data/PluginWarning.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs rename to IntroSkipper/Data/PluginWarning.cs index 02d68d5..6c9424f 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/PluginWarning.cs +++ b/IntroSkipper/Data/PluginWarning.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Support bundle warning. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs b/IntroSkipper/Data/QueuedEpisode.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs rename to IntroSkipper/Data/QueuedEpisode.cs index bab97be..1168e3a 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/QueuedEpisode.cs +++ b/IntroSkipper/Data/QueuedEpisode.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Episode queued for analysis. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Segment.cs b/IntroSkipper/Data/Segment.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/Segment.cs rename to IntroSkipper/Data/Segment.cs index 6862862..7ec3606 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/Segment.cs +++ b/IntroSkipper/Data/Segment.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Runtime.Serialization; using System.Text.Json.Serialization; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Result of fingerprinting and analyzing two episodes in a season. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/ShowInfos.cs b/IntroSkipper/Data/ShowInfos.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/ShowInfos.cs rename to IntroSkipper/Data/ShowInfos.cs index 99b0fa3..b48aa06 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/ShowInfos.cs +++ b/IntroSkipper/Data/ShowInfos.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Controllers +namespace IntroSkipper.Controllers { /// /// Contains information about a show. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs b/IntroSkipper/Data/TimeRange.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs rename to IntroSkipper/Data/TimeRange.cs index 2daae19..4b70ca1 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRange.cs +++ b/IntroSkipper/Data/TimeRange.cs @@ -1,6 +1,6 @@ using System; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; #pragma warning disable CA1036 // Override methods on comparable types diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs b/IntroSkipper/Data/TimeRangeHelpers.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs rename to IntroSkipper/Data/TimeRangeHelpers.cs index 5765516..f020f64 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeRangeHelpers.cs +++ b/IntroSkipper/Data/TimeRangeHelpers.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Time range helpers. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeStamps.cs b/IntroSkipper/Data/TimeStamps.cs similarity index 90% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeStamps.cs rename to IntroSkipper/Data/TimeStamps.cs index 6295578..344f665 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/TimeStamps.cs +++ b/IntroSkipper/Data/TimeStamps.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data +namespace IntroSkipper.Data { /// /// Result of fingerprinting and analyzing two episodes in a season. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs b/IntroSkipper/Data/WarningManager.cs similarity index 94% rename from ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs rename to IntroSkipper/Data/WarningManager.cs index 34afbeb..12a280e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Data/WarningManager.cs +++ b/IntroSkipper/Data/WarningManager.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Data; +namespace IntroSkipper.Data; /// /// Warning manager. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs b/IntroSkipper/FFmpegWrapper.cs similarity index 99% rename from ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs rename to IntroSkipper/FFmpegWrapper.cs index 789be1d..e83da36 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/FFmpegWrapper.cs +++ b/IntroSkipper/FFmpegWrapper.cs @@ -6,10 +6,10 @@ using System.Globalization; using System.IO; using System.Text; using System.Text.RegularExpressions; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Wrapper for libchromaprint and the silencedetect filter. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Helper/Commit.cs b/IntroSkipper/Helper/Commit.cs similarity index 84% rename from ConfusedPolarBear.Plugin.IntroSkipper/Helper/Commit.cs rename to IntroSkipper/Helper/Commit.cs index c83a3d5..e5cbc22 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Helper/Commit.cs +++ b/IntroSkipper/Helper/Commit.cs @@ -1,4 +1,4 @@ -namespace ConfusedPolarBear.Plugin.IntroSkipper.Helper +namespace IntroSkipper.Helper { /// /// Gets the commit used to build the plugin. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Helper/XmlSerializationHelper.cs b/IntroSkipper/Helper/XmlSerializationHelper.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Helper/XmlSerializationHelper.cs rename to IntroSkipper/Helper/XmlSerializationHelper.cs index f02d126..f4a2a9d 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Helper/XmlSerializationHelper.cs +++ b/IntroSkipper/Helper/XmlSerializationHelper.cs @@ -4,9 +4,9 @@ using System.IO; using System.Linq; using System.Runtime.Serialization; using System.Xml; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; -namespace ConfusedPolarBear.Plugin.IntroSkipper +namespace IntroSkipper { internal sealed class XmlSerializationHelper { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj b/IntroSkipper/IntroSkipper.csproj similarity index 94% rename from ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj rename to IntroSkipper/IntroSkipper.csproj index eff2ea0..d7e0ad0 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ConfusedPolarBear.Plugin.IntroSkipper.csproj +++ b/IntroSkipper/IntroSkipper.csproj @@ -1,7 +1,7 @@ net8.0 - ConfusedPolarBear.Plugin.IntroSkipper + IntroSkipper 1.0.0.7 1.0.0.7 true diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs b/IntroSkipper/Manager/EdlManager.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs rename to IntroSkipper/Manager/EdlManager.cs index dd8fc4b..8e43e34 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs +++ b/IntroSkipper/Manager/EdlManager.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.IO; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Update EDL files associated with a list of episodes. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs b/IntroSkipper/Manager/QueueManager.cs similarity index 99% rename from ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs rename to IntroSkipper/Manager/QueueManager.cs index 13e981c..96ce0bb 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs +++ b/IntroSkipper/Manager/QueueManager.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using Jellyfin.Data.Enums; using Jellyfin.Extensions; using MediaBrowser.Controller.Entities; @@ -10,7 +10,7 @@ using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Manages enqueuing library items for analysis. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs b/IntroSkipper/Plugin.cs similarity index 99% rename from ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs rename to IntroSkipper/Plugin.cs index 6009e2a..89ebb93 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs +++ b/IntroSkipper/Plugin.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Configuration; +using IntroSkipper.Data; using MediaBrowser.Common; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Plugins; @@ -19,7 +19,7 @@ using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Updates; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Intro skipper plugin. Uses audio analysis to find common sequences of audio shared between episodes. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/PluginServiceRegistrator.cs b/IntroSkipper/PluginServiceRegistrator.cs similarity index 92% rename from ConfusedPolarBear.Plugin.IntroSkipper/PluginServiceRegistrator.cs rename to IntroSkipper/PluginServiceRegistrator.cs index d3e45d5..0cc8b0a 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/PluginServiceRegistrator.cs +++ b/IntroSkipper/PluginServiceRegistrator.cs @@ -2,7 +2,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Plugins; using Microsoft.Extensions.DependencyInjection; -namespace ConfusedPolarBear.Plugin.IntroSkipper +namespace IntroSkipper { /// /// Register Intro Skipper services. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs b/IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs rename to IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs index 7f8c49f..b33556c 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs +++ b/IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs @@ -4,12 +4,12 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; using System.Threading.Tasks; -using ConfusedPolarBear.Plugin.IntroSkipper.Analyzers; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Analyzers; +using IntroSkipper.Data; using MediaBrowser.Controller.Library; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; /// /// Common code shared by all media item analyzer tasks. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs b/IntroSkipper/ScheduledTasks/CleanCacheTask.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs rename to IntroSkipper/ScheduledTasks/CleanCacheTask.cs index f644db1..11107c8 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/CleanCacheTask.cs +++ b/IntroSkipper/ScheduledTasks/CleanCacheTask.cs @@ -8,7 +8,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs b/IntroSkipper/ScheduledTasks/DetectCreditsTask.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs rename to IntroSkipper/ScheduledTasks/DetectCreditsTask.cs index 7706da4..674bcc3 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectCreditsTask.cs +++ b/IntroSkipper/ScheduledTasks/DetectCreditsTask.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for credits. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs b/IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs rename to IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs index 72e8fee..687ad96 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs +++ b/IntroSkipper/ScheduledTasks/DetectIntrosCreditsTask.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs b/IntroSkipper/ScheduledTasks/DetectIntrosTask.cs similarity index 96% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs rename to IntroSkipper/ScheduledTasks/DetectIntrosTask.cs index d7b17b1..2d6d679 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/DetectIntrosTask.cs +++ b/IntroSkipper/ScheduledTasks/DetectIntrosTask.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; +using IntroSkipper.Data; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; /// /// Analyze all television episodes for introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs b/IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs similarity index 87% rename from ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs rename to IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs index d89bbed..46fc3a6 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs +++ b/IntroSkipper/ScheduledTasks/ScheduledTaskSemaphore.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +namespace IntroSkipper.ScheduledTasks; internal sealed class ScheduledTaskSemaphore : IDisposable { diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkip.cs b/IntroSkipper/Services/AutoSkip.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkip.cs rename to IntroSkipper/Services/AutoSkip.cs index 13c7dc8..1bd7375 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkip.cs +++ b/IntroSkipper/Services/AutoSkip.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Timers; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using IntroSkipper.Configuration; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Session; @@ -15,7 +15,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Timer = System.Timers.Timer; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Automatically skip past introduction sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkipCredits.cs b/IntroSkipper/Services/AutoSkipCredits.cs similarity index 98% rename from ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkipCredits.cs rename to IntroSkipper/Services/AutoSkipCredits.cs index 36bdb04..b93e7bf 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Services/AutoSkipCredits.cs +++ b/IntroSkipper/Services/AutoSkipCredits.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Timers; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; +using IntroSkipper.Configuration; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Session; @@ -15,7 +15,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Timer = System.Timers.Timer; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Automatically skip past credit sequences. diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Services/Entrypoint.cs b/IntroSkipper/Services/Entrypoint.cs similarity index 97% rename from ConfusedPolarBear.Plugin.IntroSkipper/Services/Entrypoint.cs rename to IntroSkipper/Services/Entrypoint.cs index 5fc196a..01a6794 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Services/Entrypoint.cs +++ b/IntroSkipper/Services/Entrypoint.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using ConfusedPolarBear.Plugin.IntroSkipper.Configuration; -using ConfusedPolarBear.Plugin.IntroSkipper.Data; -using ConfusedPolarBear.Plugin.IntroSkipper.ScheduledTasks; +using IntroSkipper.Configuration; +using IntroSkipper.Data; +using IntroSkipper.ScheduledTasks; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; @@ -13,7 +13,7 @@ using MediaBrowser.Model.Tasks; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace ConfusedPolarBear.Plugin.IntroSkipper; +namespace IntroSkipper; /// /// Server entrypoint. diff --git a/install/install-dll.bat b/install/install-dll.bat index 45b994d..8c28a2f 100644 --- a/install/install-dll.bat +++ b/install/install-dll.bat @@ -21,7 +21,7 @@ GOTO UserInput :FoundFile echo "%NewestFile%" -xcopy /y ConfusedPolarBear.Plugin.IntroSkipper.dll "%NewestFile%" +xcopy /y IntroSkipper.dll "%NewestFile%" :UserInput @pause diff --git a/install/install-dll.sh b/install/install-dll.sh index dd63a6f..c319f89 100644 --- a/install/install-dll.sh +++ b/install/install-dll.sh @@ -6,8 +6,8 @@ if [ "$(uname)" == "Darwin" ]; then echo "Intro Skipper plugin not found!" exit fi - cp -f ConfusedPolarBear.Plugin.IntroSkipper*.dll \ - "$plugin/ConfusedPolarBear.Plugin.IntroSkipper.dll" + cp -f IntroSkipper*.dll \ + "$plugin/IntroSkipper.dll" else echo "Jellyfin plugin directory not found!" fi @@ -19,8 +19,8 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then echo "Intro Skipper plugin not found!" exit fi - cp -f ConfusedPolarBear.Plugin.IntroSkipper*.dll \ - "$plugin/ConfusedPolarBear.Plugin.IntroSkipper.dll" + cp -f IntroSkipper*.dll \ + "$plugin/IntroSkipper.dll" else echo "Jellyfin plugin directory not found!" fi