config bug fix

FileManager/Configuration.cs

@@ -48,7 +48,11 @@ namespace FileManager
 
         public object GetObject(string propertyName) => persistentDictionary.GetObject(propertyName);
         public void SetObject(string propertyName, object newValue) => persistentDictionary.SetNonString(propertyName, newValue);
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false) => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
+
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+            => persistentDictionary.SetWithJsonPath(jsonPath, propertyName, newValue, suppressLogging);
 
         public string SettingsFilePath => Path.Combine(LibationFiles, "Settings.json");
 
@@ -65,6 +69,38 @@ namespace FileManager
 
         public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);
 
+        #region MainForm: X, Y, Width, Height, MainFormIsMaximized
+        public int MainFormX
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormX));
+            set => persistentDictionary.SetNonString(nameof(MainFormX), value);
+        }
+
+        public int MainFormY
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormY));
+            set => persistentDictionary.SetNonString(nameof(MainFormY), value);
+        }
+
+        public int MainFormWidth
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormWidth));
+            set => persistentDictionary.SetNonString(nameof(MainFormWidth), value);
+        }
+
+        public int MainFormHeight
+        {
+            get => persistentDictionary.GetNonString<int>(nameof(MainFormHeight));
+            set => persistentDictionary.SetNonString(nameof(MainFormHeight), value);
+        }
+
+        public bool MainFormIsMaximized
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(MainFormIsMaximized));
+            set => persistentDictionary.SetNonString(nameof(MainFormIsMaximized), value);
+        }
+        #endregion
+
         [Description("Location for book storage. Includes destination of newly liberated books")]
         public string Books
         {
@@ -187,7 +223,12 @@ namespace FileManager
             }
             set
             {
-                persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                var valueWasChanged = persistentDictionary.SetWithJsonPath("Serilog", "MinimumLevel", value.ToString());
+                if (!valueWasChanged)
+                {
+                    Log.Logger.Information("LogLevel.set attempt. No change");
+                    return;
+                }
 
                 configuration.Reload();
 
@@ -231,8 +272,9 @@ namespace FileManager
                 // Config init in Program.ensureSerilogConfig() only happens when serilog setting is first created (prob on 1st run).
                 // This Set() enforces current LibationFiles every time we restart Libation or redirect LibationFiles
                 var logPath = Path.Combine(LibationFiles, "Log.log");
-                SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
-                configuration?.Reload();
+                bool settingWasChanged = SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
+                if (settingWasChanged)
+                    configuration?.Reload();
 
                 return libationFilesPathCache;
             }
@@ -275,19 +317,8 @@ namespace FileManager
             return valueFinal;
         }
 
-        public bool TrySetLibationFiles(string directory)
+        public void SetLibationFiles(string directory)
         {
-            // this is WRONG. need to MOVE settings; not DELETE them
-
-            //// if moving from default, delete old settings file and dir (if empty)
-            //if (LibationFiles.EqualsInsensitive(AppDir))
-            //{
-            //    File.Delete(SettingsFilePath);
-            //    System.Threading.Thread.Sleep(100);
-            //    if (!Directory.EnumerateDirectories(AppDir).Any() && !Directory.EnumerateFiles(AppDir).Any())
-            //        Directory.Delete(AppDir);
-            //}
-
             libationFilesPathCache = null;
 
             var startingContents = File.ReadAllText(APPSETTINGS_JSON);
@@ -297,7 +328,7 @@ namespace FileManager
 
             var endingContents = JsonConvert.SerializeObject(jObj, Formatting.Indented);
             if (startingContents == endingContents)
-                return true;
+                return;
 
             // now it's set in the file again but no settings have moved yet
             File.WriteAllText(APPSETTINGS_JSON, endingContents);
@@ -307,13 +338,6 @@ namespace FileManager
                 Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
             }
             catch { }
-
-            //// attempting this will try to change the settings file which has not yet been moved
-            //// after this is fixed, can remove it from Program.configureLogging()
-            // var logPath = Path.Combine(LibationFiles, "Log.log");
-            // SetWithJsonPath("Serilog.WriteTo[1].Args", "path", logPath, true);
-
-            return true;
         }
         #endregion
     }

FileManager/PersistentDictionary.cs

@@ -142,33 +142,44 @@ namespace FileManager
             catch { }
         }
 
