Refactored entire backend to improve performance

Author: Ashley Davies

FileMasta/App.config

@@ -30,4 +30,18 @@
             </setting>
         </FileMasta.Properties.Settings>
     </userSettings>
+    <appSettings>
+      <add key="url.project"
+           value="https://github.com/mostlyash/filemasta/"/>
+      <add key="fileUrl.changelog"
+           value="https://raw.githubusercontent.com/mostlyash/filemasta/master/CHANGELOG.md"/>
+      <add key="fileUrl.version"
+           value="https://dl.dropbox.com/s/ioiu8vwxxc9r430/app-version.txt?raw=true"/>
+      <add key="fileUrl.database"
+           value="https://www.dropbox.com/s/8ba7wbwow2mnq1l/od-database.csv?raw=true"/>
+      <add key="fileName.database"
+           value="od-database.csv"/>
+      <add key="fileName.saved"
+           value="saved.txt"/>
+    </appSettings>
 </configuration>

FileMasta/Data/DataHelper.cs

@@ -10,13 +10,18 @@ internal static class DataHelper
     {
         private static string AppDataPath { get; } = $@"{Application.UserAppDataPath}\";
         public static string DatabaseFilePath { get; } = $@"{AppDataPath}{AppExtensions.DatabaseFilename}";
-        public static string BookmarkedFilePath { get; } = $@"{AppDataPath}{AppExtensions.BookmarkedFilename}";
+        public static string SavedFilePath { get; } = $@"{AppDataPath}{AppExtensions.SavedFilename}";
 
-        public static WebFile CreateWebFile(string fileUrl)
+        public static WebFile CreateFile(string fileUrl)
         {
             return new WebFile(Path.GetFileName(fileUrl), FtpExtensions.GetFileSize(fileUrl), FtpExtensions.GetFileLastModified(fileUrl), fileUrl);
         }
 
+        public static void RemoveSavedFile()
+        {
+            if (File.Exists(SavedFilePath)) File.Delete(SavedFilePath);
+        }
+
         /// <summary>
         /// Retrieve list of keywords from database
         /// </summary>

FileMasta/Data/Database.cs

@@ -15,9 +15,9 @@ public class Database
         private readonly List<WebFile> _dbFiles = new List<WebFile>();
 
         /// <summary>
-        /// Contains the users bookmarked files url
+        /// Contains the users saved files url
         /// </summary>
-        private readonly List<string> _bookmarkedFiles = new List<string>();
+        private readonly List<string> _savedFiles = new List<string>();
 
         /// <summary>
         /// Contains the metadata of the database
@@ -32,26 +32,22 @@ public Database()
             if (!HttpExtensions.IsFileSizeEqual(DataHelper.DatabaseFilePath, AppExtensions.DatabaseUrl))
                 HttpExtensions.DownloadFile(AppExtensions.DatabaseUrl, DataHelper.DatabaseFilePath);
 
-            var totalNoFiles = 0;
-            long totalFileSize = 0;
-
-            if (!File.Exists(DataHelper.BookmarkedFilePath))
-                File.Create(DataHelper.BookmarkedFilePath);
-
-            if (!string.IsNullOrEmpty(File.ReadAllText(DataHelper.BookmarkedFilePath)))
+            if (File.Exists(DataHelper.SavedFilePath))
             {
-                using (var fs = File.Open(DataHelper.BookmarkedFilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using (var fs = File.Open(DataHelper.SavedFilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
                 using (var bs = new BufferedStream(fs))
                 using (var sr = new StreamReader(bs))
                 {
                     string s;
                     while ((s = sr.ReadLine()) != null)
                     {
-                        _bookmarkedFiles.Add(s);
+                        _savedFiles.Add(s);
                     }
                 }
             }
-
+            
+            var totalNoFiles = 0;
+            long totalFileSize = 0;
             using (var fs = File.Open(DataHelper.DatabaseFilePath, FileMode.Open, FileAccess.Read, FileShare.Read))
             using (var bs = new BufferedStream(fs))
             using (var sr = new StreamReader(bs))
@@ -60,6 +56,7 @@ public Database()
                 string s;
                 while ((s = sr.ReadLine()) != null)
                 {
+                    // Messy way to split csv into a file object
                     var lineParts = s.Split(',');
                     var fileSize = long.Parse(lineParts[0]);
                     var fileLastModified = DateTime.Parse(lineParts[1]);
@@ -117,16 +114,16 @@ where webFile.Url.Equals(fileUrl)
         private static readonly object SearchLock = new object();
 
         /// <summary>
-        /// Search files and Bookmarked from the database
+        /// Search files from the database
         /// </summary>
         /// <param name="sort">Sort results by property</param>
         /// <param name="name">File name to match words/terms</param>
         /// <param name="type">File type to filter</param>
-        /// <param name="minimumSize">More than or equal to file size in bytes</param>
-        /// <param name="lastModifiedMin">Last modified minimum file date</param>
-        /// <param name="lastModifiedMax">Last modified maximum file date</param>
+        /// <param name="minSize">More than or equal to file size in bytes</param>
+        /// <param name="minDateModified">Last modified minimum file date</param>
+        /// <param name="maxDateModified">Last modified maximum file date</param>
         /// <returns>Returns a list of matching files with the specified parameters</returns>
-        public List<WebFile> Search(Sort sort, string name, string[] type, long minimumSize, DateTime lastModifiedMin, DateTime lastModifiedMax)
+        public List<WebFile> Search(Sort sort, string name, string[] type, long minSize, DateTime minDateModified, DateTime maxDateModified)
         {
             lock (SearchLock)
             {
@@ -135,10 +132,10 @@ public List<WebFile> Search(Sort sort, string name, string[] type, long minimumS
                     where StringExtensions.ContainsAll(Uri.UnescapeDataString(webFile.Url.ToLower()),
                               StringExtensions.GetWords(name.ToLower())) &&
                           webFile.IsType(type) &&
-                          webFile.Size >= minimumSize &&
-                          webFile.LastModified > lastModifiedMin &&
-                          webFile.LastModified < lastModifiedMax
-                    select webFile).ToList();
+                          webFile.Size >= minSize &&
+                          webFile.LastModified > minDateModified &&
+                          webFile.LastModified < maxDateModified
+                        select webFile).ToList();
             }
         }
 
@@ -184,5 +181,71 @@ private void Sort(Sort sortBy, bool sortReverse = false)
                 });
             }
         }
+
+        /// <summary>
+        /// Search files from the database
+        /// </summary>
+        /// <returns>Returns a list of matching files with the specified parameters</returns>
+        public List<WebFile> SavedFiles()
+        {
+            lock (SearchLock)
+            {
+                return (from webFile in _savedFiles
+                    let file = GetFile(webFile)
+                    select file).ToList();
+            }
+        }
+
+        /// <summary>
+        /// Save the specified file to users the saved list
+        /// </summary>
+        /// <param name="fileUrl">URL to add</param>
+        public void AddToSaved(string fileUrl)
+        {
+            _savedFiles.Add(fileUrl);
+        }
+
+        /// <summary>
+        /// Remove the specified file from the users saved list
+        /// </summary>
+        /// <param name="fileUrl">URL to remove</param>
+        public void RemoveFromSaved(string fileUrl)
+        {
+            _savedFiles.Remove(fileUrl);
+        }
+
+        /// <summary>
+        /// Check if user has saved the specified file
+        /// </summary>
+        /// <param name="fileUrl">URL of the File</param>
+        /// <returns>True if exists</returns>
+        public bool IsFileSaved(string fileUrl)
+        {
+            foreach (var file in _savedFiles)
+                if (file == fileUrl)
+                    return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Remove all saved file urls
+        /// </summary>
+        public void ClearSaved()
+        {
+            _savedFiles.Clear();
+        }
+
+        /// <summary>
+        /// Save/update saved files to a local file
+        /// </summary>
+        public void UpdateSavedFile()
+        {
+            if (_savedFiles.Count == 0) { DataHelper.RemoveSavedFile(); return; }
+            using (var fs = File.OpenWrite(DataHelper.SavedFilePath))
+            using (var bs = new BufferedStream(fs))
+            using (var sw = new StreamWriter(bs))
+                foreach (var fileUrl in _savedFiles)
+                    sw.WriteLine(fileUrl);
+        }
     }
 }

