From cbefd298922d7c0b603d65c1dfbd1fda788250f3 Mon Sep 17 00:00:00 2001
From: pkanavos <pkanavos@gmail.com>
Date: Mon, 7 May 2012 22:52:02 +0300
Subject: [PATCH] Added option to disable selective Synchronization When
 selective sync is disabled only owned files are
 synchronized. Shared files are not synchronized. Folders
 (not their contents) are synchronized even when selective
 sync is disabled

---
 .../Preferences/PreferencesView.xaml               |   15 +++---
 .../Preferences/PreferencesViewModel.cs            |    2 +-
 .../Properties/Settings.Designer.cs                |   31 +++++++------
 .../Pithos.Client.WPF/Properties/Settings.settings |   29 ++++++------
 .../SelectiveSynch/SelectiveSynchChanges.cs        |    1 +
 .../SelectiveSynch/SelectiveSynchView.xaml         |   19 ++++----
 .../SelectiveSynch/SelectiveSynchViewModel.cs      |   17 +++++--
 trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs    |    1 +
 trunk/Pithos.Core/Agents/CollectionExtensions.cs   |   10 ++++
 trunk/Pithos.Core/Agents/SelectiveUris.cs          |   48 ++++++++++++++++++++
 trunk/Pithos.Core/Agents/Uploader.cs               |    2 +-
 trunk/Pithos.Interfaces/AccountSettings.cs         |    7 ++-
 trunk/Pithos.Interfaces/ObjectInfo.cs              |    9 ++++
 13 files changed, 141 insertions(+), 50 deletions(-)

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 687b17e..60cd8c1 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -105,6 +105,8 @@
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
                                 <RowDefinition />
                             </Grid.RowDefinitions>
                             <Label Content="Server" Grid.Column="0" Grid.Row="0" Margin="0,5" HorizontalAlignment="Left"/>
@@ -127,13 +129,14 @@
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBox  Name="CurrentAccount_RootPath" Margin="1,5,5,-30" HorizontalAlignment="Stretch" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}" Height="61" TextWrapping="WrapWithOverflow" />
+                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}" Height="61" TextWrapping="WrapWithOverflow" />
                             </Grid>
-                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="6" Margin="6,66,230,6" Grid.ColumnSpan="2"  />
-                            <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="100" Style="{StaticResource ButtonStyle}" Grid.Row="6" Margin="12,40,0,24" Grid.Column="1" />
-                            <Button Name="MoveAccountFolder" Content="Move ..." Margin="20,40,234,24" Grid.Row="6" Grid.Column="1" Width="100"/>
-                            <Button Name="ClearAccountCache" Content="Clear Cache" Margin="245,40,9,24" Grid.Row="6" Grid.Column="1" Width="100" />
-                            <CheckBox Name="Selective_IsActive" Content="Enable Selective Sync" Grid.Row="6" Margin="132,66,80,6" Grid.Column="2" Grid.ColumnSpan="2" IsChecked="False" />
+                            <StackPanel Orientation="Horizontal" Grid.Row="6" Grid.Column="1">
+                                <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="100" Style="{StaticResource ButtonStyle}" />
+                                <Button Name="MoveAccountFolder" Content="Move ..." Width="100" Style="{StaticResource ButtonStyle}"/>
+                                <Button Name="ClearAccountCache" Content="Clear Cache" Width="100" Style="{StaticResource ButtonStyle}"/>
+                            </StackPanel>
+                            <CheckBox  Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="7"  Grid.Column="1"  />
                         </Grid>
                         
                     </GroupBox>
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 2b5f249..01c99c3 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -225,7 +225,7 @@ namespace Pithos.Client.WPF.Preferences
             //var monitor = Shell.Monitors[CurrentAccount.AccountKey];
             
 
