From: pkanavos <pkanavos@gmail.com>
Date: Tue, 24 Apr 2012 18:37:31 +0000 (+0300)
Subject: New SQLite version
X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/commitdiff_plain/0a9d4d1838a4783c898ec6e10a5cec1fec045b63

New SQLite version
---

diff --git a/trunk/Pithos.Client.WPF/Diagnostics/log4netForwarder.cs b/trunk/Pithos.Client.WPF/Diagnostics/log4netForwarder.cs
index 670c975..a706898 100644
--- a/trunk/Pithos.Client.WPF/Diagnostics/log4netForwarder.cs
+++ b/trunk/Pithos.Client.WPF/Diagnostics/log4netForwarder.cs
@@ -93,6 +93,9 @@ namespace Pithos.Client.WPF.Diagnostics
         {
             try
             {
+                var stack = new StackTrace();
+                var type = stack.GetFrame(0).GetMethod().DeclaringType;
+
                 var log = LogManager.GetLogger(source);
                 var level = GetLevel(eventType);
                 TaskEx.Run(()=>log.Logger.Log(GetType(), level, message, null));
diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
index b49bbee..da7a840 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsViewModel.cs
@@ -99,9 +99,11 @@ namespace Pithos.Client.WPF.FileProperties
         public ConflictsViewModel()
         {
 			this.DisplayName="Conflicts";
-            var conflicts = from state in FileState.Queryable
-                            where state.FileStatus == FileStatus.Conflict ||
-                                  state.OverlayStatus == FileOverlayStatus.Conflict
+            var fileStates = from state in FileState.Queryable
+                         where state.FileStatus == FileStatus.Conflict ||
+                               state.OverlayStatus == FileOverlayStatus.Conflict
+                         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};          
             _conflicts = new ObservableCollection<ConflictFile>(conflicts.ToList());
diff --git a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
index 0bfac92..0921f85 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
@@ -101,6 +101,11 @@
                 </TabItem>
                 <TabItem Header="Permissions">
                     <StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBox x:Name="PermissionName" Width="200"/>
+                            <CheckBox x:Name="PermissionIsReadOnly" Content="Is Read Only" />
+                            <Button x:Name="AddPermission" Content="Add"/>
+                        </StackPanel>
                         <TextBlock Margin="5" Visibility="{Binding Path=IsPublic,FallbackValue=Collapsed, Converter={StaticResource BoolToVisible}}">
                 <Run Text="Public URL:" />
                 <Run Text="{Binding PublicUrl,FallbackValue='http://someurl'}" />
diff --git a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs
index 86e54a7..898f37d 100644
--- a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs
@@ -273,6 +273,39 @@ namespace Pithos.Client.WPF
             }
         }
 
+        private string _permissionName;
+        public string PermissionName
+        {
+            get { return _permissionName; }
+            set
+            {
+                _permissionName = value;
+                NotifyOfPropertyChange(()=>PermissionName);
+            }
+        }
+
+        private bool _permissionIsReadOnly;
+        public bool PermissionIsReadOnly
+        {
+            get { return _permissionIsReadOnly; }
+            set
+            {
+                _permissionIsReadOnly = value;
+                NotifyOfPropertyChange(()=>PermissionIsReadOnly);
+            }
+        }
+
+        public bool CanAddPermission
+        {
+            get { return !String.IsNullOrWhiteSpace(PermissionName); }
+        }
+
+        public void AddPermission()
+        {
+            Permissions.Add(new Permission{Read=PermissionIsReadOnly,UserName=PermissionName,Write=!PermissionIsReadOnly});   
+        }
+
+
         public bool TagsChanged { get; private set; }
         public bool PermissionsChanged { get; private set; }
 
