From 69588a95eec7f04817bc4582a8cf6011e475069e Mon Sep 17 00:00:00 2001
From: pkanavos <pkanavos@gmail.com>
Date: Fri, 27 Apr 2012 00:00:37 +0300
Subject: [PATCH] Fix for missing directories

---
 trunk/Pithos.Client.WPF.Test/NodeTest.cs           |   47 ++++++++++++
 .../Pithos.Client.WPF.Test.csproj                  |    4 +
 .../FileProperties/ConflictsView.xaml              |   14 +++-
 .../FileProperties/ConflictsViewModel.cs           |   18 ++++-
 .../Preferences/PreferencesViewModel.cs            |    3 +
 .../SelectiveSynch/SelectiveSynchViewModel.cs      |    6 +-
 .../Utils/EnumerableExtensions.cs                  |   81 ++++++++++++++++----
 trunk/Pithos.Core/Agents/StatusAgent.cs            |   10 ++-
 trunk/Pithos.Network/CloudFilesClient.cs           |    8 +-
 9 files changed, 159 insertions(+), 32 deletions(-)

diff --git a/trunk/Pithos.Client.WPF.Test/NodeTest.cs b/trunk/Pithos.Client.WPF.Test/NodeTest.cs
index db834fc..e37d87a 100644
--- a/trunk/Pithos.Client.WPF.Test/NodeTest.cs
+++ b/trunk/Pithos.Client.WPF.Test/NodeTest.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
+using Pithos.Client.WPF.SelectiveSynch;
 using Pithos.Client.WPF.Utils;
+using Pithos.Interfaces;
 
 namespace Pithos.Client.WPF.Test
 {
@@ -120,6 +122,51 @@ namespace Pithos.Client.WPF.Test
                             };
 
             Assert.That(source.ToTree(s=>s.Item1,s=>s.Item2).First().Equals(target), Is.True);
+        } [Test]
+        
+        public void TestObjectInfoToTree()
+        {
+            var target = new DirectoryRecord{ DisplayName= "Root",
+                                Directories =
+                                    {
+                                        new DirectoryRecord{DisplayName = "Root/DisplayName1",
+                                            Directories =
+                                                {
+                                                    new DirectoryRecord{DisplayName="Root/DisplayName1/File2"},
+                                                    new DirectoryRecord{DisplayName="Root/DisplayName1/DisplayName11",
+                                                        Directories=
+                                                            {
+                                                                new DirectoryRecord{DisplayName="Root/DisplayName1/DisplayName11/DisplayName111",
+                                                                Directories=
+                                                                    {
+                                                                        new DirectoryRecord{DisplayName="Root/DisplayName1/DisplayName11/DisplayName111/File1"}        
+                                                                    }}
+                                                            }
+                                                    },
+                                                }
+                                        },                                        
+                                    }
+                            };
+            var account = "someaccount";
+            var container = "Root";
+            var source= new[]
+                            {
+                                new ObjectInfo{Account=account,Container=container,Name="Path1",Content_Type="application/directory"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path1/Path11",Content_Type="application/folder"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path1/Path11/Path111"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path1/Path11/Path111/File1",Content_Type="application/octet-stream"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path1/File2"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path2/File2"},
+                                new ObjectInfo{Account=account,Container=container,Name="Path2/Path21/File2"},
+                                new ObjectInfo{Account=account,Container=container,Name="File02"},
+                                new ObjectInfo{Account=account,Container=container,Name="File03"}
+                            };
+
+            var tree = source.ToTree();
+            var allNodes = (from DirectoryRecord root in tree
+                            from DirectoryRecord record in root
+                            select record).ToList();    
+            Assert.That(allNodes.Count,Is.EqualTo(5));
         }
     }
 }
diff --git a/trunk/Pithos.Client.WPF.Test/Pithos.Client.WPF.Test.csproj b/trunk/Pithos.Client.WPF.Test/Pithos.Client.WPF.Test.csproj
index 1639c2a..b241911 100644
--- a/trunk/Pithos.Client.WPF.Test/Pithos.Client.WPF.Test.csproj
+++ b/trunk/Pithos.Client.WPF.Test/Pithos.Client.WPF.Test.csproj
@@ -61,6 +61,10 @@
       <Project>{4D9406A3-50ED-4672-BB97-A0B3EA4946FE}</Project>
       <Name>Pithos.Client.WPF</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Pithos.Interfaces\Pithos.Interfaces.csproj">
+      <Project>{7EEFF32F-CCF8-436A-9E0B-F40434C09AF4}</Project>
+      <Name>Pithos.Interfaces</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
index 9883c29..4e2e0e6 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
@@ -3,8 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org" 
         xmlns:cnv="clr-namespace:Pithos.Client.WPF.Converters"
         xmlns:model="clr-namespace:Pithos.Client.WPF.FileProperties"
