git-svn-id: https://duplicati.googlecode.com/svn/tags/1.0 beta 1@107 59da171f-624f-0410-aa54-27559c288bec1.0-beta1

9 files changed, 131 insertions, 10 deletions

diff --git a/Duplicati/GUI/Datamodel/Datamodel.csproj b/Duplicati/GUI/Datamodel/Datamodel.csproj
index 03000d2c9..ef3656f1d 100644
--- a/Duplicati/GUI/Datamodel/Datamodel.csproj
+++ b/Duplicati/GUI/Datamodel/Datamodel.csproj
@@ -1 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?><Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><ProjectType>Local</ProjectType><ProductVersion>8.0.50727</ProductVersion><SchemaVersion>2.0</SchemaVersion><ProjectGuid>{B60D0993-B0C5-457A-90D9-DB6EEB33CE47}</ProjectGuid><Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration><Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform><ApplicationIcon /><AssemblyKeyContainerName /><AssemblyName>Datamodel</AssemblyName><AssemblyOriginatorKeyFile>LightDatamodel.snk</AssemblyOriginatorKeyFile><DefaultClientScript>JScript</DefaultClientScript><DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout><DefaultTargetSchema>IE50</DefaultTargetSchema><DelaySign>false</DelaySign><OutputType>Library</OutputType><RootNamespace>Duplicati.Datamodel</RootNamespace><RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent><StartupObject /><FileUpgradeFlags /><UpgradeBackupLocation /><SignAssembly>true</SignAssembly></PropertyGroup><PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "><OutputPath>bin\Debug\</OutputPath><AllowUnsafeBlocks>false</AllowUnsafeBlocks><BaseAddress>285212672</BaseAddress><CheckForOverflowUnderflow>false</CheckForOverflowUnderflow><ConfigurationOverrideFile></ConfigurationOverrideFile><DefineConstants>DEBUG;TRACE</DefineConstants><DocumentationFile></DocumentationFile><DebugSymbols>true</DebugSymbols><FileAlignment>4096</FileAlignment><NoStdLib>false</NoStdLib><NoWarn></NoWarn><Optimize>false</Optimize><RegisterForComInterop>false</RegisterForComInterop><RemoveIntegerChecks>false</RemoveIntegerChecks><TreatWarningsAsErrors>false</TreatWarningsAsErrors><WarningLevel>4</WarningLevel><DebugType>full</DebugType><ErrorReport>prompt</ErrorReport></PropertyGroup><PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "><OutputPath>bin\Release\</OutputPath><AllowUnsafeBlocks>false</AllowUnsafeBlocks><BaseAddress>285212672</BaseAddress><CheckForOverflowUnderflow>false</CheckForOverflowUnderflow><ConfigurationOverrideFile></ConfigurationOverrideFile><DefineConstants>TRACE</DefineConstants><DocumentationFile></DocumentationFile><DebugSymbols>false</DebugSymbols><FileAlignment>4096</FileAlignment><NoStdLib>false</NoStdLib><NoWarn></NoWarn><Optimize>true</Optimize><RegisterForComInterop>false</RegisterForComInterop><RemoveIntegerChecks>false</RemoveIntegerChecks><TreatWarningsAsErrors>false</TreatWarningsAsErrors><WarningLevel>4</WarningLevel><DebugType>none</DebugType><ErrorReport>prompt</ErrorReport></PropertyGroup><ItemGroup><Reference Include="System"><Name>System</Name></Reference><Reference Include="System.Data"><Name>System.Data</Name></Reference><Reference Include="System.XML"><Name>System.XML</Name></Reference></ItemGroup><ItemGroup><Compile Include="AssemblyInfo.cs" /><Compile Include="Backends\File.cs" /><Compile Include="Backends\IBackend.cs" /><Compile Include="Backends\S3.cs" /><Compile Include="Backends\SSH.cs" /><Compile Include="SettingsHelper.cs" /><Compile Include="Task.Extension.cs" /><Compile Include="Task.cs" /><Compile Include="Schedule.cs" /><Compile Include="TaskSetting.cs" /><Compile Include="CommandQueue.cs" /><Compile Include="Log.cs" /><Compile Include="LogBlob.cs" /><Compile Include="ApplicationSettings.cs" /><Compile Include="ApplicationSetting.cs" /><Compile Include="TaskFilter.cs" /></ItemGroup><ItemGroup><None Include="LightDatamodel.snk" /><Compile Include="Backends\FTP.cs" /><Compile Include="Log.Extension.cs" /><Compile Include="LogBlob.Extension.cs" /><Compile Include="Schedule.Extension.cs" /></ItemGroup><ItemGroup><ProjectReference Include="..\..\..\..\LightDatamodel\LightDatamodel\LightDatamodel.csproj"><Project>{CAE8433B-F013-474E-B7FC-4DE0D5933AD1}</Project><Name>LightDatamodel</Name></ProjectReference><ProjectReference Include="..\..\Library\Core\Duplicati.Library.Core.csproj"><Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project><Name>Duplicati.Library.Core</Name></ProjectReference></ItemGroup><Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /></Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectType>Local</ProjectType>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{B60D0993-B0C5-457A-90D9-DB6EEB33CE47}</ProjectGuid>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ApplicationIcon />