diff --git a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
index fa1c752..1d2e23f 100644
--- a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
+++ b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
@@ -256,11 +256,13 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.79.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <HintPath>..\packages\System.Data.SQLite.1.0.79.0\lib\net40\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.80.0\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq">
-      <HintPath>..\packages\System.Data.SQLite.1.0.79.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.80.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 74a7d92..4d85ba5 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -5,7 +5,7 @@
         xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
         xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters" 
         x:Name="TheView"
-        Title="Pithos+ Preferences" Height="436" Width="600" 
+        Title="Pithos+ Preferences" Height="436" Width="732" 
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/PithosPlus;component/Images/PithosTaskbar.png"
@@ -129,9 +129,10 @@
                                 </Grid.ColumnDefinitions>
                                 <TextBox  Name="CurrentAccount_RootPath" Margin="1,5,5,-30" 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,126,6" Grid.ColumnSpan="2" />
-                            <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="Auto" HorizontalAlignment="Right" Style="{StaticResource ButtonStyle}" Grid.Row="6" Margin="0,40,18,24" Grid.Column="1" />
-                            <Button Name="MoveAccountFolder" Content="Move ..." Margin="6,40,126,24" Grid.Row="6" Grid.Column="1" />
+                            <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Row="6" Margin="6,66,126,6" Grid.ColumnSpan="2"  />
+                            <Button Name="SelectiveSyncFolders" Content="Selective Sync" Width="Auto" HorizontalAlignment="Right" Style="{StaticResource ButtonStyle}" Grid.Row="6" Margin="0,40,138,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" />
                         </Grid>
                         
                     </GroupBox>
diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
index 358ab44..356557b 100644
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
@@ -472,6 +472,26 @@ namespace Pithos.Client.WPF.Preferences
             get { return (CurrentAccount != null); }
         }
 
+        public bool CanClearAccountCache
+        {
+            get { return (CurrentAccount != null); }
+        }
+
+        public void ClearAccountCache()
+        {
+            if (MessageBoxResult.Yes == MessageBox.Show("You are about to delete all partially downloaded files from the account's cache.\n" +
+                            " You will have to download all partially downloaded data again\n" +
+                            "This change can not be undone\n\n" +
+            "Do you wish to delete all partially downloaded data?", "Warning! Clearing account cache",
+                            MessageBoxButton.YesNo,MessageBoxImage.Question,MessageBoxResult.No))
+            {
+
+                var cachePath = Path.Combine(CurrentAccount.RootPath, FolderConstants.CacheFolder);
+                var dir = new DirectoryInfo(cachePath);
+                dir.EnumerateFiles().Apply(file=>file.Delete());
+                dir.EnumerateDirectories().Apply(folder => folder.Delete(true));
+            }
+        }
 
 
         public bool ExtensionsActivated
@@ -552,6 +572,7 @@ namespace Pithos.Client.WPF.Preferences
                 NotifyOfPropertyChange(() => CanRemoveAccount);
                 NotifyOfPropertyChange(() => CanSelectiveSyncFolders);
                 NotifyOfPropertyChange(() => CanMoveAccountFolder);
+                NotifyOfPropertyChange(() => CanClearAccountCache);
             }
         }
 
diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
index bc9ea54..dd1cc21 100644
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs
@@ -165,8 +165,8 @@ namespace Pithos.Client.WPF.SelectiveSynch
         {
             var selections = account.SelectiveFolders;
 
-            if (selections.Count == 0)
-                return;
+
+                
             //Initially, all nodes are checked
             //We need to *uncheck* the nodes that are not selected
 
@@ -174,6 +174,12 @@ namespace Pithos.Client.WPF.SelectiveSynch
                            from DirectoryRecord record in rootRecord
                            select record).ToList();
 
