Code fix for #50

Rawns · Aug 3, 2017 · 84f128c · 84f128c
1 parent 446d927
commit 84f128c
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 48 deletions.
diff --git a/.vs/Reddit Wallpaper Changer/v15/.suo b/.vs/Reddit Wallpaper Changer/v15/.suo
diff --git a/Reddit Wallpaper Changer Installer/Debug/setup.exe b/Reddit Wallpaper Changer Installer/Debug/setup.exe
diff --git a/Reddit Wallpaper Changer Installer/Reddit Wallpaper Changer Installer.vdproj b/Reddit Wallpaper Changer Installer/Reddit Wallpaper Changer Installer.vdproj
@@ -33,20 +33,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_906804C285292C8CF3E1E2320FDAC3DE"
+        "MsmKey" = "8:_84BD26A627C003EB536430D39E7E3631"
         "OwnerKey" = "8:_450B816E19CA4F579B99326351197ECE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A4FE9194BA32A7E6A09A508269058BC7"
-        "OwnerKey" = "8:_450B816E19CA4F579B99326351197ECE"
+        "MsmKey" = "8:_A863DE2EC26D4DAA94B986FFFCB5A5DB"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A863DE2EC26D4DAA94B986FFFCB5A5DB"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_B550F8B1116D33974077DA31E8A95ED9"
+        "OwnerKey" = "8:_450B816E19CA4F579B99326351197ECE"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -58,13 +58,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A4FE9194BA32A7E6A09A508269058BC7"
+        "OwnerKey" = "8:_B550F8B1116D33974077DA31E8A95ED9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_906804C285292C8CF3E1E2320FDAC3DE"
+        "OwnerKey" = "8:_84BD26A627C003EB536430D39E7E3631"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -105,6 +105,11 @@
                     "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
                     "ProductCode" = "8:.NETFramework,Version=v4.5"
                     }
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
+                    {
+                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
+                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
+                    }
                 }
             }
         }
@@ -219,14 +224,14 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_906804C285292C8CF3E1E2320FDAC3DE"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_84BD26A627C003EB536430D39E7E3631"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_906804C285292C8CF3E1E2320FDAC3DE"
+                    "_84BD26A627C003EB536430D39E7E3631"
                     {
                     "Name" = "8:System.Data.SQLite.dll"
                     "Attributes" = "3:512"
@@ -250,14 +255,34 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A4FE9194BA32A7E6A09A508269058BC7"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A863DE2EC26D4DAA94B986FFFCB5A5DB"
+            {
+            "SourcePath" = "8:License.rtf"
+            "TargetName" = "8:License.rtf"
+            "Tag" = "8:"
+            "Folder" = "8:_4D8D091475BE414084D527C4A579AAAA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:TRUE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B550F8B1116D33974077DA31E8A95ED9"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
             "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_A4FE9194BA32A7E6A09A508269058BC7"
+                    "_B550F8B1116D33974077DA31E8A95ED9"
                     {
                     "Name" = "8:Newtonsoft.Json.dll"
                     "Attributes" = "3:512"
@@ -281,26 +306,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A863DE2EC26D4DAA94B986FFFCB5A5DB"
-            {
-            "SourcePath" = "8:License.rtf"
-            "TargetName" = "8:License.rtf"
-            "Tag" = "8:"
-            "Folder" = "8:_4D8D091475BE414084D527C4A579AAAA"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:TRUE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -368,15 +373,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Reddit Wallpaper Changer"
-        "ProductCode" = "8:{2C493234-69DC-44B4-88E1-A7A4712E83E5}"
-        "PackageCode" = "8:{F9E6AF3E-8BEB-4A60-B0C0-BF1EDF2E0801}"
+        "ProductCode" = "8:{A148B44C-9F7F-40C5-A4AB-8F9F116CB2E1}"
+        "PackageCode" = "8:{72CF7C4C-51D7-4916-9FE0-AD1D8E20A06C}"
         "UpgradeCode" = "8:{661C805E-7AE7-4E81-99F6-A78BD746890C}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.13"
+        "ProductVersion" = "8:1.0.14"
         "Manufacturer" = "8:Paul Rawnsley"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://www.reddit.com/r/rwallpaperchanger/"

diff --git a/Reddit Wallpaper Changer/RWC.Designer.cs b/Reddit Wallpaper Changer/RWC.Designer.cs
diff --git a/Reddit Wallpaper Changer/RWC.cs b/Reddit Wallpaper Changer/RWC.cs
@@ -185,6 +185,7 @@ private void RWC_Load(object sender, EventArgs e)
             setupSavedWallpaperLocation();
             setupAppDataLocation();
             setupThumbnailCache();
+            buildThumbnailCache();
             setupProxySettings();
             setupButtons();
             setupPanels();          
@@ -193,7 +194,6 @@ private void RWC_Load(object sender, EventArgs e)
             logSettings();
             database.connectToDatabase();
             if (Properties.Settings.Default.dbMigrated == false) { database.migrateOldBlacklist(); }
-            buildThumbnailCache();
             populateHistory();
             populateFavourites();
             populateBlacklist();
@@ -2325,7 +2325,6 @@ private async Task<bool> populateHistory()
                         row.SetValues(image, item.titlestring, item.threadidstring, item.urlstring, item.datestring);
                     }
                 }
-
                 Logging.LogMessageToFile("History panel reloaded.", 0);
                 return true;
             }
@@ -2358,6 +2357,7 @@ private async void populateBlacklist()
                 }
 
                 Logging.LogMessageToFile("Blacklisted wallpapers loaded.", 0);