+    <AssemblyKeyContainerName />

+    <AssemblyName>Datamodel</AssemblyName>

+    <AssemblyOriginatorKeyFile>LightDatamodel.snk</AssemblyOriginatorKeyFile>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>Library</OutputType>

+    <RootNamespace>Duplicati.Datamodel</RootNamespace>

+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>

+    <StartupObject />

+    <FileUpgradeFlags />

+    <UpgradeBackupLocation />

+    <SignAssembly>true</SignAssembly>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <OutputPath>bin\Debug\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>true</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <NoStdLib>false</NoStdLib>

+    <NoWarn>

+    </NoWarn>

+    <Optimize>false</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>full</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <OutputPath>bin\Release\</OutputPath>

+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>false</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <NoStdLib>false</NoStdLib>

+    <NoWarn>

+    </NoWarn>

+    <Optimize>true</Optimize>

+    <RegisterForComInterop>false</RegisterForComInterop>

+    <RemoveIntegerChecks>false</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <DebugType>none</DebugType>

+    <ErrorReport>prompt</ErrorReport>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System">

+      <Name>System</Name>

+    </Reference>

+    <Reference Include="System.Data">

+      <Name>System.Data</Name>

+    </Reference>

+    <Reference Include="System.XML">

+      <Name>System.XML</Name>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="AssemblyInfo.cs" />

+    <Compile Include="Backends\File.cs" />

+    <Compile Include="Backends\IBackend.cs" />

+    <Compile Include="Backends\S3.cs" />

+    <Compile Include="Backends\SSH.cs" />

+    <Compile Include="SettingsHelper.cs" />

+    <Compile Include="Task.Extension.cs" />

+    <Compile Include="Task.cs" />

+    <Compile Include="Schedule.cs" />

+    <Compile Include="TaskSetting.cs" />

+    <Compile Include="CommandQueue.cs" />

+    <Compile Include="Log.cs" />

+    <Compile Include="LogBlob.cs" />

+    <Compile Include="ApplicationSettings.cs" />

+    <Compile Include="ApplicationSetting.cs" />

+    <Compile Include="TaskFilter.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="LightDatamodel.snk" />

+    <Compile Include="Backends\FTP.cs" />

+    <Compile Include="Log.Extension.cs" />

+    <Compile Include="LogBlob.Extension.cs" />

+    <Compile Include="Schedule.Extension.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\..\..\LightDatamodel\LightDatamodel\LightDatamodel.csproj">

+      <Project>{CAE8433B-F013-474E-B7FC-4DE0D5933AD1}</Project>

+      <Name>LightDatamodel</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Library\Core\Duplicati.Library.Core.csproj">

+      <Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>

+      <Name>Duplicati.Library.Core</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+</Project>
\ No newline at end of file
diff --git a/Duplicati/GUI/Duplicati.csproj b/Duplicati/GUI/Duplicati.csproj
index b9122c406..ac118394e 100644
--- a/Duplicati/GUI/Duplicati.csproj
+++ b/Duplicati/GUI/Duplicati.csproj
@@ -35,7 +35,7 @@
     <Reference Include="System.Data" />

     <Reference Include="System.Data.SQLite, Version=1.0.46.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>Datamodel\System.Data.SQLite.DLL</HintPath>

+      <HintPath>..\..\thirdparty\SQLite\Dll for .Net\System.Data.SQLite.DLL</HintPath>

     </Reference>

     <Reference Include="System.Deployment" />

     <Reference Include="System.Drawing" />

diff --git a/Duplicati/GUI/DuplicatiRunner.cs b/Duplicati/GUI/DuplicatiRunner.cs
index 1e2917644..c47d0c075 100644
--- a/Duplicati/GUI/DuplicatiRunner.cs
+++ b/Duplicati/GUI/DuplicatiRunner.cs
@@ -131,7 +131,7 @@ namespace Duplicati.GUI
             task.RaiseTaskCompleted(results);

 

             if (task.Schedule != null)

-                ((System.Data.LightDatamodel.IDataFetcherCached)task.Schedule.DataParent).CommitRecursive();

+                ((System.Data.LightDatamodel.IDataFetcherCached)task.Schedule.DataParent).CommitRecursiveWithRelations();

 

             if (task.TaskType == DuplicityTaskType.FullBackup || task.TaskType == DuplicityTaskType.IncrementalBackup)

             {

diff --git a/Duplicati/GUI/Program.cs b/Duplicati/GUI/Program.cs
index 311b364b6..232beddb1 100644
--- a/Duplicati/GUI/Program.cs
+++ b/Duplicati/GUI/Program.cs
@@ -171,7 +171,8 @@ namespace Duplicati.GUI
 

         static void DataConnection_AfterDataConnection(object sender, DataActions action)

         {

-            Scheduler.Reschedule();

+            if (action == DataActions.Insert || action == DataActions.Update)

+                Scheduler.Reschedule();

         }

 

         static void WorkThread_StartingWork(object sender, EventArgs e)

diff --git a/Duplicati/GUI/Scheduler.cs b/Duplicati/GUI/Scheduler.cs
index 08f4ffed2..d10a3ab13 100644
--- a/Duplicati/GUI/Scheduler.cs
+++ b/Duplicati/GUI/Scheduler.cs
@@ -120,7 +120,7 @@ namespace Duplicati.GUI
                     }

                 }

 