+            if (selections.Count == 0)
+            {
+                allNodes.Apply(record => record.IsChecked = false);
+                return;
+            } 
+            
             var selects = (from DirectoryRecord rootRecord in RootNodes
                           from DirectoryRecord record in rootRecord
                           where record.Uri !=null &&  !selections.Contains(record.Uri.ToString())
diff --git a/trunk/Pithos.Client.WPF/app.config b/trunk/Pithos.Client.WPF/app.config
index 716ee79..de2b4a7 100644
--- a/trunk/Pithos.Client.WPF/app.config
+++ b/trunk/Pithos.Client.WPF/app.config
@@ -26,7 +26,7 @@
     </assemblyBinding>
   </runtime>
 
-<!--  <system.diagnostics >
+<system.diagnostics >
     <sources >
       <source name="System.Net"  switchValue="Verbose" tracemode="protocolonly" maxdatasize="65536" >
         <listeners>
@@ -34,7 +34,7 @@
         </listeners>
       </source>
     </sources>
-  </system.diagnostics>-->
+  </system.diagnostics>
   <userSettings>
     <Pithos.Client.WPF.Properties.Settings>
       <setting name="PithosPath" serializeAs="String">
diff --git a/trunk/Pithos.Client.WPF/packages.config b/trunk/Pithos.Client.WPF/packages.config
index df6d018..428eb02 100644
--- a/trunk/Pithos.Client.WPF/packages.config
+++ b/trunk/Pithos.Client.WPF/packages.config
@@ -3,5 +3,5 @@
   <package id="Caliburn.Micro" version="1.2.0" />
   <package id="Caliburn.Micro.Logging" version="1.2" />
   <package id="Extended.Wpf.Toolkit" version="1.5.0" />
-  <package id="System.Data.SQLite" version="1.0.79.0" />
+  <package id="System.Data.SQLite" version="1.0.80.0" />
 </packages>
\ No newline at end of file
diff --git a/trunk/Pithos.Core.Test/MockStatusKeeper.cs b/trunk/Pithos.Core.Test/MockStatusKeeper.cs
index eea5f17..1baeac7 100644
--- a/trunk/Pithos.Core.Test/MockStatusKeeper.cs
+++ b/trunk/Pithos.Core.Test/MockStatusKeeper.cs
@@ -65,7 +65,7 @@ namespace Pithos.Core.Test
             throw new NotImplementedException();
         }
 
-        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus)
+        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string localFileMissingFromServer)
         {
             if (String.IsNullOrWhiteSpace(path))
                 throw new ArgumentNullException("path", "path can't be empty");
diff --git a/trunk/Pithos.Core/Agents/BlockUpdater.cs b/trunk/Pithos.Core/Agents/BlockUpdater.cs
index 3eff1c6..7e8221b 100644
--- a/trunk/Pithos.Core/Agents/BlockUpdater.cs
+++ b/trunk/Pithos.Core/Agents/BlockUpdater.cs
@@ -55,6 +55,23 @@ namespace Pithos.Core.Agents
 {
     class BlockUpdater
     {
+        //TODO: Must clean orphaned blocks from the Cache folder.
+        //
+        //The Cache folder may have orphaned blocks. Blocks may be left in the Cache folder because:
+        //1. A download was in progress when the application terminated. These blocks are needed to proceed 
+        //  with partial download
+        //2. The application terminated abnormally before the blocks were cleared after a download
+        //3. The server file was deleted before the download completed.
+        //
+        //In #1, we need to keep the blocks. We need to detect the other cases and delete orphans
+        //
+        //Mitigations:
+        // - Delete blocks with no corresponding state
+        // - Check and delete possible orphans when a Deletion is detected
+        // - Add Advanced command "Clear Cache"
+        //
+        //Need a better way to differentiate between cases #2, #3 and #1
+
         private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public string FilePath { get; private set; }
diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs
index 8d3f6a4..0bdddd1 100644
--- a/trunk/Pithos.Core/Agents/NetworkAgent.cs
+++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs
@@ -306,7 +306,7 @@ namespace Pithos.Core.Agents
                 var state = StatusKeeper.GetStateByFilePath(previousFullPath);
                 state.FilePath = newPath;
                 state.SaveCopy();
-                StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted);
+                StatusKeeper.SetFileState(previousFullPath,FileStatus.Deleted,FileOverlayStatus.Deleted, "Deleted");
             }            
         }
 