-        Title="Conflicts" Height="500" Width="500" x:Name="This"
-		>
+        Title="Conflicts" Height="500" Width="500" x:Name="This" xmlns:my="clr-namespace:Microsoft.Windows.Controls.Core.Converters;assembly=WPFToolkit.Extended" Icon="/PithosPlus;component/Images/Pithos.ico">
     <Window.Resources>
         <ResourceDictionary>
             <ContextMenu  x:Key="RowMenu" DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
@@ -13,7 +12,9 @@
         <Style x:Key="DefaultRowStyle" TargetType="{x:Type DataGridRow}">
             <Setter Property="ContextMenu" Value="{StaticResource RowMenu}" />
         </Style>
-                <ResourceDictionary.MergedDictionaries>
+            <BooleanToVisibilityConverter x:Key="BoolToVisible" />
+            <my:InverseBoolConverter x:Key="BoolToInvisible" />
+            <ResourceDictionary.MergedDictionaries>
                     <ResourceDictionary Source="..\PithosStyles.xaml" />
                 </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary>
@@ -24,7 +25,11 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         
-        <DataGrid x:Name="Conflicts" HorizontalContentAlignment="Stretch" Grid.Row="0" AutoGenerateColumns="false" RowStyle="{StaticResource DefaultRowStyle}">
+        <DataGrid x:Name="Conflicts" HorizontalContentAlignment="Stretch" Grid.Row="0" 
+                  AutoGenerateColumns="false" 
+                  RowStyle="{StaticResource DefaultRowStyle}"
+                  Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=HasConflicts}"
+                  >
             <DataGrid.Columns>
                 <DataGridTextColumn x:Name="FilePath" Binding="{Binding FilePath}" Header="File" Width="*" />
                 <DataGridTextColumn x:Name="LocalModified" Binding="{Binding LocalModified}" Header="Local Date" Width="Auto" />
@@ -43,6 +48,7 @@
                 </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
+        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Visibility="{Binding Converter={StaticResource BoolToInvisible}, Path=HasConflicts}" FontWeight="Bold">There are no conflicts.</TextBlock>
         <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right">
             <Button Name="Apply" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsDefault="False" />
             <Button Name="Cancel" Content="Cancel" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsCancel="True" />
diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index da7a840..611bf38 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text;
 using Caliburn.Micro;
 using Pithos.Client.WPF.Converters;
+using Pithos.Client.WPF.Utils;
 using Pithos.Core;
 using Pithos.Interfaces;
 
@@ -45,7 +46,10 @@ namespace Pithos.Client.WPF.FileProperties
         private string _reason;
         public string Reason
         {
-            get { return _reason; }
+            get
+            {
+                return _reason;
+            }
             set
             {
                 _reason = value;
@@ -91,6 +95,11 @@ namespace Pithos.Client.WPF.FileProperties
             get { return _conflicts; }
         }
 
+        public bool HasConflicts
+        {
+            get { return Conflicts!=null && Conflicts.Count > 0; }
+        }
+
         public string[]  Actions
         {
             get { return new[] {"Keep Local", "Keep Server", "Keep Both"}; }
@@ -105,7 +114,12 @@ namespace Pithos.Client.WPF.FileProperties
                          select state;
             var conflicts = from state in fileStates
                             let info=FileInfoExtensions.FromPath(state.FilePath)
-                            select new ConflictFile {FilePath = state.FilePath,Reason=state.ConflictReason,LocalModified = info.LastWriteTime};          
+                            select new ConflictFile
+                                       {
+                                           FilePath = state.FilePath,
+                                           Reason=state.ConflictReason??state.FileStatus.Name() ,
+                                           LocalModified = info.LastWriteTime
+                                       };          
             _conflicts = new ObservableCollection<ConflictFile>(conflicts.ToList());
             
         }
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 5c040d5..ef9310e 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -488,6 +488,9 @@ namespace Pithos.Client.WPF.Preferences
 
                 var cachePath = Path.Combine(CurrentAccount.RootPath, FolderConstants.CacheFolder);
                 var dir = new DirectoryInfo(cachePath);
+                //The file may not exist if we just created the account
+                if (!dir.Exists)
+                    return;
                 dir.EnumerateFiles().Apply(file=>file.Delete());
                 dir.EnumerateDirectories().Apply(folder => folder.Delete(true));
             }
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
index 8520ca1..0aca1a0 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
@@ -109,8 +109,7 @@ namespace Pithos.Client.WPF.SelectiveSynch
                                   {
                                       DisplayName = container.Name,
                                       Uri=new Uri(client.StorageUrl,String.Format(@"{0}/{1}",Account.AccountName, container.Name)),
-                                      Directories = (from dir in client.ListObjects(AccountName, container.Name)                                                     
-                                                     where dir.IsDirectory
+                                      Directories = (from dir in client.ListObjects(AccountName, container.Name)                                                                                                          
                                                      select dir).ToTree()
                                   };
             var ownFolders = dirs.ToList();
@@ -125,8 +124,7 @@ namespace Pithos.Client.WPF.SelectiveSynch
                                                         {
                                                             DisplayName=container.Name,
                                                             Uri = new Uri(client.StorageUrl, "../" + account.name + "/" + container.Name),
-                                                            Directories=(from folder in client.ListObjects(account.name,container.Name)
-                                                                        where folder.IsDirectory
+                                                            Directories=(from folder in client.ListObjects(account.name,container.Name)                                                                        
                                                                         select folder).ToTree()
                                                         }).ToList()
                              };                                                          
