Make loading .sqlite work

Author: David Karlaš

WinDirStat.Net.Wpf.Base/Model/Drives/Misc/DriveSelectMode.cs

@@ -14,9 +14,12 @@ public enum DriveSelectMode {
 		All,
 		/// <summary>Selected drives are scanned.</summary>
 		[Description("Individual Drives")]
-		Individual,
-		/// <summary>A folder path is scanned.</summary>
-		[Description("A Folder")]
-		Folder,
-	}
+		Individual,
+        /// <summary>A folder path is scanned.</summary>
+        [Description("A Folder")]
+        Folder,
+        /// <summary>A folder path is scanned.</summary>
+        [Description("A Sqlite file")]
+        Sqlite,
+    }
 }

WinDirStat.Net.Wpf.Base/Model/Drives/Misc/DriveSelectResult.cs

@@ -25,7 +25,8 @@ public class DriveSelectResult {
 		public DriveSelectResult(ScanningService scanning,
 								 DriveSelectMode mode,
 								 string[] selectedDrives,
-								 string folderPath)
+								 string folderPath,
+                                 string sqlitePath)
 		{
 			this.scanning = scanning;
 			Mode = mode;
@@ -38,8 +39,15 @@ public DriveSelectResult(ScanningService scanning,
 				selectedPaths = new[] {
 					folderPath ?? throw new ArgumentNullException(nameof(folderPath)),
 				};
-			}
-		}
+			} else if(mode == DriveSelectMode.Sqlite) {
+                selectedPaths = new[] {
+                    sqlitePath
+                };
+            }
+            else {
+                selectedPaths = null;
+            }
+        }
 
 		#endregion
 

WinDirStat.Net.Wpf.Base/Model/Files/FileItemBase.cs

@@ -44,8 +44,10 @@ public abstract class FileItemBase : IComparable<FileItemBase>, IComparable, ITr
 		/// If this is a container, it returns the most recent time of all children.
 		/// </summary>
 		public DateTime LastWriteTimeUtc { get; private protected set; }
-		/// <summary>Gets the name of the file.</summary>
-		public string Name { get; }
+		public DateTime LastAccessTimeUtc { get; private protected set; }
+		public DateTime CreationTimeUtc { get; private protected set; }
+        /// <summary>Gets the name of the file.</summary>
+        public string Name { get; }
 		/// <summary>Gets the total size of the file and all of its children.</summary>
 		public long Size { get; private protected set; }
 		/// <summary>Gets the rectangle of the file for drawing in the treemap.</summary>