FileMasta/Extensions/AppExtensions.cs

@@ -0,0 +1,37 @@
+using System.Configuration;
+
+namespace FileMasta.Extensions
+{
+    internal abstract class AppExtensions
+    {
+        /// <summary>
+        /// Retrieve the url of the project hosted on GitHub
+        /// </summary>
+        public static readonly string ProjectUrl = ConfigurationManager.AppSettings["url.project"];
+
+        /// <summary>
+        /// Retrieve the url of the project's change log file
+        /// </summary>
+        public static readonly string ChangelogUrl = ConfigurationManager.AppSettings["fileUrl.changelog"];
+
+        /// <summary>
+        /// Retrieve the url containing the latest project version
+        /// </summary>
+        public static readonly string VersionUrl = ConfigurationManager.AppSettings["fileUrl.version"];
+
+        /// <summary>
+        /// Retrieve the url pointing to the database location
+        /// </summary>
+        public static readonly string DatabaseUrl = ConfigurationManager.AppSettings["fileUrl.database"];
+
+        /// <summary>
+        /// Retrieve the file name of the database
+        /// </summary>
+        public static readonly string DatabaseFilename = ConfigurationManager.AppSettings["fileName.database"];
+
+        /// <summary>
+        /// Retrieve the file name of the users bookmarked data
+        /// </summary>
+        public static readonly string SavedFilename = ConfigurationManager.AppSettings["fileName.saved"];
+    }
+}

