fix for non-synced files being deleted

+ post-refactoring fixes
FTPbox · Sep 19, 2013 · 1c677ee · 1c677ee
1 parent 8010c19
commit 1c677ee
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 62 deletions.
diff --git a/FTPboxLib/AccountController.cs b/FTPboxLib/AccountController.cs
@@ -44,7 +44,6 @@ public AccountController()
             SyncQueue = new SyncQueue(this);            
 
             Client = new Client(this);
-
         }
 
         #region Properties
@@ -227,7 +226,7 @@ public string GetHttpLink(string file)
         /// <param name="index">item's index in list</param>
         public string LinkToRecent(int index = 0)
         {
-            return GetHttpLink(RecentList[index].CommonPath);
+            return index < RecentList.Count ? GetHttpLink(RecentList[index].CommonPath) : null;
         }
 
         /// <summary>

diff --git a/FTPboxLib/Client.cs b/FTPboxLib/Client.cs
@@ -507,6 +507,7 @@ public bool CheckWorkingDirectory()
             }
             catch (Exception ex)
             {
+                if (!isConnected) Log.Write(l.Warning, "Client not connected!");
                 Common.LogError(ex);
                 return false;
             }

diff --git a/FTPboxLib/FileLog.cs b/FTPboxLib/FileLog.cs
@@ -35,6 +35,9 @@ public FileLog(AccountController account)
         {
             this.controller = account;
 
+            Files = new List<FileLogItem>();
+            Folders = new List<string>();
+
 			Log.Write(l.Info, "Opened FileLog");
 		}
 

diff --git a/FTPboxLib/Profile.cs b/FTPboxLib/Profile.cs
@@ -36,30 +36,12 @@ public Profile()
 
         public string HomePath { get; set; }
 
+        public bool AskForPassword = false;
+
         #endregion
 
 	    #region Methods
 
-	    /// <summary>
-	    /// Load the profile data from the settings file
-	    /// </summary>
-	    public void Load()
-	    {
-	        Settings.AskForPassword = false;
-	        AddAccount(Settings.DefaultProfile.Account.Host, Settings.DefaultProfile.Account.Username,
-	                   Common.Decrypt(Settings.DefaultProfile.Account.Password), Settings.DefaultProfile.Account.Port);
-	        AddPaths(Settings.DefaultProfile.Paths.Remote, Settings.DefaultProfile.Paths.Local,
-	                 Settings.DefaultProfile.Paths.Parent);
-
-            Account.Protocol = Settings.DefaultProfile.Account.Protocol;
-	        Account.FtpsMethod = Settings.DefaultProfile.Account.FtpsMethod;
-
-	        Account.FtpSecurityProtocol = Settings.DefaultProfile.Account.FtpSecurityProtocol;
-
-            Account.SyncMethod = Settings.DefaultProfile.Account.SyncMethod;
-            Account.SyncFrequency = Settings.DefaultProfile.Account.SyncFrequency;
-	    }
-
 	    public void AddAccount(string host, string user, string pass, int port)
 	    {
 	        Account = new Account()
@@ -93,16 +75,25 @@ public void Clear()
 
         #region Serialization
 
+        private string tmpPassword = string.Empty;
+
         [OnSerializing]
         internal void OnSerializing(StreamingContext context)
         {
-            Account.Password = Common.Encrypt(Account.Password);
+            tmpPassword = Account.Password;
+            if (AskForPassword)
+                Account.Password = string.Empty;
+            else
+                Account.Password = Common.Encrypt(Account.Password);
         }
 
         [OnSerialized]
         internal void OnSerialized(StreamingContext context)
         {
-            Account.Password = Common.Decrypt(Account.Password);
+            if (AskForPassword)
+                Account.Password = tmpPassword;
+            else
+                Account.Password = Common.Decrypt(Account.Password);
         }
 
         [OnDeserialized]

diff --git a/FTPboxLib/Settings.cs b/FTPboxLib/Settings.cs
@@ -36,8 +36,6 @@ public class Settings
         public static bool IsDebugMode;
         public static bool IsNoMenusMode;
 
-        public static bool AskForPassword;
-
         #endregion
 
         #region Methods
@@ -82,11 +80,11 @@ public static void Load()
         /// <summary>
         /// Saves Profiles & General settings to the config file
         /// </summary>
-        public static void Save()
+        public static void Save(AccountController account = null)
         {
             SaveGeneral();
 
-            SaveProfile();
+            SaveProfile(account);
 
             SaveCertificates();
         }

diff --git a/FTPboxLib/SyncQueue.cs b/FTPboxLib/SyncQueue.cs
@@ -532,38 +532,58 @@ private void CheckUpdateItem(SyncQueueItem item)
             }
 
             // Look for local files that should be deleted