diff --git a/trunk/Pithos.Core/Agents/PollAgent.cs b/trunk/Pithos.Core/Agents/PollAgent.cs
index c0c1d3c..99f8e81 100644
--- a/trunk/Pithos.Core/Agents/PollAgent.cs
+++ b/trunk/Pithos.Core/Agents/PollAgent.cs
@@ -399,7 +399,7 @@ namespace Pithos.Core.Agents
                     {
                         if (gate.Failed)
                             continue;
-                        StatusKeeper.SetFileState(item.FullName, FileStatus.Conflict, FileOverlayStatus.Deleted);
+                        StatusKeeper.SetFileState(item.FullName, FileStatus.Conflict, FileOverlayStatus.Deleted,"Local file missing from server");
                     }
                 }
                 UpdateStatus(PithosStatus.HasConflicts);
@@ -438,7 +438,7 @@ namespace Pithos.Core.Agents
                         _lastSeen.TryRemove(item.FullName, out lastDate);
                         deletedFiles.Add(item);
                     }
-                    StatusKeeper.SetFileState(item.FullName, FileStatus.Deleted, FileOverlayStatus.Deleted);
+                    StatusKeeper.SetFileState(item.FullName, FileStatus.Deleted, FileOverlayStatus.Deleted, "File Deleted");
                 }
                 Log.InfoFormat("[{0}] files were deleted",deletedFiles.Count);
                 StatusNotification.NotifyForFiles(deletedFiles, String.Format("{0} files were deleted", deletedFiles.Count), TraceLevel.Info);
@@ -557,19 +557,22 @@ namespace Pithos.Core.Agents
                     Log.DebugFormat("[NEW INFO] {0}",objectInfo.Uri);
 
                 var relativePath = objectInfo.RelativeUrlToFilePath(accountInfo.UserName);
-                //If the object already exists, we probably have a conflict
+
+                //If the object already exists, we should check before uploading or downloading
                 if (fileAgent.Exists(relativePath))
                 {
-                    Log.DebugFormat("[SKIP EXISTING] {0}", objectInfo.Uri);
-                    //If a directory object already exists, we don't need to perform any other action                    
-                    var localFile = fileAgent.GetFileSystemInfo(relativePath);
-                    StatusKeeper.SetFileState(localFile.FullName, FileStatus.Conflict, FileOverlayStatus.Conflict);
+                    var localFile= fileAgent.GetFileSystemInfo(relativePath);
+                    var state = StatusKeeper.GetStateByFilePath(localFile.WithProperCapitalization().FullName);
+                    yield return new CloudAction(accountInfo, CloudActionType.MustSynch,
+                                                     localFile, objectInfo, state, accountInfo.BlockSize,
+                                                     accountInfo.BlockHash);                    
                 }
                 else
                 {
                     //Remote files should be downloaded
                     yield return new CloudDownloadAction(accountInfo, objectInfo);
                 }
+
             }
         }
 
diff --git a/trunk/Pithos.Core/Agents/StatusAgent.cs b/trunk/Pithos.Core/Agents/StatusAgent.cs
index d587379..4423f56 100644
--- a/trunk/Pithos.Core/Agents/StatusAgent.cs
+++ b/trunk/Pithos.Core/Agents/StatusAgent.cs
@@ -569,7 +569,7 @@ namespace Pithos.Core.Agents
             _persistenceAgent.Post(() =>FileState.RenameState(oldPath, newPath));
         }*/
 