-            var model = new SelectiveSynchViewModel(/*monitor,*/_events,CurrentAccount.Account,CurrentAccount.ApiKey);
+            var model = new SelectiveSynchViewModel(_events,CurrentAccount.Account,CurrentAccount.ApiKey);            
             if (_windowManager.ShowDialog(model) == true)
             {
                 
diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
index 220d9ff..1718b04 100644
--- a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.431
+//     Runtime Version:4.0.30319.530
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -389,20 +389,21 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute(@"
-					<ArrayOfServerSettings xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
-						<ServerSettings>
-							<ServerUri>https://pithos.okeanos.grnet.gr</ServerUri>
-							<LoginUri>https://pithos.okeanos.grnet.gr/login</LoginUri>
-							<LogoutUri>https://accounts.okeanos.grnet.gr/im/logout</LogoutUri>
-						</ServerSettings>
-						<ServerSettings>
-							<ServerUri>https://pithos.dev.grnet.gr</ServerUri>
-							<LoginUri>https://pithos.dev.grnet.gr/login</LoginUri>
-							<LogoutUri>https://pithos.dev.grnet.gr/im/logout</LogoutUri>
-						</ServerSettings>
-					</ArrayOfServerSettings>
-				")]
+        [global::System.Configuration.DefaultSettingValueAttribute(@"<?xml version=""1.0"" encoding=""utf-16""?>
+<ArrayOfServerSettings xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
+  <ServerSettings>
+<ServerName>Pithos Production</ServerName>
+    <ServerUri>https://pithos.okeanos.grnet.gr</ServerUri>
+    <LoginUri>https://pithos.okeanos.grnet.gr/login</LoginUri>
+    <LogoutUri>https://accounts.okeanos.grnet.gr/im/logout</LogoutUri>
+  </ServerSettings>
+  <ServerSettings>
+<ServerName>Pithos Development</ServerName>
+    <ServerUri>https://pithos.dev.grnet.gr</ServerUri>
+    <LoginUri>https://pithos.dev.grnet.gr/login</LoginUri>
+    <LogoutUri>https://pithos.dev.grnet.gr/im/logout</LogoutUri>
+  </ServerSettings>
+</ArrayOfServerSettings>")]
         public global::Pithos.Interfaces.ServersCollection Servers {
             get {
                 return ((global::Pithos.Interfaces.ServersCollection)(this["Servers"]));
diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.settings b/trunk/Pithos.Client.WPF/Properties/Settings.settings
index d4af2ad..dca5124 100644
--- a/trunk/Pithos.Client.WPF/Properties/Settings.settings
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.settings
@@ -99,20 +99,21 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="Servers" Type="Pithos.Interfaces.ServersCollection" Scope="Application">
-      <Value Profile="(Default)">
-					&lt;ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-						&lt;ServerSettings&gt;
-							&lt;ServerUri&gt;https://pithos.okeanos.grnet.gr&lt;/ServerUri&gt;
-							&lt;LoginUri&gt;https://pithos.okeanos.grnet.gr/login&lt;/LoginUri&gt;
-							&lt;LogoutUri&gt;https://accounts.okeanos.grnet.gr/im/logout&lt;/LogoutUri&gt;
-						&lt;/ServerSettings&gt;
-						&lt;ServerSettings&gt;
-							&lt;ServerUri&gt;https://pithos.dev.grnet.gr&lt;/ServerUri&gt;
-							&lt;LoginUri&gt;https://pithos.dev.grnet.gr/login&lt;/LoginUri&gt;
-							&lt;LogoutUri&gt;https://pithos.dev.grnet.gr/im/logout&lt;/LogoutUri&gt;
-						&lt;/ServerSettings&gt;
-					&lt;/ArrayOfServerSettings&gt;
-				</Value>
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfServerSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;ServerSettings&gt;
+&lt;ServerName&gt;Pithos Production&lt;/ServerName&gt;
+    &lt;ServerUri&gt;https://pithos.okeanos.grnet.gr&lt;/ServerUri&gt;
+    &lt;LoginUri&gt;https://pithos.okeanos.grnet.gr/login&lt;/LoginUri&gt;
+    &lt;LogoutUri&gt;https://accounts.okeanos.grnet.gr/im/logout&lt;/LogoutUri&gt;
+  &lt;/ServerSettings&gt;
+  &lt;ServerSettings&gt;
+&lt;ServerName&gt;Pithos Development&lt;/ServerName&gt;
+    &lt;ServerUri&gt;https://pithos.dev.grnet.gr&lt;/ServerUri&gt;
+    &lt;LoginUri&gt;https://pithos.dev.grnet.gr/login&lt;/LoginUri&gt;
+    &lt;LogoutUri&gt;https://pithos.dev.grnet.gr/im/logout&lt;/LogoutUri&gt;
+  &lt;/ServerSettings&gt;
+&lt;/ArrayOfServerSettings&gt;</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchChanges.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchChanges.cs
index 4801079..0d686a5 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchChanges.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchChanges.cs
@@ -49,6 +49,7 @@ namespace Pithos.Client.WPF.SelectiveSynch
 {
     public class SelectiveSynchChanges
     {
+        public bool Enabled { get; set; }
         public Uri[] Uris { get; set; }
         public AccountSettings Account { get; set; }
         public Uri[] Added { get; set; }
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
index f6a6b2b..d43a83a 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
@@ -41,22 +41,25 @@
 
 
     </Window.Resources>
-    <Grid>
+    <extToolkit:BusyIndicator Name="IsBusy" BusyContent="Retrieving folders ..." DisplayAfter="0">
+        <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <extToolkit:BusyIndicator Name="IsBusy" Grid.Row="0" BusyContent="Retrieving folders ..." DisplayAfter="0">
-            <TreeView  Name="RootNodes" Margin="5"
-                  ItemContainerStyle="{StaticResource TreeItemStyle}" 
-                  ItemTemplate="{StaticResource CheckboxStyle}">
-            </TreeView>
-        </extToolkit:BusyIndicator>
-        <StackPanel Grid.Row="1">
+        <CheckBox x:Name="IsEnabled" Content="Enable Selective Syncing" Margin="5" Grid.Row="0"/>
+        <TreeView  Name="RootNodes" Margin="5" Grid.Row="1"
+                ItemContainerStyle="{StaticResource TreeItemStyle}" 
+                ItemTemplate="{StaticResource CheckboxStyle}"
+                    IsEnabled="{Binding IsEnabled}" >
+        </TreeView>
+        <StackPanel Grid.Row="2">
             <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right">
                 <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5"  Style="{StaticResource ButtonStyle}"/>
                 <Button Name="RejectChanges" Content="Cancel" Margin="5,5,10,5"  Style="{StaticResource ButtonStyle}"/>                
             </StackPanel>
         </StackPanel>
     </Grid>
+    </extToolkit:BusyIndicator>
 </Window>
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
index abfe6d9..e680d88 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
@@ -94,6 +94,7 @@ namespace Pithos.Client.WPF.SelectiveSynch
             //_monitor = monitor;
             _events = events;
             _apiKey = apiKey;
+            IsEnabled = account.SelectiveSyncEnabled;
             TaskEx.Run(LoadRootNode);
         }
 
@@ -267,7 +268,7 @@ namespace Pithos.Client.WPF.SelectiveSynch
                           where record.Removed && record.Uri != null
                          select record.Uri).ToArray();
             //TODO: Include Uris for the containers as well
-            _events.Publish(new SelectiveSynchChanges{Account=Account,Uris=uris,Added=added,Removed=removed});
+            _events.Publish(new SelectiveSynchChanges{Enabled=IsEnabled, Account=Account,Uris=uris,Added=added,Removed=removed});
             
 
             
@@ -275,11 +276,21 @@ namespace Pithos.Client.WPF.SelectiveSynch
             TryClose(true);
         }
 
-        
+        private bool _isEnabled;
+        public bool IsEnabled
+        {
+            get { return _isEnabled; }
+            set
+            {
+                _isEnabled = value;
+                NotifyOfPropertyChange(()=>IsEnabled);
+            }
+        }
+
         private void SaveSettings(IEnumerable<Uri> uris)
         {
             var selections = uris.Select(uri => uri.ToString()).ToArray();
-
+            Account.SelectiveSyncEnabled = IsEnabled;
             Account.SelectiveFolders.Clear();
             Account.SelectiveFolders.AddRange(selections);
             Settings.Default.Save();            
diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 5dbb37e..dd3999d 100644
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -997,6 +997,7 @@ namespace Pithos.Client.WPF {
 		        PithosMonitor monitor;
 		        if (Monitors.TryGetValue(message.Account.AccountKey, out monitor))
 		        {
+                    monitor.Selectives.SetIsSelectiveEnabled(message.Account.AccountKey, message.Enabled);
 		            monitor.SetSelectivePaths(message.Uris, message.Added, message.Removed);
 		        }
 
diff --git a/trunk/Pithos.Core/Agents/CollectionExtensions.cs b/trunk/Pithos.Core/Agents/CollectionExtensions.cs
index b4ecd38..7282511 100644
--- a/trunk/Pithos.Core/Agents/CollectionExtensions.cs
+++ b/trunk/Pithos.Core/Agents/CollectionExtensions.cs
@@ -41,10 +41,12 @@
 #endregion
 using System.Collections.Concurrent;
 using System.Diagnostics.Contracts;
+using System.IO;
 using Pithos.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Pithos.Network;
 
 namespace Pithos.Core.Agents
 {
@@ -198,6 +200,14 @@ namespace Pithos.Core.Agents
                 && target.IsAtOrBelow(root);
         }
 
+        public static bool IsSharedTo(this string targetPath,AccountInfo account)
+        {
+            var othersFolder = Path.Combine(account.AccountPath, FolderConstants.OthersFolder);
+            var isShared = targetPath.IsAtOrBelow(othersFolder);
+            return isShared;
+
+        }
+
         /// <summary>
         /// Checkes whether a file path is below a root path
         /// </summary>
diff --git a/trunk/Pithos.Core/Agents/SelectiveUris.cs b/trunk/Pithos.Core/Agents/SelectiveUris.cs
index ee2fa49..225e791 100644
--- a/trunk/Pithos.Core/Agents/SelectiveUris.cs
+++ b/trunk/Pithos.Core/Agents/SelectiveUris.cs
@@ -24,6 +24,37 @@ namespace Pithos.Core.Agents
             SelectivePaths = new ConcurrentDictionary<Uri, List<string>>();
         }
 
+        readonly Dictionary<Uri, bool> _selectiveEnabled = new Dictionary<Uri, bool>();
+
+/*
+        public void SetIsSelectiveEnabled(AccountInfo account,bool value)
+        {
+            _selectiveEnabled[account.AccountKey]=value;
+        }
+*/
+
+        public void SetIsSelectiveEnabled(Uri accountKey,bool value)
+        {
+            _selectiveEnabled[accountKey]=value;
+        }
+/*
+
+        public bool IsSelectiveEnabled(AccountInfo account)
+        {
+            bool isEnabled;
+            _selectiveEnabled.TryGetValue(account.AccountKey, out isEnabled);
+            return isEnabled;
+        }
+*/
+
+        public bool IsSelectiveEnabled(Uri accountKey)
+        {
+            bool isEnabled;
+            _selectiveEnabled.TryGetValue(accountKey, out isEnabled);
+            return isEnabled;
+        }
+
+
         public void SetSelectedUris(AccountInfo account,List<Uri> uris)
         {
             SelectiveUris[account.AccountKey] = uris;
@@ -32,6 +63,12 @@ namespace Pithos.Core.Agents
 
         public bool IsSelected(ObjectInfo info)
         {
+            //Shared folders should NOT be synced if selective syncing is disabled
+            var isShared = info.IsShared;
+            var selectiveEnabled = IsSelectiveEnabled(info.AccountKey);
+            if (!selectiveEnabled)
+                return !isShared;
+
             List<Uri> filterUris;
             return !SelectiveUris.TryGetValue(info.AccountKey, out filterUris) 
                 || filterUris.Count ==0
@@ -40,11 +77,22 @@ namespace Pithos.Core.Agents
 
         public bool IsSelected(AccountInfo account,FileSystemInfo info)
         {
+            if (info is DirectoryInfo)
+                return true;
             return IsSelected(account,info.FullName);
         }
 
         public bool IsSelected(AccountInfo account, string fullPath)
         {
+            if (Directory.Exists(fullPath))
+                return true;
+
+            //Shared folders should NOT be synced if selective syncing is disabled
+            var isShared = fullPath.IsSharedTo(account);
+            var selectiveEnabled = IsSelectiveEnabled(account.AccountKey);
+            if (!selectiveEnabled)
+                return !isShared;
+
             List<string> paths;
             return !SelectivePaths.TryGetValue(account.AccountKey, out paths)
                 || paths.Count == 0
diff --git a/trunk/Pithos.Core/Agents/Uploader.cs b/trunk/Pithos.Core/Agents/Uploader.cs
index 168ada6..094d2f9 100644
--- a/trunk/Pithos.Core/Agents/Uploader.cs
+++ b/trunk/Pithos.Core/Agents/Uploader.cs
@@ -50,7 +50,7 @@ namespace Pithos.Core.Agents
                     if (fileInfo.Extension.Equals("ignore", StringComparison.InvariantCultureIgnoreCase))
                         return;
 
-                    if (Selectives.IsSelected(action.AccountInfo, fileInfo))
+                    if (!Selectives.IsSelected(action.AccountInfo, fileInfo))
                         return;
 
                     //Try to load the action's local state, if it is empty
diff --git a/trunk/Pithos.Interfaces/AccountSettings.cs b/trunk/Pithos.Interfaces/AccountSettings.cs
index 69bff8f..7ebfcd5 100644
--- a/trunk/Pithos.Interfaces/AccountSettings.cs
+++ b/trunk/Pithos.Interfaces/AccountSettings.cs
@@ -67,10 +67,12 @@ namespace Pithos.Interfaces
 
         public string ServerUrl { get; set; }
 
-        private StringCollection _selectiveFolders = new StringCollection();
-
         public bool IsExpired { get; set; }
 
+        public bool SelectiveSyncEnabled { get; set; }
+
+        private StringCollection _selectiveFolders = new StringCollection();
+
         public StringCollection SelectiveFolders
         {
             get { return _selectiveFolders; }
@@ -81,6 +83,7 @@ namespace Pithos.Interfaces
 
     public class ServerSettings
     {
+        public string ServerName { get; set; }
         public string ServerUri { get; set; }
         public string LoginUri { get; set; }
         public string LogoutUri { get; set; }
diff --git a/trunk/Pithos.Interfaces/ObjectInfo.cs b/trunk/Pithos.Interfaces/ObjectInfo.cs
index 484a39a..e0bd7b6 100644
--- a/trunk/Pithos.Interfaces/ObjectInfo.cs
+++ b/trunk/Pithos.Interfaces/ObjectInfo.cs
@@ -375,5 +375,14 @@ namespace Pithos.Interfaces
             PreviousHash = previous.Hash;
             return this;
         }
+
+        public bool IsShared
+        {
+            get
+            {
+                var isShared = !Uri.ToString().StartsWith(StorageUri.ToString());
+                return isShared;
+            }
+        }
     }
 }
\ No newline at end of file
-- 
1.7.10.4