-        public void SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
+        /// <summary>WILL ONLY set if already present. WILL NOT create new</summary>
+        /// <returns>Value was changed</returns>
+        public bool SetWithJsonPath(string jsonPath, string propertyName, string newValue, bool suppressLogging = false)
         {
             if (IsReadOnly)
-                return;
+                return false;
 
             var path = $"{jsonPath}.{propertyName}";
 
             {
                 // only do this check in string cache, NOT object cache
                 if (stringCache.ContainsKey(path) && stringCache[path] == newValue)
-                    return;
+                    return false;
 
                 // set cache
                 stringCache[path] = newValue;
             }
 
-            lock (locker)
+            try
             {
-                var jObject = readFile();
-                var token = jObject.SelectToken(jsonPath);
-                var oldValue = token.Value<string>(propertyName);
+                lock (locker)
+                {
+                    var jObject = readFile();
+                    var token = jObject.SelectToken(jsonPath);
+                    if (token is null || token[propertyName] is null)
+                        return false;
 
-                if (oldValue == newValue)
-                    return;
+                    var oldValue = token.Value<string>(propertyName);
+                    if (oldValue == newValue)
+                        return false;
 
-                token[propertyName] = newValue;
-                File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                    token[propertyName] = newValue;
+                    File.WriteAllText(Filepath, JsonConvert.SerializeObject(jObject, Formatting.Indented));
+                }
+            }
+            catch (Exception exDebug)
+            {
+                return false;
             }
 
             if (!suppressLogging)
@@ -180,6 +191,8 @@ namespace FileManager
                 }
                 catch { }
             }
+
+            return true;
         }
 
         private static string formatValueForLog(string value)

LibationLauncher/LibationLauncher.csproj

@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>5.3.2.1</Version>
+    <Version>5.3.5.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

LibationLauncher/Program.cs

@@ -81,7 +81,7 @@ namespace LibationLauncher
 			// check for existing settigns in default location
 			var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 			if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 
 			if (config.LibationSettingsAreValid)
 				return;
@@ -94,7 +94,7 @@ namespace LibationLauncher
 			}
 
 			if (setupDialog.IsNewUser)
-				config.TrySetLibationFiles(defaultLibationFilesDir);
+				config.SetLibationFiles(defaultLibationFilesDir);
 			else if (setupDialog.IsReturningUser)
 			{
 				var libationFilesDialog = new LibationFilesDialog();
@@ -105,7 +105,7 @@ namespace LibationLauncher
 					return;
 				}
 
-				config.TrySetLibationFiles(libationFilesDialog.SelectedDirectory);
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 				if (config.LibationSettingsAreValid)
 					return;
 
@@ -351,7 +351,7 @@ Libation.
 			try
 			{
 				// timed out
-				var latest = getLatestRelease(TimeSpan.FromSeconds(30));
+				var latest = getLatestRelease(TimeSpan.FromSeconds(10));
 				if (latest is null)
 					return;
 
@@ -388,6 +388,11 @@ Libation.
 					return;
 				selectedPath = fileSelector.FileName;
 			}
+			catch (AggregateException aggEx)
+			{
+				Log.Logger.Error(aggEx, "Checking for new version too often");
+				return;
+			}
 			catch (Exception ex)
 			{
 				MessageBoxAlertAdmin.Show("Error checking for update", "Error checking for update", ex);

LibationWinForms/Form1.Designer.cs

@@ -51,7 +51,6 @@
 			this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.accountsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.basicSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.advancedSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.visibleCountLbl = new System.Windows.Forms.ToolStripStatusLabel();
 			this.springLbl = new System.Windows.Forms.ToolStripStatusLabel();
@@ -232,8 +231,7 @@
 			// 
 			this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.accountsToolStripMenuItem,
-            this.basicSettingsToolStripMenuItem,
-            this.advancedSettingsToolStripMenuItem});
+            this.basicSettingsToolStripMenuItem});
 			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
 			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
 			this.settingsToolStripMenuItem.Text = "&Settings";
@@ -241,24 +239,17 @@
 			// accountsToolStripMenuItem
 			// 
 			this.accountsToolStripMenuItem.Name = "accountsToolStripMenuItem";
-			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.accountsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
 			this.accountsToolStripMenuItem.Text = "&Accounts...";
 			this.accountsToolStripMenuItem.Click += new System.EventHandler(this.accountsToolStripMenuItem_Click);
 			// 
 			// basicSettingsToolStripMenuItem
 			// 
 			this.basicSettingsToolStripMenuItem.Name = "basicSettingsToolStripMenuItem";