-        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus)
+        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string localFileMissingFromServer)
         {
             if (String.IsNullOrWhiteSpace(path))
                 throw new ArgumentNullException("path");
diff --git a/trunk/Pithos.Core/Agents/Uploader.cs b/trunk/Pithos.Core/Agents/Uploader.cs
index 87c4dc3..db0735e 100644
--- a/trunk/Pithos.Core/Agents/Uploader.cs
+++ b/trunk/Pithos.Core/Agents/Uploader.cs
@@ -129,7 +129,7 @@ namespace Pithos.Core.Agents
                                 await UploadWithHashMap(accountInfo, cloudFile, fileInfo as FileInfo, cloudFile.Name, treeHash);
                             }
                             //If everything succeeds, change the file and overlay status to normal
-                            StatusKeeper.SetFileState(fullFileName, FileStatus.Unchanged, FileOverlayStatus.Normal);
+                            StatusKeeper.SetFileState(fullFileName, FileStatus.Unchanged, FileOverlayStatus.Normal, "");
                         }
                         catch (WebException exc)
                         {
@@ -138,11 +138,11 @@ namespace Pithos.Core.Agents
                                 throw;
                             if (response.StatusCode == HttpStatusCode.Forbidden)
                             {
-                                StatusKeeper.SetFileState(fileInfo.FullName, FileStatus.Forbidden, FileOverlayStatus.Conflict);
+                                StatusKeeper.SetFileState(fileInfo.FullName, FileStatus.Forbidden, FileOverlayStatus.Conflict, "Forbidden");
                             }
-
-                            //In any other case, propagate the error
-                            throw;
+                            else
+                                //In any other case, propagate the error
+                                throw;
                         }
                     }
                     //Notify the Shell to update the overlays
@@ -274,7 +274,7 @@ namespace Pithos.Core.Agents
             {
                 Log.Error("Not allowed to upload file", exc);
                 var message = String.Format("Not allowed to uplad file {0}", action.LocalFile.FullName);
-                StatusKeeper.SetFileState(action.LocalFile.FullName, FileStatus.Unchanged, FileOverlayStatus.Normal);
+                StatusKeeper.SetFileState(action.LocalFile.FullName, FileStatus.Unchanged, FileOverlayStatus.Normal, "");
                 StatusNotification.NotifyChange(message, TraceLevel.Warning);
                 return true;
             }
diff --git a/trunk/Pithos.Core/Agents/WorkflowAgent.cs b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
index a6cd3c2..5ff697e 100644
--- a/trunk/Pithos.Core/Agents/WorkflowAgent.cs
+++ b/trunk/Pithos.Core/Agents/WorkflowAgent.cs
@@ -143,7 +143,7 @@ namespace Pithos.Core.Agents
                                 {
                                     //We reach this point only if the app closed before propagating a rename to the server
                                     Log.WarnFormat("Unfinished rename [{0}]",state.Path);
-                                    StatusKeeper.SetFileState(state.Path,FileStatus.Conflict,FileOverlayStatus.Conflict);
+                                    StatusKeeper.SetFileState(state.Path,FileStatus.Conflict,FileOverlayStatus.Conflict, "Rename without old path");
                                     break;
                                 }
                                 FileSystemInfo oldInfo = Directory.Exists(state.OldPath)
@@ -233,6 +233,8 @@ namespace Pithos.Core.Agents
                 var account = accountInfo;
                 var pendingEntries = (from state in FileState.Queryable
                                      where state.FileStatus != FileStatus.Unchanged &&
+                                            state.FileStatus != FileStatus.Forbidden &&
+                                            state.FileStatus != FileStatus.Conflict &&
                                            !state.FilePath.StartsWith(cachePath) &&
                                            !state.FilePath.EndsWith(".ignore") &&
                                            state.FilePath.StartsWith(account.AccountPath)                                            
diff --git a/trunk/Pithos.Core/IStatusKeeper.cs b/trunk/Pithos.Core/IStatusKeeper.cs
index c75ee84..c039109 100644
--- a/trunk/Pithos.Core/IStatusKeeper.cs
+++ b/trunk/Pithos.Core/IStatusKeeper.cs
@@ -61,7 +61,7 @@ namespace Pithos.Core
         FileOverlayStatus GetFileOverlayStatus(string path);
         void ProcessExistingFiles(IEnumerable<FileInfo> paths);
         void Stop();
-        void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus);
+        void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string localFileMissingFromServer);
         void StoreInfo(string path, ObjectInfo objectInfo);
         //T GetStatus<T>(string path,Func<FileState,T> getter,T defaultValue );
         //void SetStatus(string path, Action<FileState> setter);        
