Merge pull request 'Fixed save directory list' (#2) from release/0.6.4 into master

Reviewed-on: HiImRay_Public/bukkubuddy-bookmark-manager#2

BookmarkManager.csproj

@@ -14,7 +14,7 @@
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
-    <Version>0.6.2.092</Version>
+    <Version>0.6.4.140</Version>
     <PackageId>bukkubuddy</PackageId>
     <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
     <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>

MainForm.cs

@@ -748,9 +748,21 @@ namespace FizzyLauncher
 
                 InvalidateOptions();
 
-                // Load items
+                // Clear treeview
                 treeView1.Clear("New Session");
 
+                // Load directories
+                foreach (var item in this.CurrentSession.Directories ?? new List<string>())
+                {
+                    if (string.IsNullOrWhiteSpace(item))
+                    {
+                        continue;
+                    }
+
+                    treeView1.CreateNodePath(item, (int)NodeIcon.Folder1, (int)NodeIcon.Folder2);
+                }
+
+                // Load bookmarks
                 foreach (var item in this.CurrentSession.Items ?? new List<BookmarkModel>())
                 {
                     treeView1.AddNode(item);
@@ -798,18 +810,11 @@ namespace FizzyLauncher
                 this.CurrentSession.Width = this.Width;
                 this.CurrentSession.Height = this.Height;
 
-                var nodeList = treeView1.ToNodeList<BookmarkModel>() ?? new List<KeyValuePair<TreeNode, BookmarkModel>>();
+                var directoryList = treeView1.GetAllDirectories();
-                foreach (var node in nodeList)
+                var bookmarkList = treeView1.GetAllNodes();
-                {
-                    node.Value.Path = treeView1.GetNodePath(node.Key);
 
-                    if (node.Value.Path.Contains('\n'))
+                this.CurrentSession.Directories = directoryList ?? new List<string>();
-                    {
+                this.CurrentSession.Items = bookmarkList.Select(x => x.Value)?.ToList() ?? new List<BookmarkModel>();
-                        node.Value.Path = node.Value.Path.Substring(0, node.Value.Path.LastIndexOf('\n'));
-                    }
-                }
-
-                this.CurrentSession.Items = nodeList.Select(x => x.Value).ToList();
 
                 var result = GenericResult.Create();
 
@@ -825,7 +830,7 @@ namespace FizzyLauncher
                         if (result.IsSuccess)
                         {
                             // Add icons to save file
-                            var result2 = AddImagesToZipFile(filename, nodeList);
+                            var result2 = AddImagesToZipFile(filename, bookmarkList);
                             if (!result2.IsSuccess)
                             {
                                 if (showNotices)

Models/AppOptions.cs

@@ -20,6 +20,8 @@ namespace FizzyLauncher.Models
 
         public int Height { get; set; } = 0;
 
+        public List<string> Directories { get; set; } = new List<string>();
+
         public List<BookmarkModel> Items { get; set; } = new List<BookmarkModel>();
 
     }

Windows/Forms/BookmarkTreeView.cs

@@ -1,7 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Reflection;
+using System.Linq;
 using System.Windows.Forms;
 using bzit.bomg.Models;
 using FizzyLauncher;
@@ -38,17 +39,6 @@ namespace RyzStudio.Windows.Forms
                 this.ImageList = new ImageList();
             }
 
-            //this.PathSeparator = PATH_SEPARATOR;
-
-            //this.AllowDrop = true;
-            //this.HideSelection = false;
-            //this.HotTracking = true;
-            //this.ImageIndex = 0;
-            //this.LabelEdit = true;
-            //this.PathSeparator = "\n";
-            //this.SelectedImageIndex = 0;
-            //this.ShowNodeToolTips = true;
-
             this.ImageList.ColorDepth = ColorDepth.Depth32Bit;
             this.ImageList.ImageSize = new Size(16, 16);
             this.ImageList.TransparentColor = Color.Transparent;
@@ -421,6 +411,30 @@ namespace RyzStudio.Windows.Forms
             this.HasChanged = true;
         }
 
+        public List<string> GetAllDirectories()
+        {
+            var result = GetAllNodes(this.Nodes);
+
+            return result.Where(x => this.GetNodeType(x) == NodeType.Folder)
+                         .Select(x => this.GetNodePath(x))
+                         ?.ToList() ?? new List<string>();
+        }
+
+        public List<KeyValuePair<TreeNode, BookmarkModel>> GetAllNodes()
+        {
+            var result = this.ToNodeList<BookmarkModel>() ?? new List<KeyValuePair<TreeNode, BookmarkModel>>();
+            foreach (var node in result)
+            {
+                node.Value.Path = this.GetNodePath(node.Key);
+
+                if (node.Value.Path.Contains('\n'))
+                {
+                    node.Value.Path = node.Value.Path.Substring(0, node.Value.Path.LastIndexOf('\n'));
+                }
+            }
+
+            return result;
+        }
 
         private void ClearImageList()
         {
@@ -468,5 +482,18 @@ namespace RyzStudio.Windows.Forms
             return this.ImageList.Images.IndexOfKey(key);
         }
 
+        private List<TreeNode> GetAllNodes(TreeNodeCollection nodes)
+        {
+            var result = new List<TreeNode>();
+
+            foreach (TreeNode node in nodes)
+            {
+                result.Add(node);
+                result.AddRange(GetAllNodes(node.Nodes));
+            }
+
+            return result;
+        }
+
     }
 }

build-installer.iss

@@ -2,13 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "BukkuBuddy Bookmark Manager"
-#define MyAppVersion "0.6.2.092"
+#define MyAppVersion "0.6.4.140"
 #define MyAppPublisher "Hi, I'm Ray"
-#define MyAppURL "https://www.hiimray.co.uk/software-bookmark-manager"
+#define MyAppURL "https://www.hiimray.co.uk/software-bukkubuddy-bookmark-manager"
 #define MyAppExeName "bukkubuddy.exe"
 
-#define AppSourcePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
+#define AppSourcePath "L:\gitea-hiimray\bukkubuddy-bookmark-manager\bin"
-#define AppReleasePath "L:\gitea-hiimray\bookmark-manager-r4\bin"
+#define AppReleasePath "L:\gitea-hiimray\bukkubuddy-bookmark-manager\bin"
 #define AppReleaseName "bukkubuddy-installer"
 
 [Setup]

build.bat

@@ -4,6 +4,7 @@ RMDIR /s /q "obj\"
 MKDIR bin
 
 dotnet restore skye.sln
+dotnet build skye.sln -c Release -o ./bin/
 dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\"
 
 "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"