FileMasta/Extensions/ControlExtensions.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using FileMasta.Forms;
+
+namespace FileMasta.Extensions
+{
+    internal abstract class ControlExtensions
+    {
+        /// <summary>
+        /// Shows raw text from the specified URL in a window box
+        /// </summary>
+        /// <param name="owner">Text to display in title</param>
+        /// <param name="title">Text to display in title</param>
+        /// <param name="url">URL to fetch string data from</param>
+        public static void ShowDataWindow(Form owner, string title, string url)
+        {
+            var frmInfo = new DataViewDialog { Text = title };
+
+            //using (var client = Program._webClient)
+            using (var stream = Program.WebClient.OpenRead(url))
+            using (var reader = new StreamReader(stream ?? throw new InvalidOperationException("Unable to read data")))
+                frmInfo.labelData.Text = reader.ReadToEnd();
+
+            frmInfo.MaximumSize = new Size(frmInfo.MaximumSize.Width, owner.Height - 100);
+            frmInfo.ShowDialog(owner);
+        }
+
+        /// <summary>
+        /// Change button text and auto size
+        /// </summary>
+        /// <param name="ctrl">Control to set text</param>
+        /// <param name="text">Text to set to control</param>
+        public static void SetControlTextWidth(Button ctrl, string text)
+        {
+            ctrl.Text = text;
+            var myFont = new Font(ctrl.Font.FontFamily, ctrl.Font.Size);
+            var mySize = ctrl.CreateGraphics().MeasureString(ctrl.Text, myFont);
+            ctrl.Width = (int)Math.Round(mySize.Width, 0) + 22;
+            ctrl.Refresh();
+        }
+
+        /// <summary>
+        /// Create a keyword label from template
+        /// </summary>
+        /// <param name="text">Most Search text/value</param>
+        /// <param name="clickEvent">Most Search text/value</param>
+        /// <returns></returns>
+        public static Label KeywordLabel(string text, EventHandler clickEvent)
+        {
+            var a = new Label
+            {
+                Text = text,
+                TextAlign = ContentAlignment.MiddleCenter,
+                Font = new Font("Verdana", 8.25F, FontStyle.Regular | FontStyle.Underline),
+                AutoSize = true,
+                BackColor = Color.Transparent,
+                ForeColor = Color.Black,
+                Margin = new Padding(0, 0, 0, 1),
+                Cursor = Cursors.Hand,
+                Name = "LabelKeyword",
+            };
+
+            // Click event performs a search in main form
+            a.Click += clickEvent;
+
+            return a;
+        }
+    }
+}