diff --git a/trunk/Pithos.Client.WPF/Utils/EnumerableExtensions.cs b/trunk/Pithos.Client.WPF/Utils/EnumerableExtensions.cs
index d76fc09..68b178f 100644
--- a/trunk/Pithos.Client.WPF/Utils/EnumerableExtensions.cs
+++ b/trunk/Pithos.Client.WPF/Utils/EnumerableExtensions.cs
@@ -4,7 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+using System.Text.RegularExpressions;
 using Pithos.Client.WPF.SelectiveSynch;
+using Pithos.Core;
 using Pithos.Interfaces;
 
 namespace Pithos.Client.WPF.Utils
@@ -79,30 +81,83 @@ namespace Pithos.Client.WPF.Utils
 
         public static List<DirectoryRecord> ToTree(this IEnumerable<ObjectInfo> enumerable)
         {
+            //Order the items to ensure that children always come after their parents
             var orderedItems=enumerable.OrderBy(o=>o.Uri.ToString());
+            //Each item is stored in lookups
             var lookups = new Dictionary<string,DirectoryRecord>();
-            var nodes = new List<DirectoryRecord>();
+            
+            //RootNodes contains only the root nodes
+            var rootNodes = new List<DirectoryRecord>();            
+
             foreach (var item in orderedItems)
             {
                 var path = item.Uri.ToString();
-                var newNode = new DirectoryRecord{ DisplayName=item.Name.Split('/').Last(),ObjectInfo=item};
-                lookups[path] = newNode;
-
-                var lastIndex = path.LastIndexOf("/", StringComparison.Ordinal);
-                var upTo = lastIndex < 0 ? path.Length - 1 : lastIndex;
-                var parentPath = path.Substring(0, upTo);              
-  
+                //Calculate the parent path
+                var parentPath = GetParentPath(path);
+                var parentName = GetParentPath(item.Name);
                 DirectoryRecord parent;
-                if (lookups.TryGetValue(parentPath, out parent))
+                DirectoryRecord newNode;
+
+                //Dont't add files
+                if (!item.IsDirectory)
                 {
-                    parent.Directories.Add(newNode);   
-                    parent.Directories.Sort((x,y)=>String.CompareOrdinal(x.Uri.ToString(), y.Uri.ToString()));
+                    //But check to ensure that we DO have it's parent on record
+                    //It it exist
+                    if (lookups.TryGetValue(parentPath, out parent))
+                    {
+                        //Just continue
+                        continue;
+                    }
+                    //If the item is directly below its parent container, there is no path to add
+                    if (String.IsNullOrWhiteSpace(parentName))
+                        continue;
+                    //Otherwise we need to add it, because it is missing from the list
+                    //Store each item using its current path
+                    newNode = new DirectoryRecord { DisplayName = parentPath.Split('/').Last(), 
+                        ObjectInfo = new ObjectInfo{Account=item.Account,Container=item.Container,Name=parentPath,Content_Type="application/directory"}};
                 }
                 else
-                    nodes.Add(newNode);
+                {
+                    //Store each item using its current path
+                    newNode = new DirectoryRecord {DisplayName = item.Name.Split('/').Last(), ObjectInfo = item};
+                }
+                AddNode(rootNodes, parentPath, path, lookups, newNode);
+            }
+            return rootNodes;
+        }
+
+        private static void AddNode(List<DirectoryRecord> rootNodes, string parentPath, string path, Dictionary<string, DirectoryRecord> lookups, DirectoryRecord newNode)
+        {
+            DirectoryRecord parent;
+            lookups[path] = newNode;
 
+
+            //Does a parent item exist? 
+            if (lookups.TryGetValue(parentPath, out parent))
+            {
+                //If so, add the current item under its parent
+                parent.Directories.Add(newNode);
+                parent.Directories.Sort((x, y) => String.CompareOrdinal(x.Uri.ToString(), y.Uri.ToString()));
             }
-            return nodes;
+            else
+                //Otherwise add it to the list of root nodes
+                rootNodes.Add(newNode);
+        }
+
+        private static string GetParentPath(string path)
+        {            
+            var lastIndex = path.LastIndexOf("/", StringComparison.Ordinal);
+            if (lastIndex < 0)
+                return null;
+            var parentPath = path.Substring(0, lastIndex);
+            return parentPath;
+        }
+
+        static readonly Regex PascalCaseRegex = new Regex("[a-z][A-Z]", RegexOptions.Compiled);        
+        public static string Name(this  Enum value)
+        {
+            var name = Enum.GetName(value.GetType(), value);            
+            return PascalCaseRegex.Replace(name, m => m.Value[0] + " " + char.ToLower(m.Value[1]));            
         }
     }
 }
