From 0a9d4d1838a4783c898ec6e10a5cec1fec045b63 Mon Sep 17 00:00:00 2001 From: pkanavos Date: Tue, 24 Apr 2012 21:37:31 +0300 Subject: [PATCH] New SQLite version --- .../Diagnostics/log4netForwarder.cs | 3 ++ .../FileProperties/ConflictsViewModel.cs | 8 +++-- .../FileProperties/FilePropertiesView.xaml | 5 +++ .../FileProperties/FilePropertiesViewModel.cs | 33 ++++++++++++++++++++ trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj | 10 +++--- .../Preferences/PreferencesView.xaml | 9 +++--- .../Preferences/PreferencesViewModel.cs | 21 +++++++++++++ .../SelectiveSynch/SelectiveSynchViewModel.cs | 10 ++++-- trunk/Pithos.Client.WPF/app.config | 4 +-- trunk/Pithos.Client.WPF/packages.config | 2 +- trunk/Pithos.Core.Test/MockStatusKeeper.cs | 2 +- trunk/Pithos.Core/Agents/BlockUpdater.cs | 17 ++++++++++ trunk/Pithos.Core/Agents/NetworkAgent.cs | 2 +- trunk/Pithos.Core/Agents/PollAgent.cs | 17 +++++----- trunk/Pithos.Core/Agents/StatusAgent.cs | 2 +- trunk/Pithos.Core/Agents/Uploader.cs | 12 +++---- trunk/Pithos.Core/Agents/WorkflowAgent.cs | 4 ++- trunk/Pithos.Core/IStatusKeeper.cs | 4 +-- trunk/Pithos.Core/Pithos.Core.csproj | 10 +++--- trunk/Pithos.Core/packages.config | 2 +- .../System.Data.SQLite.1.0.79.0.nupkg | Bin 1456101 -> 0 bytes .../lib/net20/System.Data.SQLite.dll | Bin 927744 -> 0 bytes .../lib/net40/System.Data.SQLite.dll | Bin 967168 -> 0 bytes .../System.Data.SQLite.1.0.80.0.nupkg | Bin 0 -> 1489947 bytes .../lib/net20/System.Data.SQLite.Linq.dll | Bin 192512 -> 192512 bytes .../lib/net20/System.Data.SQLite.dll | Bin 0 -> 939520 bytes .../lib/net40/System.Data.SQLite.Linq.dll | Bin 182784 -> 182784 bytes .../lib/net40/System.Data.SQLite.dll | Bin 0 -> 984064 bytes 28 files changed, 137 insertions(+), 40 deletions(-) delete mode 100644 trunk/packages/System.Data.SQLite.1.0.79.0/System.Data.SQLite.1.0.79.0.nupkg delete mode 100644 trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.dll delete mode 100644 trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.dll create mode 100644 trunk/packages/System.Data.SQLite.1.0.80.0/System.Data.SQLite.1.0.80.0.nupkg rename trunk/packages/{System.Data.SQLite.1.0.79.0 => System.Data.SQLite.1.0.80.0}/lib/net20/System.Data.SQLite.Linq.dll (99%) create mode 100644 trunk/packages/System.Data.SQLite.1.0.80.0/lib/net20/System.Data.SQLite.dll rename trunk/packages/{System.Data.SQLite.1.0.79.0 => System.Data.SQLite.1.0.80.0}/lib/net40/System.Data.SQLite.Linq.dll (99%) create mode 100644 trunk/packages/System.Data.SQLite.1.0.80.0/lib/net40/System.Data.SQLite.dll 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(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 @@ + + + +