#33, #34, #56 Various bugfixes and changes in behavior

- Removed precaching completely - Workaround for MusicBee's insistance of calling GetFile() on folders - Workaround for MusicBee's opening of last used Folder/File on startup
BlitterStudio · Feb 5, 2021 · 80b116d · 80b116d
1 parent 52114b6
commit 80b116d
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 358 deletions.
diff --git a/MB_SubSonic/Domain/SubsonicSettings.cs b/MB_SubSonic/Domain/SubsonicSettings.cs
@@ -31,8 +31,6 @@ public enum ServerType
         public ConnectionProtocol Protocol { get; set; }
         public AuthMethod Auth { get; set; }
         public string BitRate { get; set; }
-        public bool UseIndexCache { get; set; }
-        public bool PreCacheAll { get; set; }
     }
 
     public static class SubsonicSettingsExtensions

diff --git a/MB_SubSonic/Helpers/FileHelper.cs b/MB_SubSonic/Helpers/FileHelper.cs
@@ -37,8 +37,6 @@ public static SubsonicSettings ReadSettingsFromFile(string settingsFilename)
                     if (string.IsNullOrEmpty(settings.BitRate))
                         settings.BitRate = "Unlimited";
 
-                    settings.UseIndexCache = AesEncryption.Decrypt(reader.ReadLine(), Passphrase) == "Y";
-
                     return settings;
                 }
             }
@@ -76,9 +74,6 @@ public static bool SaveSettingsToFile(SubsonicSettings settings, string filename
                             settings.Auth == SubsonicSettings.AuthMethod.HexPass ? "HexPass" : "Token",
                             Passphrase));
                     writer.WriteLine(AesEncryption.Encrypt(settings.BitRate, Passphrase));
-                    writer.WriteLine(settings.UseIndexCache
-                        ? AesEncryption.Encrypt("Y", Passphrase)
-                        : AesEncryption.Encrypt("N", Passphrase));
                     return true;
                 }
             }

diff --git a/MB_SubSonic/Helpers/SettingsHelper.cs b/MB_SubSonic/Helpers/SettingsHelper.cs
@@ -17,9 +17,7 @@ public static SubsonicSettings SetDefaultSettings()
                 Protocol = SubsonicSettings.ConnectionProtocol.Http,
                 Auth = SubsonicSettings.AuthMethod.Token,
                 BitRate = string.Empty,
-                Transcode = false,
-                UseIndexCache = true,
-                PreCacheAll = false
+                Transcode = false
             };
         }
 
@@ -34,9 +32,7 @@ public static bool IsSettingChanged(SubsonicSettings newSettings, SubsonicSettin
                          || !newSettings.Protocol.Equals(oldSettings.Protocol)
                          || !newSettings.Auth.Equals(oldSettings.Auth)
                          || !newSettings.Transcode.Equals(oldSettings.Transcode)
-                         || !newSettings.BitRate.Equals(oldSettings.BitRate)
-                         || !newSettings.UseIndexCache.Equals(oldSettings.UseIndexCache)
-                         || !newSettings.PreCacheAll.Equals(oldSettings.PreCacheAll);
+                         || !newSettings.BitRate.Equals(oldSettings.BitRate);
             return result;
         }
 

diff --git a/MB_SubSonic/Plugin.cs b/MB_SubSonic/Plugin.cs
@@ -23,7 +23,6 @@ public Interfaces.Plugin.PluginInfo Initialise(IntPtr apiInterfacePtr)
             _mbApiInterface = new Interfaces.Plugin.MusicBeeApiInterface();
             _mbApiInterface.Initialise(apiInterfacePtr);
             Subsonic.SendNotificationsHandler = _mbApiInterface.MB_SendNotification;
-            Subsonic.CreateBackgroundTask = _mbApiInterface.MB_CreateBackgroundTask;
             Subsonic.SetBackgroundTaskMessage = _mbApiInterface.MB_SetBackgroundTaskMessage;
             Subsonic.RefreshPanels = _mbApiInterface.MB_RefreshPanels;
             Subsonic.GetFileTag = _mbApiInterface.Library_GetFileTag;
@@ -37,7 +36,7 @@ public Interfaces.Plugin.PluginInfo Initialise(IntPtr apiInterfacePtr)
             // current only applies to artwork, lyrics or instant messenger name that appears in the provider drop down selector or target Instant Messenger
             _about.Type = Interfaces.Plugin.PluginType.Storage;
             _about.VersionMajor = 2; // your plugin version
-            _about.VersionMinor = 29;
+            _about.VersionMinor = 30;
             _about.Revision = 0;
             _about.MinInterfaceVersion = Interfaces.Plugin.MinInterfaceVersion;
             _about.MinApiRevision = Interfaces.Plugin.MinApiRevision;
@@ -94,7 +93,6 @@ public void ReceiveNotification(string sourceFileUrl, Interfaces.Plugin.Notifica
             {
                 case Interfaces.Plugin.NotificationType.PluginStartup:
                     var dataPath = _mbApiInterface.Setting_GetPersistentStoragePath();
-                    Subsonic.CacheFilename = Path.Combine(dataPath, "subsonicCache.dat");
                     Subsonic.SettingsFilename = Path.Combine(dataPath, "subsonicSettings.dat");
 
                     Subsonic.SendNotificationsHandler.Invoke(Subsonic.Initialize()

diff --git a/MB_SubSonic/Properties/AssemblyInfo.cs b/MB_SubSonic/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Blitter Studio")]
 [assembly: AssemblyProduct("MB_SubSonic")]
-[assembly: AssemblyCopyright("Copyright © Dimitris Panokostas 2016-2019")]
+[assembly: AssemblyCopyright("Copyright © Dimitris Panokostas 2016-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.29.0.0")]
-[assembly: AssemblyFileVersion("2.29.0.0")]
+[assembly: AssemblyVersion("2.30.0.0")]
+[assembly: AssemblyFileVersion("2.30.0.0")]