diff --git a/trunk/Pithos.Core/Agents/StatusAgent.cs b/trunk/Pithos.Core/Agents/StatusAgent.cs
index 94bdbeb..7090f90 100644
--- a/trunk/Pithos.Core/Agents/StatusAgent.cs
+++ b/trunk/Pithos.Core/Agents/StatusAgent.cs
@@ -363,7 +363,7 @@ namespace Pithos.Core.Agents
             }
         }
 
-        private int UpdateStatusDirect(string absolutePath, FileStatus fileStatus, FileOverlayStatus overlayStatus)
+        private int UpdateStatusDirect(string absolutePath, FileStatus fileStatus, FileOverlayStatus overlayStatus, string conflictReason)
         {
             using (log4net.ThreadContext.Stacks["StatusAgent"].Push("UpdateStatusDirect"))
             {
@@ -376,13 +376,14 @@ namespace Pithos.Core.Agents
                     using (
                         var command =
                             new SQLiteCommand(
-                                "update FileState set OverlayStatus= :overlayStatus, FileStatus= :fileStatus where FilePath = :path COLLATE NOCASE ",
+                                "update FileState set OverlayStatus= :overlayStatus, FileStatus= :fileStatus,ConflictReason= :conflictReason where FilePath = :path COLLATE NOCASE ",
                                 connection))
                     {
 
                         command.Parameters.AddWithValue("path", absolutePath);
                         command.Parameters.AddWithValue("fileStatus", fileStatus);
                         command.Parameters.AddWithValue("overlayStatus", overlayStatus);
+                        command.Parameters.AddWithValue("conflictReason", conflictReason);
                         
                         var affected = command.ExecuteNonQuery();
                         if (affected == 0)
@@ -390,6 +391,7 @@ namespace Pithos.Core.Agents
                             var createdState=FileState.CreateFor(FileInfoExtensions.FromPath(absolutePath));
                             createdState.FileStatus = fileStatus;
                             createdState.OverlayStatus = overlayStatus;
+                            createdState.ConflictReason = conflictReason;
                             createdState.Create();  
                         }
                         return affected;
@@ -582,7 +584,7 @@ namespace Pithos.Core.Agents
             _persistenceAgent.Post(() =>FileState.RenameState(oldPath, newPath));
         }*/
 
-        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string localFileMissingFromServer)
+        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string conflictReason)
         {
             if (String.IsNullOrWhiteSpace(path))
                 throw new ArgumentNullException("path");
@@ -593,7 +595,7 @@ namespace Pithos.Core.Agents
             Debug.Assert(!path.Contains(FolderConstants.CacheFolder));
             Debug.Assert(!path.EndsWith(".ignore"));
 
-            _persistenceAgent.Post(() => UpdateStatusDirect(path, fileStatus, overlayStatus));
+            _persistenceAgent.Post(() => UpdateStatusDirect(path, fileStatus, overlayStatus, conflictReason));
         }
 
 /*
diff --git a/trunk/Pithos.Network/CloudFilesClient.cs b/trunk/Pithos.Network/CloudFilesClient.cs
index 8afffb2..9d4bc06 100644
--- a/trunk/Pithos.Network/CloudFilesClient.cs
+++ b/trunk/Pithos.Network/CloudFilesClient.cs
@@ -1416,16 +1416,14 @@ namespace Pithos.Network
                     client.PutWithRetry(fileUrl, 3, @"application/octet-stream");
 
                     var expectedCodes = new[] { HttpStatusCode.OK, HttpStatusCode.NoContent, HttpStatusCode.Created};
-                    return (expectedCodes.Contains(client.StatusCode));
+                    var result=(expectedCodes.Contains(client.StatusCode));
+                    DeleteObject(account, cloudFile.Container, fileUrl);
+                    return result;
                 }
                 catch
                 {
                     return false;
                 }
-                finally
-                {
-                    DeleteObject(account,cloudFile.Container,fileUrl);                    
-                }                
             }
         }
     }
-- 
1.7.10.4