@@ -144,7 +144,7 @@ namespace Pithos.Core
             
         }
 
-        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus)
+        public void SetFileState(string path, FileStatus fileStatus, FileOverlayStatus overlayStatus, string localFileMissingFromServer)
         {
             Contract.Requires(!String.IsNullOrWhiteSpace(path));
             Contract.Requires(Path.IsPathRooted(path));
diff --git a/trunk/Pithos.Core/Pithos.Core.csproj b/trunk/Pithos.Core/Pithos.Core.csproj
index 1825295..14a4901 100644
--- a/trunk/Pithos.Core/Pithos.Core.csproj
+++ b/trunk/Pithos.Core/Pithos.Core.csproj
@@ -360,11 +360,13 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\packages\System.Data.SQLite.1.0.79.0\lib\net40\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.80.0\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq">
-      <HintPath>..\packages\System.Data.SQLite.1.0.79.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.80.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Threading.Tasks.Dataflow">
diff --git a/trunk/Pithos.Core/packages.config b/trunk/Pithos.Core/packages.config
index 6808edd..eda12a2 100644
--- a/trunk/Pithos.Core/packages.config
+++ b/trunk/Pithos.Core/packages.config
@@ -7,6 +7,6 @@
   <package id="NHibernate" version="3.1.0.4000" />
   <package id="NHibernate.Castle" version="3.1.0.4000" />
   <package id="ServiceStack.Text" version="2.27" />
-  <package id="System.Data.SQLite" version="1.0.79.0" />
+  <package id="System.Data.SQLite" version="1.0.80.0" />
   <package id="Windows7APICodePack" version="1.0.0.0" />
 </packages>
\ No newline at end of file
diff --git a/trunk/packages/System.Data.SQLite.1.0.79.0/System.Data.SQLite.1.0.79.0.nupkg b/trunk/packages/System.Data.SQLite.1.0.79.0/System.Data.SQLite.1.0.79.0.nupkg
deleted file mode 100644
index 4e923e9..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.79.0/System.Data.SQLite.1.0.79.0.nupkg and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.dll
deleted file mode 100644
index 09e36bb..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.dll
deleted file mode 100644
index a2d79d1..0000000
Binary files a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.dll and /dev/null differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.80.0/System.Data.SQLite.1.0.80.0.nupkg b/trunk/packages/System.Data.SQLite.1.0.80.0/System.Data.SQLite.1.0.80.0.nupkg
new file mode 100644
index 0000000..69bf180
Binary files /dev/null and b/trunk/packages/System.Data.SQLite.1.0.80.0/System.Data.SQLite.1.0.80.0.nupkg differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.Linq.dll b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.Linq.dll
similarity index 99%
rename from trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.Linq.dll
rename to trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.Linq.dll
index 78d6748..4774f29 100644
Binary files a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.Linq.dll and b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.Linq.dll differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.dll
new file mode 100644
index 0000000..698d501
Binary files /dev/null and b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.dll differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.Linq.dll b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.Linq.dll
similarity index 99%
rename from trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.Linq.dll
rename to trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.Linq.dll
index aabf83d..ea3dc7d 100644
Binary files a/trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.Linq.dll and b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.Linq.dll differ
diff --git a/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.dll b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.dll
new file mode 100644
index 0000000..55a7753
Binary files /dev/null and b/trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.dll differ