Fixed a protential race condition with warning messages and file counts (cosmetic only) when using async transfers. Spelling correction, Seperator -> Separator. Changed so a restore operation can also supply advanced options. Changed the format of timestamps in filenames to follow the Duplicity convention, which removes the need for --time-separator and --use-short-filenames. Moved the URL utility into Core, to avoid compilation errors with Monodevelop. Reorganized the runner to better support the LiveControls on all operations rather than only for backup/restore. Update issue #210 Status: Fixed I have now changed the time format to follow the Duplicity naming convention. This means that all filenames are now generated with the time set as "yyyyMMddTHHmmssZ". This format is more portable across all platforms, and easily sortable/readable. The drawback is that the Z indicates UTC time, so if one looks at the filenames, the times are not local. The motivation for this is to avoid trouble with daylight savings time offsets. There is full backwards compatibility as long as backups have not used more than one character for --time-separator (only possible via commandline). This new format means that the options --time-separator and --use-short-filenames are now deprecated and removed from the user interface. It is possible to access them from the advanced options page, along with the --use-old-filenames option. If anyone needs these options for some reason, let me know, otherwise they will be removed in a later version. git-svn-id: https://duplicati.googlecode.com/svn/trunk@523 59da171f-624f-0410-aa54-27559c288bec
137 lines
4.8 KiB
C#
137 lines
4.8 KiB
C#
#region Disclaimer / License
|
|
// Copyright (C) 2010, Kenneth Skovhede
|
|
// http://www.hexad.dk, opensource@hexad.dk
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2.1 of the License, or (at your option) any later version.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
#endregion
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Text;
|
|
|
|
namespace Duplicati.Library.Main
|
|
{
|
|
public class CommunicationStatistics
|
|
{
|
|
private object m_lock = new object();
|
|
private bool m_verboseErrors = false;
|
|
private long m_numberOfBytesUploaded;
|
|
private long m_numberOfRemoteCalls;
|
|
private long m_numberOfBytesDownloaded;
|
|
|
|
private long m_numberOfErrors;
|
|
private StringBuilder m_errorMessages = new StringBuilder();
|
|
|
|
private long m_numberOfWarnings;
|
|
private StringBuilder m_warningMessages = new StringBuilder();
|
|
|
|
public bool VerboseErrors
|
|
{
|
|
get { return m_verboseErrors; }
|
|
set { m_verboseErrors = value; }
|
|
}
|
|
|
|
public long NumberOfBytesUploaded
|
|
{
|
|
get { return m_numberOfBytesUploaded; }
|
|
}
|
|
|
|
public long NumberOfBytesDownloaded
|
|
{
|
|
get { return m_numberOfBytesDownloaded; }
|
|
}
|
|
|
|
public long NumberOfRemoteCalls
|
|
{
|
|
get { return m_numberOfRemoteCalls; }
|
|
}
|
|
|
|
public void AddBytesUploaded(long value)
|
|
{
|
|
lock (m_lock)
|
|
m_numberOfBytesUploaded += value;
|
|
}
|
|
|
|
public void AddBytesDownloaded(long value)
|
|
{
|
|
lock (m_lock)
|
|
m_numberOfBytesDownloaded += value;
|
|
}
|
|
|
|
public void AddNumberOfRemoteCalls(long value)
|
|
{
|
|
lock (m_lock)
|
|
m_numberOfRemoteCalls += value;
|
|
}
|
|
|
|
public void LogError(string errorMessage, Exception ex)
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
m_numberOfErrors++;
|
|
m_errorMessages.AppendLine(errorMessage);
|
|
if (m_verboseErrors)
|
|
while (ex != null)
|
|
{
|
|
m_errorMessages.AppendLine(ex.ToString());
|
|
ex = ex.InnerException;
|
|
}
|
|
}
|
|
}
|
|
|
|
public override string ToString()
|
|
{
|
|
//TODO: Figure out how to translate this without breaking the output parser
|
|
StringBuilder sb = new StringBuilder();
|
|
sb.Append("BytesUploaded : " + this.NumberOfBytesUploaded.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\r\n");
|
|
sb.Append("BytesDownloaded : " + this.NumberOfBytesDownloaded.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\r\n");
|
|
sb.Append("RemoteCalls : " + this.NumberOfRemoteCalls.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\r\n");
|
|
|
|
if (m_numberOfErrors > 0)
|
|
{
|
|
sb.Append("NumberOfErrors : " + m_numberOfErrors .ToString(System.Globalization.CultureInfo.InvariantCulture) + "\r\n");
|
|
sb.Append("****************\r\n");
|
|
sb.Append(m_errorMessages.ToString());
|
|
sb.Append("****************\r\n");
|
|
}
|
|
|
|
if (m_numberOfWarnings > 0)
|
|
{
|
|
sb.Append("NumberOfWarnings: " + m_numberOfWarnings.ToString(System.Globalization.CultureInfo.InvariantCulture) + "\r\n");
|
|
sb.Append("****************\r\n");
|
|
sb.Append(m_warningMessages.ToString());
|
|
sb.Append("****************\r\n");
|
|
}
|
|
|
|
return sb.ToString();
|
|
}
|
|
|
|
public void LogWarning(string warningMessage, Exception ex)
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
m_numberOfWarnings++;
|
|
m_warningMessages.AppendLine(warningMessage);
|
|
if (m_verboseErrors)
|
|
while (ex != null)
|
|
{
|
|
m_warningMessages.AppendLine(ex.ToString());
|
|
ex = ex.InnerException;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|