-            foreach (var local in new DirectoryInfo(item.LocalPath).GetFiles("*", SearchOption.AllDirectories).Where(x => controller.ItemGetsSynced(controller.GetCommonPath(x.FullName, true))))
-                if (AllItems.All(x => controller.GetCommonPath(x.FullPath, false) != controller.GetCommonPath(local.FullName, true)))
-                    Add(new SyncQueueItem(controller)
+            foreach (var local in new DirectoryInfo(item.LocalPath).GetFiles("*", SearchOption.AllDirectories))
+            {
+                var cpath = controller.GetCommonPath(local.FullName, true);
+                // continue if the file is ignored
+                if (!controller.ItemGetsSynced(cpath)) continue;
+                // continue if the file was found in the remote list
+                if (AllItems.Any(x => controller.GetCommonPath(x.FullPath, false) == cpath)) continue;
+                // continue if the file is not in the log, or is changed compared to the logged data TODO: Maybe send to remote folder?
+                if (controller.FileLog.Files.All(x => x.CommonPath != cpath) ||
+                    controller.FileLog.Files.Find(x => x.CommonPath == cpath).Local != local.LastWriteTime) continue;
+
+                // Seems like the file was deleted from the remote folder
+                Add(new SyncQueueItem(controller)
+                {
+                    Item = new ClientItem
                     {
-                        Item = new ClientItem
-                        {
-                            FullPath = controller.GetCommonPath(local.FullName, true),
-                            Name = local.Name,
-                            Type = ClientItemType.File,
-                            LastWriteTime = local.LastWriteTime,
-                            Size = local.Length
-                        },
-                        ActionType = ChangeAction.deleted,
-                        SyncTo = SyncTo.Local
-                    });
+                        FullPath = cpath,
+                        Name = local.Name,
+                        Type = ClientItemType.File,
+                        LastWriteTime = local.LastWriteTime,
+                        Size = local.Length
+                    },
+                    ActionType = ChangeAction.deleted,
+                    SyncTo = SyncTo.Local
+                });
+            }
             // Look for local folders that should be deleted
-            foreach (var local in new DirectoryInfo(item.LocalPath).GetDirectories("*", SearchOption.AllDirectories).Where(x => controller.ItemGetsSynced(controller.GetCommonPath(x.FullName, true))))
-                if (AllItems.All(x => controller.GetCommonPath(x.FullPath, false) != controller.GetCommonPath(local.FullName, true)))
-                    Add(new SyncQueueItem(controller)
-                    {
-                        Item = new ClientItem
-                        {
-                            FullPath = controller.GetCommonPath(local.FullName, true),
-                            Name = local.Name,
-                            Type = ClientItemType.Folder,
-                            LastWriteTime = DateTime.MinValue,  // Doesn't matter
-                            Size = 0x0                          // Doesn't matter
-                        },
-                        ActionType = ChangeAction.deleted,
-                        SyncTo = SyncTo.Local                        
-                    });
+            foreach (var local in new DirectoryInfo(item.LocalPath).GetDirectories("*", SearchOption.AllDirectories))
+            {
+                var cpath = controller.GetCommonPath(local.FullName, true);
+                // continue if the folder is ignored
+                if (!controller.ItemGetsSynced(cpath)) continue;
+                // continue if the folder was found in the remote list
+                if (AllItems.Any(x => controller.GetCommonPath(x.FullPath, false) == cpath)) continue;
+                // continue if the folder is not in the log TODO: Maybe send to remote folder?
+                if (controller.FileLog.Folders.All(x => x != cpath)) continue;
 
+                // Seems like the folder was deleted from the remote folder
+                Add(new SyncQueueItem(controller)
+                {
+                    Item = new ClientItem
+                    {
+                        FullPath = controller.GetCommonPath(local.FullName, true),
+                        Name = local.Name,
+                        Type = ClientItemType.Folder,
+                        LastWriteTime = DateTime.MinValue, // Doesn't matter
+                        Size = 0x0 // Doesn't matter
+                    },
+                    ActionType = ChangeAction.deleted,
+                    SyncTo = SyncTo.Local
+                });
+            }
             RemoveLast(StatusType.Success);
         }
 

diff --git a/Windows/FTPbox.v11.suo b/Windows/FTPbox.v11.suo
diff --git a/Windows/FTPbox/FTPboxLib.dll b/Windows/FTPbox/FTPboxLib.dll
diff --git a/Windows/FTPbox/Forms/Account.cs b/Windows/FTPbox/Forms/Account.cs
@@ -54,7 +54,7 @@ private void bDone_Click(object sender, EventArgs e)
                 Program.Account.Client.Connect();
                 Log.Write(l.Debug, "Connected: {0}", Program.Account.Client.isConnected);
 
-                Settings.AskForPassword = cAskForPass.Checked;
+                Program.Account.AskForPassword = cAskForPass.Checked;
 
                 Hide();
             }

diff --git a/Windows/FTPbox/Forms/Paths.cs b/Windows/FTPbox/Forms/Paths.cs
@@ -33,7 +33,7 @@ private void bDone_Click(object sender, EventArgs e)
 
             Program.Account.AddPaths(tFullDir.Text, tPath.Text, tParent.Text);
 
-            Settings.Save();
+            Settings.Save(Program.Account);
 
             Program.Account.Client.WorkingDirectory = Program.Account.Paths.Remote;
 

diff --git a/Windows/FTPbox/Forms/fMain.cs b/Windows/FTPbox/Forms/fMain.cs
@@ -1046,11 +1046,11 @@ private void SyncArgItems(string[] args)
                     MessageBox.Show("You cannot use this for files that are not inside the FTPbox folder.", "FTPbox - Invalid file", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     continue;
                 }
+                var cpath = Program.Account.GetCommonPath(s, true);
+                bool exists = Program.Account.Client.Exists(cpath);
 
                 if (Common.PathIsFile(s) && File.Exists(s))
                 {
-                    var cpath = Program.Account.GetCommonPath(s, true);
-                    bool exists = Program.Account.Client.Exists(cpath);
                     Program.Account.SyncQueue.Add(new SyncQueueItem (Program.Account)
                     {
                         Item = new ClientItem
@@ -1079,7 +1079,7 @@ private void SyncArgItems(string[] args)
                             LastWriteTime = DateTime.MinValue
                         },
                         ActionType = ChangeAction.changed,
-                        SyncTo = SyncTo.Local,
+                        SyncTo = exists ? SyncTo.Local : SyncTo.Remote,
                         SkipNotification = true
                     });
                 }