+
             }
             catch (Exception ex)
             {
@@ -2935,10 +2935,13 @@ public void removeThumbnailCache()
                 {
                     file.Delete();
                 }
-                Logging.LogMessageToFile("Thumbnail cache erased.", 0);
                 Properties.Settings.Default.rebuildThumbCache = false;
                 Properties.Settings.Default.Save();
 
+                buildThumbnailCache();
+
+                Logging.LogMessageToFile("Thumbnail cache erased.", 0);
+
             }
             catch(Exception ex)
             {

diff --git a/Reddit Wallpaper Changer/RWC.resx b/Reddit Wallpaper Changer/RWC.resx
@@ -224,6 +224,21 @@
   <metadata name="DateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Preview.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Thread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="orderID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThreadLink.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="wallpaperChangeTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -1963,6 +1978,21 @@
   <metadata name="blacklistDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="blacklistPreview.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="blacklistThread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="blacklistOrderID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="blacklistThreadLink.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="blacklistDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="blacklistMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>676, 13</value>
   </metadata>
@@ -1981,6 +2011,21 @@
   <metadata name="favouriteDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="favouritePreview.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="favouriteThread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="favouriteOrderID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="favouriteThreadLink.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="favouriteDateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="favouritesMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>488, 52</value>
   </metadata>

diff --git a/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.csproj.FileListAbsolute.txt b/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.csproj.FileListAbsolute.txt
@@ -100,3 +100,4 @@ E:\Dropbox\C# Projects\Reddit-Wallpaper-Changer\Reddit-Wallpaper-Changer\Reddit
 E:\Dropbox\C# Projects\Reddit-Wallpaper-Changer\Reddit-Wallpaper-Changer\Reddit Wallpaper Changer\obj\Debug\Reddit Wallpaper Changer.csproj.GenerateResource.Cache
 E:\Dropbox\C# Projects\Reddit-Wallpaper-Changer\Reddit-Wallpaper-Changer\Reddit Wallpaper Changer\obj\Debug\Reddit Wallpaper Changer.exe
 E:\Dropbox\C# Projects\Reddit-Wallpaper-Changer\Reddit-Wallpaper-Changer\Reddit Wallpaper Changer\obj\Debug\Reddit Wallpaper Changer.pdb
+E:\Dropbox\C# Projects\Reddit-Wallpaper-Changer\Reddit-Wallpaper-Changer\Reddit Wallpaper Changer\obj\Debug\Reddit Wallpaper Changer.csprojResolveAssemblyReference.cache
diff --git a/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.csproj.GenerateResource.Cache b/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.csproj.GenerateResource.Cache
diff --git a/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.exe b/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.exe
diff --git a/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.pdb b/Reddit Wallpaper Changer/obj/Debug/Reddit Wallpaper Changer.pdb