-			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
+			this.basicSettingsToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
 			this.basicSettingsToolStripMenuItem.Text = "&Settings...";
 			this.basicSettingsToolStripMenuItem.Click += new System.EventHandler(this.basicSettingsToolStripMenuItem_Click);
 			// 
-			// advancedSettingsToolStripMenuItem
-			// 
-			this.advancedSettingsToolStripMenuItem.Name = "advancedSettingsToolStripMenuItem";
-			this.advancedSettingsToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
-			this.advancedSettingsToolStripMenuItem.Text = "&Move settings files...";
-			this.advancedSettingsToolStripMenuItem.Click += new System.EventHandler(this.advancedSettingsToolStripMenuItem_Click);
-			// 
 			// statusStrip1
 			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -325,6 +316,7 @@
 			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			this.Name = "Form1";
 			this.Text = "Libation: Liberate your Library";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
 			this.Load += new System.EventHandler(this.Form1_Load);
 			this.menuStrip1.ResumeLayout(false);
 			this.menuStrip1.PerformLayout();
@@ -359,7 +351,6 @@
 		private System.Windows.Forms.ToolStripMenuItem editQuickFiltersToolStripMenuItem;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem basicSettingsToolStripMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem advancedSettingsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem accountsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfAllAccountsToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem scanLibraryOfSomeAccountsToolStripMenuItem;

LibationWinForms/Form1.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
 using DataLayer;
@@ -33,6 +34,31 @@ namespace LibationWinForms
 
 			beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
             beginPdfBackupsToolStripMenuItem_format = beginPdfBackupsToolStripMenuItem.Text;
+
+            // after backing up formats: can set default/temp visible text
+            backupsCountsLbl.Text = "[Calculating backed up book quantities]";
+            pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
+			setVisibleCount(null, 0);
+
+            if (this.DesignMode)
+                return;
+
+            // independent UI updates
+            this.Load += setBackupCountsAsync;
+            this.Load += (_, __) => RestoreSizeAndLocation();
+            this.Load += (_, __) => RefreshImportMenu();
+
+            // start background service
+            this.Load += (_, __) => startBackgroundImageDownloader();
+        }
+
+        private static void startBackgroundImageDownloader()
+        {
+            // load default/missing cover images. this will also initiate the background image downloader
+            var format = System.Drawing.Imaging.ImageFormat.Jpeg;
+            PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
+            PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
+            PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
         }
 
         private void Form1_Load(object sender, EventArgs e)
@@ -40,29 +66,89 @@ namespace LibationWinForms
             if (this.DesignMode)
                 return;
 
-			// load default/missing cover images. this will also initiate the background image downloader
-			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
-			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._300x300, Properties.Resources.default_cover_300x300.ToBytes(format));
-			PictureStorage.SetDefaultImage(PictureSize._500x500, Properties.Resources.default_cover_500x500.ToBytes(format));
-
-            RefreshImportMenu();
-
-			setVisibleCount(null, 0);
-
-			reloadGrid();
-
+            reloadGrid();
+            
             // also applies filter. ONLY call AFTER loading grid
             loadInitialQuickFilterState();
-
-            // init bottom counts
-            backupsCountsLbl.Text = "[Calculating backed up book quantities]";
-            pdfsCountsLbl.Text = "[Calculating backed up PDFs]";
-            setBackupCounts(null, null);
         }
 
