From 48bfec8d326fa9cda70870758e63a60057d1717c Mon Sep 17 00:00:00 2001 From: TwistedUmbrellaX Date: Thu, 16 May 2024 18:24:36 +0200 Subject: [PATCH] Movin on up (movin on up) #166 --- .../Plugin.cs | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs index c0faf16..cef2d2e 100644 --- a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs +++ b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs @@ -58,15 +58,27 @@ public class Plugin : BasePlugin, IHasWebPages ArgumentNullException.ThrowIfNull(applicationPaths); - var introsDirectory = Path.Join(applicationPaths.CachePath, "introskipper"); - FingerprintCachePath = Path.Join(introsDirectory, "chromaprints"); - _introPath = Path.Join(applicationPaths.CachePath, "introskipper", "intros.xml"); - _creditsPath = Path.Join(applicationPaths.CachePath, "introskipper", "credits.xml"); + var pluginDirName = "introskipper"; + var pluginCachePath = "chromaprints"; - var oldIntrosDirectory = Path.Join(applicationPaths.PluginConfigurationsPath, "intros"); - var oldFingerprintCachePath = Path.Join(oldIntrosDirectory, "cache"); - var oldIntroPath = Path.Join(applicationPaths.PluginConfigurationsPath, "intros", "intros.xml"); - var oldCreditsPath = Path.Join(applicationPaths.PluginConfigurationsPath, "intros", "credits.xml"); + var introsDirectory = Path.Join(applicationPaths.DataPath, pluginDirName); + FingerprintCachePath = Path.Join(introsDirectory, pluginCachePath); + _introPath = Path.Join(applicationPaths.DataPath, pluginDirName, "intros.xml"); + _creditsPath = Path.Join(applicationPaths.DataPath, pluginDirName, "credits.xml"); + + var cacheRoot = applicationPaths.CachePath; + var oldIntrosDirectory = Path.Join(cacheRoot, pluginDirName); + if (!Directory.Exists(oldIntrosDirectory)) + { + pluginDirName = "intros"; + pluginCachePath = "cache"; + cacheRoot = applicationPaths.PluginConfigurationsPath; + oldIntrosDirectory = Path.Join(cacheRoot, pluginDirName); + } + + var oldFingerprintCachePath = Path.Join(oldIntrosDirectory, pluginCachePath); + var oldIntroPath = Path.Join(cacheRoot, pluginDirName, "intros.xml"); + var oldCreditsPath = Path.Join(cacheRoot, pluginDirName, "credits.xml"); // Create the base & cache directories (if needed). if (!Directory.Exists(FingerprintCachePath))