@@ -102,8 +104,12 @@ private protected FileItemBase(FileSystemInfo info, FileItemType type, FileItemF
 		private protected FileItemBase(IScanFileInfo info, FileItemType type, FileItemFlags flags)
 			: this(info.Name, type, flags)
 		{
-			LastWriteTimeUtc = info.LastWriteTimeUtc;
-			Attributes = info.Attributes;
+			LastWriteTimeUtc = info.LastWriteTimeUtc;
+            CreationTimeUtc = info.CreationTimeUtc;
+            if(info.CreationTimeUtc> DateTime.MinValue)
+                Console.WriteLine();
+            LastAccessTimeUtc = info.LastAccessTimeUtc;
+            Attributes = info.Attributes;
 
 			if (!info.IsDirectory && !info.IsSymbolicLink)
 				Size = info.Size;
@@ -280,10 +286,13 @@ public FolderItem FileParent {
 		/// Gets the local time of when the file was last written to.<para/>
 		/// If this is a container, it returns the most recent time of all children.
 		/// </summary>
-		public DateTime LastWriteTime => LastWriteTimeUtc.ToLocalTime();
-
-		/// <summary>Gets the visible level of the item in the tree.</summary>
-		public int VisibleLevel => Parent != null ? Parent.VisibleLevel + 1 : 0;
+		public DateTime LastWriteTime => LastWriteTimeUtc.ToLocalTime();
+
+        public DateTime LastAccessTime => LastAccessTimeUtc.ToLocalTime();
+        public DateTime CreationTime => CreationTimeUtc.ToLocalTime();
+
+        /// <summary>Gets the visible level of the item in the tree.</summary>
+        public int VisibleLevel => Parent != null ? Parent.VisibleLevel + 1 : 0;
 
 		/// <summary>Gets the file level of the item in the tree.</summary>
 		public int FileLevel => Parent != null ? (Parent.FileLevel + (Parent.IsFileType ? 1 : 0)) : 0;

WinDirStat.Net.Wpf.Base/Model/Files/FolderItem.cs

@@ -29,10 +29,11 @@ public class FolderItem : FileItemBase {
 		/// Always use the list modification methods to add or remove from the list. This is important
 		/// because they account for if <see cref="FileItemBase.EmptyChildren"/> is being used.
 		/// </summary>
-		protected volatile List<FileItemBase> children = EmptyChildren;
-
-		/// <summary>Gets the number of files this folder contains.</summary>
-		public override sealed int FileCount { get; protected set; }
+		protected volatile List<FileItemBase> children = EmptyChildren;
+        private volatile FolderItem _fileCollection;
+
+        /// <summary>Gets the number of files this folder contains.</summary>
+        public override sealed int FileCount { get; protected set; }
 		/// <summary>Gets the number of directories this folder contains.</summary>
 		public override sealed int SubdirCount { get; protected set; }
 
@@ -311,13 +312,7 @@ private bool IsStoringOneContainer {
 		public FolderItem GetFileCollection() {
 			if (Type == FileItemType.FileCollection)
 				return this;
-			int count = children.Count;
-			for (int i = 0; i < count; i++) {
-				FileItemBase child = children[i];
-				if (child.Type == FileItemType.FileCollection)
-					return (FolderItem) child;
-			}
-			return null;
+			return _fileCollection;
 		}
 
 		/// <summary>Gets the first file in this folder.</summary>
@@ -425,8 +420,8 @@ public void AddItem(FileItemBase item) {
 		/// <param name="firstFile">
 		/// The container's first file. Keep track of this when scanning this directory.
 		/// </param>
-		public void AddItem(FileItemBase item, ref FolderItem fileCollection, ref FileItem firstFile) {
-			if (Type == FileItemType.FileCollection)
+		public void AddItem(FileItemBase item, ref FolderItem fileCollection, ref FileItem firstFile) {
+            if (Type == FileItemType.FileCollection)
 				throw new InvalidOperationException($"Cannot call {nameof(AddItem)} from a File Collection!");
 
 			// We know we're adding an item to children, make sure it's setup
@@ -452,9 +447,10 @@ public void AddItem(FileItemBase item, ref FolderItem fileCollection, ref FileIt
 					else if (IsStoringContainers) {
 						// We've hit our limit of only one visible file when a
 						// folder is storing non-files. Move to FileCollection.
-						fileCollection = new FolderItem();
-						Remove(firstFile);
-						Add(fileCollection);
+						fileCollection = new FolderItem();
+                        _fileCollection = fileCollection;
+                        Remove(firstFile);
+                        Add(fileCollection);
 						fileCollection.Add(firstFile);
 						fileCollection.Add(item);
 						fileCollection.Invalidate();
@@ -495,6 +491,7 @@ public void AddItem(FileItemBase item, ref FolderItem fileCollection, ref FileIt
 					// Setup file collection if the folder needs to store a container item
 					Debug.Assert(fileCollection == null);
 					fileCollection = new FolderItem();
+                    _fileCollection = fileCollection;
 					List<FileItemBase> files = ClearAndGetFiles();
 					Add(fileCollection);
 					fileCollection.AddRange(files);
@@ -701,8 +698,11 @@ private void ClearFileCollectionItems() {
 		protected void Add(FileItemBase item) {
 			//EnsureChildren();
 			int index = children.Count;
-			children.Add(item);
-			item.Parent = this;
+            if(item.Type == FileItemType.FileCollection && _fileCollection == null)
+                Console.WriteLine();
+
+			children.Add(item);
+            item.Parent = this;
 			if (IsWatched)
 				RaiseChanged(FileItemAction.ChildrenAdded, item, index);
 		}
@@ -926,11 +926,15 @@ private protected bool ValidateImpl(bool force) {
 				if (IsFileType) {
 					DirectoryInfo directoryInfo = new DirectoryInfo(FullName);
 					// Use the directory's LastWriteTime when empty
-					LastWriteTimeUtc = directoryInfo.LastWriteTimeUtc;
+					LastWriteTimeUtc = directoryInfo.LastWriteTimeUtc;
+                    LastAccessTimeUtc = directoryInfo.LastAccessTimeUtc;
+                    CreationTimeUtc = directoryInfo.CreationTimeUtc;
 				}
 				else {
-					LastWriteTimeUtc = DateTime.MinValue;
-				}
+					LastWriteTimeUtc = DateTime.MinValue;
+                    LastAccessTimeUtc = DateTime.MinValue;
+                    CreationTimeUtc = DateTime.MinValue;
+                }
 				if (IsWatched)
 					RaiseChanged(FileItemAction.ValidatedSortOrder);
 				IsValidating = false;
@@ -939,9 +943,11 @@ private protected bool ValidateImpl(bool force) {
 
 			// True, if any of the sort orders that can change, have changed
 			bool sortOrderChanged = false;
-			long oldSize = Size;
-			DateTime oldLastChangeTime = LastWriteTimeUtc;
-			bool thisIsDone = IsDone;
+			long oldSize = Size;
+            DateTime oldLastChangeTime = LastWriteTimeUtc;
+            DateTime oldLastAccessTimeUtc = LastAccessTimeUtc;
+            DateTime oldCreationTimeUtc = CreationTimeUtc;
+            bool thisIsDone = IsDone;
 			bool isDone = true;
 
 			lock (children) {
@@ -973,7 +979,9 @@ private protected bool ValidateImpl(bool force) {
 					Size += child.Size;
 					//LastAccessTime = Max(LastAccessTime, child.LastAccessTime);
 					LastWriteTimeUtc = MaxDateTime(LastWriteTimeUtc, child.LastWriteTimeUtc);
-					if (child.Type == FileItemType.File || child.Type == FileItemType.FreeSpace) {
+					LastAccessTimeUtc = MaxDateTime(LastAccessTimeUtc, child.LastAccessTimeUtc);
+					CreationTimeUtc = MaxDateTime(CreationTimeUtc, child.CreationTimeUtc);
+                    if (child.Type == FileItemType.File || child.Type == FileItemType.FreeSpace) {
 						FileCount++;
 					}
 					else {
@@ -1004,7 +1012,7 @@ private protected bool ValidateImpl(bool force) {
 				else
 					RaiseChanged(FileItemAction.Validated);
 			}
-			return sortOrderChanged || (oldLastChangeTime != LastWriteTimeUtc);
+			return sortOrderChanged || (oldLastChangeTime != LastWriteTimeUtc) || (oldLastAccessTimeUtc != LastAccessTimeUtc) || (oldCreationTimeUtc != CreationTimeUtc);
 		}
 
 		/// <summary>Fully validates the file item tree and prepares it for use.</summary>

WinDirStat.Net.Wpf.Base/Services/IMyDialogService.cs

@@ -24,14 +24,16 @@ public interface IMyDialogService {
 		/// <param name="selectedPath">The currently selected path. Use an empty string for nothing.</param>
 		/// <returns>The selected path on success, otherwise null.</returns>
 		string ShowFolderBrowser(Window owner, string description, bool showNewFolder, string selectedPath = "");
-
-		/// <summary>Shows a message with no icon.</summary>
-		/// 
-		/// <param name="owner">The owner window for this dialog message.</param>
-		/// <param name="message">The text message.</param>
-		/// <param name="title">The message window title.</param>
-		/// <param name="button">The message buttons to display.</param>
-		MessageBoxResult ShowMessage(Window owner, string message, string title, MessageBoxButton button = MessageBoxButton.OK);
+
+        string ShowFileBrowser(Window owner, string description, string selectedPath = null);
+
+        /// <summary>Shows a message with no icon.</summary>
+        /// 
+        /// <param name="owner">The owner window for this dialog message.</param>
+        /// <param name="message">The text message.</param>
+        /// <param name="title">The message window title.</param>
+        /// <param name="button">The message buttons to display.</param>
+        MessageBoxResult ShowMessage(Window owner, string message, string title, MessageBoxButton button = MessageBoxButton.OK);
 
 		/// <summary>Shows a message with an information icon.</summary>
 		///