-		#region reload grid
-		bool isProcessingGridSelect = false;
+        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            SaveSizeAndLocation();
+        }
+
+		private void RestoreSizeAndLocation()
+		{
+            var config = Configuration.Instance;
+
+            var width = config.MainFormWidth;
+            var height = config.MainFormHeight;
+
+            // too small -- something must have gone wrong. use defaults
+            if (width < 25 || height < 25)
+            {
+                width = 1023;
+                height = 578;
+            }
+
+            // Fit to the current screen size in case the screen resolution changed since the size was last persisted
+            if (width > Screen.PrimaryScreen.WorkingArea.Width)
+                width = Screen.PrimaryScreen.WorkingArea.Width;
+            if (height > Screen.PrimaryScreen.WorkingArea.Height)
+                height = Screen.PrimaryScreen.WorkingArea.Height;
+
+            var x = config.MainFormX;
+            var y = config.MainFormY;
+
+            var rect = new System.Drawing.Rectangle(x, y, width, height);
+
+            // is proposed rect on a screen?
+            if (Screen.AllScreens.Any(screen => screen.WorkingArea.Contains(rect)))
+            {
+                this.StartPosition = FormStartPosition.Manual;
+                this.DesktopBounds = rect;
+            }
+            else
+            {
+                this.StartPosition = FormStartPosition.WindowsDefaultLocation;
+                this.Size = rect.Size;
+            }
+
+            // FINAL: for Maximized: start normal state, set size and location, THEN set max state
+            this.WindowState = config.MainFormIsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
+        }
+
+        private void SaveSizeAndLocation()
+        {
+            System.Drawing.Point location;
+            System.Drawing.Size size;
+
+            // save location and size if the state is normal
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                location = this.Location;
+                size = this.Size;
+            }
+            else
+            {
+                // save the RestoreBounds if the form is minimized or maximized
+                location = this.RestoreBounds.Location;
+                size = this.RestoreBounds.Size;
+            }
+            
+            var config = Configuration.Instance;
+
+            config.MainFormX = location.X;
+            config.MainFormY = location.Y;
+
+            config.MainFormWidth = size.Width;
+            config.MainFormHeight = size.Height;
+
+            config.MainFormIsMaximized = this.WindowState == FormWindowState.Maximized;
+        }
+
+        #region reload grid
+        bool isProcessingGridSelect = false;
         private void reloadGrid()
         {
             // suppressed filter while init'ing UI
@@ -84,14 +170,14 @@ namespace LibationWinForms
                 {
                     gridPanel.Controls.Remove(currProductsGrid);
                     currProductsGrid.VisibleCountChanged -= setVisibleCount;
-                    currProductsGrid.BackupCountsChanged -= setBackupCounts;
+                    currProductsGrid.BackupCountsChanged -= setBackupCountsAsync;
                     currProductsGrid.Dispose();
                 }
 
                 currProductsGrid = new ProductsGrid { Dock = DockStyle.Fill };
                 currProductsGrid.VisibleCountChanged += setVisibleCount;
-                currProductsGrid.BackupCountsChanged += setBackupCounts;
-                gridPanel.Controls.Add(currProductsGrid);
+                currProductsGrid.BackupCountsChanged += setBackupCountsAsync;
+                gridPanel.UIThread(() => gridPanel.Controls.Add(currProductsGrid));
                 currProductsGrid.Display();
             }
             ResumeLayout();
@@ -103,15 +189,17 @@ namespace LibationWinForms
         #endregion
 
         #region bottom: backup counts
-        private void setBackupCounts(object _, object __)
+        private async void setBackupCountsAsync(object _, object __)
         {
-            var books = DbContexts.GetContext()
-                .GetLibrary_Flat_NoTracking()
-                .Select(sp => sp.Book)
-                .ToList();
+            await Task.Run(() => {
+                var books = DbContexts.GetContext()
+                    .GetLibrary_Flat_NoTracking()
+                    .Select(sp => sp.Book)
+                    .ToList();
 
-			setBookBackupCounts(books);
-			setPdfBackupCounts(books);
+                setBookBackupCounts(books);
+                setPdfBackupCounts(books);
+            });
 		}
         enum AudioFileState { full, aax, none }
         private void setBookBackupCounts(IEnumerable<Book> books)
@@ -395,31 +483,6 @@ namespace LibationWinForms
         private void accountsToolStripMenuItem_Click(object sender, EventArgs e) => new AccountsDialog(this).ShowDialog();
 
         private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog();
-
-        private void advancedSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var libationFilesDialog = new LibationFilesDialog();
-            if (libationFilesDialog.ShowDialog() != DialogResult.OK)
-                return;
-
-            // no change
-            if (System.IO.Path.GetFullPath(libationFilesDialog.SelectedDirectory).EqualsInsensitive(System.IO.Path.GetFullPath(Configuration.Instance.LibationFiles)))
-                return;
-
-            if (!Configuration.Instance.TrySetLibationFiles(libationFilesDialog.SelectedDirectory))
-            {
-                MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationFilesDialog.SelectedDirectory, "Error saving change", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            MessageBox.Show(
-                "You have changed a file path important for this program. All files will remain in their original location; nothing will be moved. Libation must be restarted so these changes are handled correctly.",
-                "Closing Libation",
-                MessageBoxButtons.OK,
-                MessageBoxIcon.Exclamation);
-            Application.Exit();
-            Environment.Exit(0);
-        }
-        #endregion
-    }
+		#endregion
+	}
 }