-                System.Data.LightDatamodel.QueryModel.Operation op = System.Data.LightDatamodel.QueryModel.Parser.ParseQuery("ORDER BY When ASC");

+                System.Data.LightDatamodel.QueryModel.OperationOrParameter op = System.Data.LightDatamodel.QueryModel.Parser.ParseQuery("ORDER BY When ASC");

 

                 lock(m_lock)

                     m_schedule = op.EvaluateList<Schedule>(reps).ToArray();

diff --git a/Duplicati/GUI/WizardHandler.cs b/Duplicati/GUI/WizardHandler.cs
index 8fb15f271..a623e5f4c 100644
--- a/Duplicati/GUI/WizardHandler.cs
+++ b/Duplicati/GUI/WizardHandler.cs
@@ -74,7 +74,11 @@ namespace Duplicati.GUI
 

                 wrapper.UpdateSchedule(schedule);

 

-                con.CommitRecursiveWithRelations(schedule);

+                bool scheduleRun = wrapper.RunImmediately && wrapper.BackupTimeOffset > DateTime.Now;

+

+                lock(Program.MainLock)

+                    con.CommitRecursiveWithRelations(schedule);

+                schedule = Program.DataConnection.GetObjectById<Schedule>(schedule.ID);

 

                 if (wrapper.UseEncryptionAsDefault)

                 {

@@ -85,7 +89,7 @@ namespace Duplicati.GUI
                     Program.DataConnection.Commit(Program.DataConnection.GetObjects<ApplicationSetting>());

                 }

 

-                if (wrapper.RunImmediately)

+                if (scheduleRun)

                     Program.WorkThread.AddTask(new IncrementalBackupTask(schedule));

             }

             else if (m_form.CurrentPage is Wizard_pages.Restore.FinishedRestore)

diff --git a/Installer/Duplicati.wxs b/Installer/Duplicati.wxs
index 6761445a1..c91b29829 100644
--- a/Installer/Duplicati.wxs
+++ b/Installer/Duplicati.wxs
@@ -62,7 +62,7 @@
 

     <!-- TODO: Make expanded -->

     <Feature Id="ProductFeature" Title="Duplicati core files" Level="1" Description="Installs the required files for Duplicati." AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" Absent="disallow" ConfigurableDirectory="INSTALLLOCATION" >

-      <Feature Id="DuplicatiDesktopShortCutFeature" Title="Desktop Shortcut" Level="1" Description ="Installs a shortcut to Duplicati on the desktop" Absent="allow" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">

+      <Feature Id="DuplicatiDesktopShortCutFeature" Title="Desktop Shortcut" Level="0" Description ="Installs a shortcut to Duplicati on the desktop" Absent="allow" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local">

         <ComponentRef Id="DuplicatiDesktopShortcutComponent"/>

       </Feature>

 

diff --git a/Installer/incBinFiles.wxs b/Installer/incBinFiles.wxs
index c47e1868b..da4b3acf3 100644
--- a/Installer/incBinFiles.wxs
+++ b/Installer/incBinFiles.wxs
@@ -47,7 +47,6 @@
       <ComponentRef Id="comp_DUPLICATIBIN_23" />

     </ComponentGroup>

     <DirectoryRef Id="INSTALLLOCATION">

-      <Directory Id="dir_Release_0" Name="Release">

         <Component Id="comp_DUPLICATIBIN_0" DiskId="1" KeyPath="yes" Guid="97B70379-61E7-415D-BE37-EB0F7CC15988">

           <File Id="file_DUPLICATIBIN_0" Name="Affirma.ThreeSharp.dll" Source="..\Duplicati\GUI\bin\Release\Affirma.ThreeSharp.dll" />

         </Component>

@@ -120,7 +119,6 @@
         <Component Id="comp_DUPLICATIBIN_23" DiskId="1" KeyPath="yes" Guid="FA300844-B5AE-4CEE-B55D-1901D6C135DD">

           <File Id="file_DUPLICATIBIN_23" Name="System.Windows.Forms.Wizard.dll" Source="..\Duplicati\GUI\bin\Release\System.Windows.Forms.Wizard.dll" />

         </Component>

-      </Directory>

     </DirectoryRef>

   </Fragment>

 </Wix>
\ No newline at end of file
diff --git a/thirdparty/LightDataModel/LightDatamodel.dll b/thirdparty/LightDataModel/LightDatamodel.dll
index 41807e2e5..5e4aecafd 100644
--- a/thirdparty/LightDataModel/LightDatamodel.dll
+++ b/thirdparty/LightDataModel/LightDatamodel.dll