Merge pull request #21 from cjmanca/in-progress

Handle invalid library section availability #20

Author: cjmanca

plex-credits-detect/Database/InMemoryFingerprintDatabase.cs

@@ -14,6 +14,8 @@ internal class InMemoryFingerprintDatabase : IFingerprintDatabase
         InMemoryModelService modelService = null;
         SQLiteConnection sqlite_conn = null;
 
+        string databasePath = "";
+
 
         public DateTime lastPlexIntroAdded
         {
@@ -66,6 +68,8 @@ public void LoadDatabase(string path)
 
             SetupNewScan();
 
+            databasePath = path;
+
             SQLiteConnectionStringBuilder sb = new SQLiteConnectionStringBuilder();
             sb.DataSource = Program.PathCombine(path, "fingerprintMedia.db");
             sb.Version = 3;
@@ -239,14 +243,25 @@ public int ExecuteDBCommand(string cmd, Dictionary<string, object> p = null)
                 }
             }
 
+            int count = 0;
+
             while (true)
             {
                 try
                 {
+                    count++;
                     return sqlite_cmd.ExecuteNonQuery();
                 }
                 catch (SQLiteException ex)
                 {
+                    if (count >= 2)
+                    {
+                        Console.WriteLine($"PlexDB ExecuteDBCommand Database has been locked for a long time. Attempting to re-connect.");
+                        CloseDatabase();
+                        LoadDatabase(databasePath);
+                        count = 0;
+                    }
+
                     if ((SQLiteErrorCode)ex.ErrorCode != SQLiteErrorCode.Busy)
                     {
                         Console.WriteLine("InMemoryFingerprintDatabase.ExecuteDBCommand exception: " + ex.Message + "" +
@@ -260,6 +275,7 @@ public int ExecuteDBCommand(string cmd, Dictionary<string, object> p = null)
                                 Console.WriteLine($"{x.Key} = {x.Value}");
                             }
                         }
+                        Program.Exit();
                         return -1;
                     }
                     Thread.Sleep(10);
@@ -283,10 +299,13 @@ public SQLResultInfo ExecuteDBQuery(string cmd, Dictionary<string, object> p = n
                 }
             }
 
+            int count = 0;
+
             while (true)
             {
                 try
                 {
+                    count++;
                     //var reader = sqlite_cmd.ExecuteReader(System.Data.CommandBehavior.KeyInfo);
                     ret.reader = sqlite_cmd.ExecuteReader();
 
@@ -299,6 +318,14 @@ public SQLResultInfo ExecuteDBQuery(string cmd, Dictionary<string, object> p = n
                 }
                 catch (SQLiteException ex)
                 {
+                    if (count >= 2)
+                    {
+                        Console.WriteLine($"PlexDB ExecuteDBCommand Database has been locked for a long time. Attempting to re-connect.");
+                        CloseDatabase();
+                        LoadDatabase(databasePath);
+                        count = 0;
+                    }
+
                     if ((SQLiteErrorCode)ex.ErrorCode != SQLiteErrorCode.Busy)
                     {
                         Console.WriteLine("InMemoryFingerprintDatabase.ExecuteDBCommand exception: " + ex.Message + "" +
@@ -312,6 +339,7 @@ public SQLResultInfo ExecuteDBQuery(string cmd, Dictionary<string, object> p = n
                                 Console.WriteLine($"{x.Key} = {x.Value}");
                             }
                         }
+                        Program.Exit();
                         return null;
                     }
                     Thread.Sleep(10);

plex-credits-detect/Database/PlexDB.cs

@@ -159,7 +159,6 @@ public SQLResultInfo ExecuteDBQuery(string cmd, Dictionary<string, object> p = n
 
             int count = 0;
 
-
             while (true)
             {
                 try
@@ -188,6 +187,8 @@ public SQLResultInfo ExecuteDBQuery(string cmd, Dictionary<string, object> p = n
                     if ((SQLiteErrorCode)e.ErrorCode != SQLiteErrorCode.Busy)
                     {
                         Console.WriteLine($"PlexDB ExecuteDBQuery SQLite error code {e.ErrorCode}: {e.Message}");
+                        Program.Exit();
+                        return null;
                     }
                     Thread.Sleep(10);
                 }
@@ -627,12 +628,19 @@ private Dictionary<long, RootDirectory> GetRootDirectories()
 
             while (result.Read())
             {
-                if (result.Get<int>("available") == 1)
+                try
+                {
+                    if (result.Get<bool>("available"))
+                    {
+                        var root = new RootDirectory();
+                        root.path = result.Get<string>("root_path");
+                        root.library_section_id = result.Get<long>("library_section_id");
+                        ret[root.library_section_id] = root;
+                    }
+                }
+                catch (InvalidCastException ce)
                 {
-                    var root = new RootDirectory();
-                    root.path = result.Get<string>("root_path");
-                    root.library_section_id = result.Get<long>("library_section_id");
-                    ret[root.library_section_id] = root;
+                    Console.WriteLine($"A library section has invalid information: {result.Get<string>("root_path")}");
                 }
             }
 

plex-credits-detect/Scanner.cs

@@ -1176,7 +1176,11 @@ public void CleanTemp()
             var files = Directory.EnumerateFiles(Program.PathCombine(Settings.TempDirectoryPath, "plex-credits-detect-temp"));
             foreach (var file in files)
             {
-                File.Delete(file);
+                try
+                {
+                    File.Delete(file);
+                }
+                catch { }
             }
         }