haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update issue #254

Browse Source 
Status: Fixed

Async upload is now set to on by default 

git-svn-id: https://duplicati.googlecode.com/svn/trunk@905 59da171f-624f-0410-aa54-27559c288bec
This commit is contained in:
kenneth.skovhede@gmail.com
2011-09-21 20:26:16 +00:00
parent 1030577a8e
commit 98d15230de
5 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/GUI/Datamodel/Task.Extension.cs
+1 -1
View File
@@ -274,7 +274,7 @@ namespace Duplicati.Datamodel
public bool AsyncTransfer
{
get { return Duplicati.Library.Utility.Utility.ParseBool(m_owner.TaskExtensionsLookup[ASYNC_TRANSFER], false); }
get { return Duplicati.Library.Utility.Utility.ParseBool(m_owner.TaskExtensionsLookup[ASYNC_TRANSFER], true); }
set { m_owner.TaskExtensionsLookup[ASYNC_TRANSFER] = value.ToString(); }
}
Duplicati/GUI/TaskPackages.cs
+2 -2
View File
@@ -219,8 +219,8 @@ namespace Duplicati.GUI
options["max-upload-pr-second"] = ext.UploadBandwidth;
if (!string.IsNullOrEmpty(ext.ThreadPriority))
options["thread-priority"] = ext.ThreadPriority;
if (ext.AsyncTransfer)
options["asynchronous-upload"] = "";
if (!ext.AsyncTransfer)
options["synchronous-upload"] = "true";
if (ext.IgnoreTimestamps)
options["disable-filetime-check"] = "";
Duplicati/Library/Main/Options.cs
+14 -2
View File
@@ -164,7 +164,8 @@ namespace Duplicati.Library.Main
new CommandLineArgument("sorted-filelist", CommandLineArgument.ArgumentType.Boolean, Strings.Options.SortedfilelistShort, Strings.Options.SortedfilelistLong, "false"),
new CommandLineArgument("asynchronous-upload", CommandLineArgument.ArgumentType.Boolean, Strings.Options.AsynchronousuploadShort, Strings.Options.AsynchronousuploadLong, "false"),
new CommandLineArgument("synchronous-upload", CommandLineArgument.ArgumentType.Boolean, Strings.Options.SynchronousuploadShort, Strings.Options.SynchronousuploadLong, "false"),
new CommandLineArgument("asynchronous-upload", CommandLineArgument.ArgumentType.Boolean, Strings.Options.AsynchronousuploadShort, Strings.Options.AsynchronousuploadLong, "false", null, null, string.Format(Strings.Options.AsynchronousuploadDeprecated, "synchronous-upload")),
new CommandLineArgument("asynchronous-upload-limit", CommandLineArgument.ArgumentType.Integer, Strings.Options.AsynchronousuploadlimitShort, Strings.Options.AsynchronousuploadlimitLong, "2"),
new CommandLineArgument("asynchronous-upload-folder", CommandLineArgument.ArgumentType.Path, Strings.Options.AsynchronousuploadfolderShort, Strings.Options.AsynchronousuploadfolderLong),
@@ -657,7 +658,18 @@ namespace Duplicati.Library.Main
/// <summary>
/// A value indicating if backups are transmitted on a separate thread
/// </summary>
public bool AsynchronousUpload { get { return GetBool("asynchronous-upload"); } }
public bool AsynchronousUpload
{
get
{
if (m_options.ContainsKey("synchronous-upload"))
return !GetBool("synchronous-upload");
else if (m_options.ContainsKey("asynchronous-upload"))
return GetBool("asynchronous-upload");
else
return true;
}
}
/// <summary>
/// A value indicating if system is allowed to enter sleep power states during backup/restore ops (win32 only)
Duplicati/Library/Main/Strings/Options.Designer.cs
Generated
+27
View File
@@ -105,6 +105,15 @@ namespace Duplicati.Library.Main.Strings {
}
}
/// <summary>
/// Looks up a localized string similar to Asynchronous upload is now default, you can turn it off by using the flag --{0}.
/// </summary>
internal static string AsynchronousuploadDeprecated {
get {
return ResourceManager.GetString("AsynchronousuploadDeprecated", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The pre-generated volumes will be placed into the temporary folder by default, this option can set a different folder for placing the temporary volumes, despite the name, this also works for synchronous runs.
/// </summary>
@@ -996,6 +1005,24 @@ namespace Duplicati.Library.Main.Strings {
}
}
/// <summary>
/// Looks up a localized string similar to Duplicati will upload files while scanning the disk and producing volumes, which usually makes the backup faster. Use this flag to turn the behavior off, so that Duplicati will wait for each volume to complete..
/// </summary>
internal static string SynchronousuploadLong {
get {
return ResourceManager.GetString("SynchronousuploadLong", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upload files synchronously.
/// </summary>
internal static string SynchronousuploadShort {
get {
return ResourceManager.GetString("SynchronousuploadShort", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Duplicati will use the system default temporary folder. This option can be used to supply an alternative folder for temporary storage..
/// </summary>
Duplicati/Library/Main/Strings/Options.resx
+9
View File
@@ -480,4 +480,13 @@
<data name="FullifmorethannincrementalsShort" xml:space="preserve">
<value>The max number of incrementals in a chain</value>
</data>
<data name="AsynchronousuploadDeprecated" xml:space="preserve">
<value>Asynchronous upload is now default, you can turn it off by using the flag --{0}</value>
</data>
<data name="SynchronousuploadLong" xml:space="preserve">
<value>Duplicati will upload files while scanning the disk and producing volumes, which usually makes the backup faster. Use this flag to turn the behavior off, so that Duplicati will wait for each volume to complete.</value>
</data>
<data name="SynchronousuploadShort" xml:space="preserve">
<value>Upload files synchronously</value>
</data>
</root>