diff options
| author | verhoek <30193551+verhoek@users.noreply.github.com> | 2018-11-02 23:34:07 +0300 |
|---|---|---|
| committer | verhoek <30193551+verhoek@users.noreply.github.com> | 2018-11-02 23:34:07 +0300 |
| commit | b2cc18426c5297a3da4cf1164a846091d1f9f457 (patch) | |
| tree | 99fb7bc58c2d2e392d392e5b76fad4775359eff8 | |
| parent | 6755d8cd1c94d7c01875e9b04a532e74ea577258 (diff) | |
Renamed Library.IO to Library.Common.IO.
Moved basic Platform functions to Library.Common.Platform.
Turned IO_OS into property within Library.Common.
112 files changed, 239 insertions, 209 deletions
diff --git a/Duplicati.sln b/Duplicati.sln index d28480b36..1723a2f78 100644 --- a/Duplicati.sln +++ b/Duplicati.sln @@ -99,7 +99,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.S EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.Rclone", "Duplicati\Library\Backend\Rclone\Duplicati.Library.Backend.Rclone.csproj", "{851A1CB8-3CEB-41B4-956F-34D760D2A8E5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.IO", "Duplicati\Library\IO\Duplicati.Library.IO.csproj", "{771272DA-3219-43D1-9AFC-0E808B5776C8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Common", "Duplicati\Library\IO\Duplicati.Library.Common.csproj", "{D63E53E4-A458-4C2F-914D-92F715F58ACF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -299,10 +299,10 @@ Global {851A1CB8-3CEB-41B4-956F-34D760D2A8E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {851A1CB8-3CEB-41B4-956F-34D760D2A8E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {851A1CB8-3CEB-41B4-956F-34D760D2A8E5}.Release|Any CPU.Build.0 = Release|Any CPU - {771272DA-3219-43D1-9AFC-0E808B5776C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {771272DA-3219-43D1-9AFC-0E808B5776C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {771272DA-3219-43D1-9AFC-0E808B5776C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {771272DA-3219-43D1-9AFC-0E808B5776C8}.Release|Any CPU.Build.0 = Release|Any CPU + {D63E53E4-A458-4C2F-914D-92F715F58ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D63E53E4-A458-4C2F-914D-92F715F58ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D63E53E4-A458-4C2F-914D-92F715F58ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D63E53E4-A458-4C2F-914D-92F715F58ACF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Duplicati/CommandLine/Commands.cs b/Duplicati/CommandLine/Commands.cs index 6a8a5d2bf..7091d1498 100644 --- a/Duplicati/CommandLine/Commands.cs +++ b/Duplicati/CommandLine/Commands.cs @@ -19,7 +19,7 @@ using System; using System.Linq;
using System.Collections.Generic;
using System.IO;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.CommandLine
{
diff --git a/Duplicati/CommandLine/Duplicati.CommandLine.csproj b/Duplicati/CommandLine/Duplicati.CommandLine.csproj index 8c3f35112..d2a885f7b 100644 --- a/Duplicati/CommandLine/Duplicati.CommandLine.csproj +++ b/Duplicati/CommandLine/Duplicati.CommandLine.csproj @@ -210,7 +210,7 @@ </ProjectReference>
<ProjectReference Include="..\Library\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj index 53796323f..85971d613 100644 --- a/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj +++ b/Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj @@ -173,7 +173,7 @@ </ProjectReference> <ProjectReference Include="..\..\Library\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/CommandLine/RecoveryTool/Restore.cs b/Duplicati/CommandLine/RecoveryTool/Restore.cs index 7faf024f1..c9fd8586a 100644 --- a/Duplicati/CommandLine/RecoveryTool/Restore.cs +++ b/Duplicati/CommandLine/RecoveryTool/Restore.cs @@ -18,7 +18,7 @@ using System; using System.IO;
using System.Linq;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.CommandLine.RecoveryTool
{
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs index 1bf0d98b0..0fee81b47 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2015, The Duplicati Team +// Copyright (C) 2015, The Duplicati Team // http://www.duplicati.com, info@duplicati.com // // This library is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ using AppIndicator; using Gtk;
using System.Collections.Generic; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; using Duplicati.Server.Serialization; @@ -34,8 +34,8 @@ namespace Duplicati.GUI.TrayIcon protected override void CreateTrayInstance()
{
- m_themeFolder = SystemIO.IO_OS(Utility.IsClientWindows).PathCombine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "SVGIcons");
- m_themeFolder = SystemIO.IO_OS(Utility.IsClientWindows).PathCombine(m_themeFolder, "dark");
+ m_themeFolder = SystemIO.IO_OS.PathCombine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "SVGIcons");
+ m_themeFolder = SystemIO.IO_OS.PathCombine(m_themeFolder, "dark");
m_appIndicator = new ApplicationIndicator("duplicati", "normal", Category.ApplicationStatus, m_themeFolder);
}
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index adc121222..a6d294f64 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -342,7 +342,7 @@ </ProjectReference>
<ProjectReference Include="..\..\Library\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs index 8a7615b23..9bd9b4a19 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq;
using System.Net;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Server.Serialization;
using Duplicati.Server.Serialization.Interface;
diff --git a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj index 2588f027f..798eb19a4 100644 --- a/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj +++ b/Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj @@ -69,7 +69,7 @@ </ProjectReference>
<ProjectReference Include="..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/AutoUpdater/Program.cs b/Duplicati/Library/AutoUpdater/Program.cs index fd9d31ba1..92ced508c 100644 --- a/Duplicati/Library/AutoUpdater/Program.cs +++ b/Duplicati/Library/AutoUpdater/Program.cs @@ -18,7 +18,7 @@ using System;
using System.Linq;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.AutoUpdater
{
diff --git a/Duplicati/Library/AutoUpdater/UpdaterManager.cs b/Duplicati/Library/AutoUpdater/UpdaterManager.cs index 852eff04c..e17f1464b 100644 --- a/Duplicati/Library/AutoUpdater/UpdaterManager.cs +++ b/Duplicati/Library/AutoUpdater/UpdaterManager.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.AutoUpdater
{
@@ -406,7 +406,7 @@ namespace Duplicati.Library.AutoUpdater {
var res = new List<KeyValuePair<string, UpdateInfo>>();
if (INSTALLDIR != null)
- foreach (var folder in SystemIO.IO_OS(Utility.Utility.IsClientWindows).GetDirectories(INSTALLDIR))
+ foreach (var folder in SystemIO.IO_OS.GetDirectories(INSTALLDIR))
{
var r = ReadInstalledManifest(folder);
if (r != null)
diff --git a/Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs b/Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs index 02557152b..0c4a9fbb3 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs +++ b/Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs @@ -27,7 +27,7 @@ using System.Security.Authentication; using Duplicati.Library.Interface;
using Uri = System.Uri;
using CoreUtility = Duplicati.Library.Utility.Utility;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.AlternativeFTP
{
@@ -148,7 +148,7 @@ namespace Duplicati.Library.Backend.AlternativeFTP _userInfo.Domain = "";
_url = u.SetScheme("ftp").SetQuery(null).SetCredentials(null, null).ToString();
- _url = IO.Util.AppendDirSeparator(_url, "/");
+ _url = Common.IO.Util.AppendDirSeparator(_url, "/");
_listVerify = !CoreUtility.ParseBoolOption(options, "disable-upload-verify");
// Process the aftp-data-connection-type option
diff --git a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj index fbf41f3ff..5e6b22f57 100644 --- a/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj +++ b/Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj @@ -74,7 +74,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs b/Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs index 93de36b9f..27245c1e0 100644 --- a/Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs +++ b/Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs @@ -21,7 +21,7 @@ using Duplicati.Library.Interface; using Newtonsoft.Json;
using System.IO;
using System.Net;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.AmazonCloudDrive
{
@@ -155,7 +155,7 @@ namespace Duplicati.Library.Backend.AmazonCloudDrive System.Threading.Thread.Sleep(wait);
}
- private string CacheFilePath { get { return SystemIO.IO_OS(Utility.Utility.IsClientWindows).PathCombine(Utility.TempFolder.SystemTempPath, string.Format(CACHE_FILE_NAME_TEMPLATE, m_userid)); } }
+ private string CacheFilePath { get { return SystemIO.IO_OS.PathCombine(Utility.TempFolder.SystemTempPath, string.Format(CACHE_FILE_NAME_TEMPLATE, m_userid)); } }
private void RefreshMetadataAndContentUrl()
{
diff --git a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj index 805de12ae..55628374b 100644 --- a/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj +++ b/Duplicati/Library/Backend/AmazonCloudDrive/Duplicati.Library.Backend.AmazonCloudDrive.csproj @@ -60,7 +60,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/AzureBlob/AzureBlobWrapper.cs b/Duplicati/Library/Backend/AzureBlob/AzureBlobWrapper.cs index 7e7f74501..590caa9cd 100644 --- a/Duplicati/Library/Backend/AzureBlob/AzureBlobWrapper.cs +++ b/Duplicati/Library/Backend/AzureBlob/AzureBlobWrapper.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Interface; using Duplicati.Library.Utility; using Microsoft.WindowsAzure.Storage; diff --git a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj index 74abcb7f4..02f18ceb9 100644 --- a/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj +++ b/Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj @@ -81,7 +81,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Backblaze/B2.cs b/Duplicati/Library/Backend/Backblaze/B2.cs index 593aac30a..b286fde1d 100644 --- a/Duplicati/Library/Backend/Backblaze/B2.cs +++ b/Duplicati/Library/Backend/Backblaze/B2.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Collections.Generic;
using Duplicati.Library.Utility;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO;
+using Duplicati.Library.Common.IO;
using Newtonsoft.Json;
using System.Net;
diff --git a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj index b8f1945a5..300bfb9da 100644 --- a/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj +++ b/Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj @@ -61,7 +61,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Box/BoxBackend.cs b/Duplicati/Library/Backend/Box/BoxBackend.cs index 4d5fdbf19..9f2b828fc 100644 --- a/Duplicati/Library/Backend/Box/BoxBackend.cs +++ b/Duplicati/Library/Backend/Box/BoxBackend.cs @@ -17,7 +17,7 @@ using System;
using System.Linq;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO;
+using Duplicati.Library.Common.IO;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Net;
diff --git a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj index 36ebc3838..4c66b8ab8 100644 --- a/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj +++ b/Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj @@ -64,7 +64,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs b/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs index eba81377e..2fdd12738 100644 --- a/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs +++ b/Duplicati/Library/Backend/CloudFiles/CloudFiles.cs @@ -23,7 +23,7 @@ using System.Linq; using System.Text;
using System.Net;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj index 9a785568a..6572b397e 100644 --- a/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj +++ b/Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj @@ -59,7 +59,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/Dropbox/Dropbox.cs b/Duplicati/Library/Backend/Dropbox/Dropbox.cs index 9a4e055de..e31c4f522 100644 --- a/Duplicati/Library/Backend/Dropbox/Dropbox.cs +++ b/Duplicati/Library/Backend/Dropbox/Dropbox.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.IO;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj index 8fe7a70be..7fdbb9670 100644 --- a/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj +++ b/Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj @@ -63,7 +63,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj index abc65f7f7..dc794ebda 100644 --- a/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj +++ b/Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj @@ -63,7 +63,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/FTP/FTPBackend.cs b/Duplicati/Library/Backend/FTP/FTPBackend.cs index 0182fdb2b..84b43f19a 100644 --- a/Duplicati/Library/Backend/FTP/FTPBackend.cs +++ b/Duplicati/Library/Backend/FTP/FTPBackend.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions;
using Duplicati.Library.Interface;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj index 6ddefc88c..79ec333b5 100644 --- a/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj +++ b/Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj @@ -59,7 +59,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/File/FileBackend.cs b/Duplicati/Library/Backend/File/FileBackend.cs index 93eadccda..b61b68fb4 100644 --- a/Duplicati/Library/Backend/File/FileBackend.cs +++ b/Duplicati/Library/Backend/File/FileBackend.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic;
using System.Runtime.InteropServices;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
@@ -41,7 +41,7 @@ namespace Duplicati.Library.Backend private readonly byte[] m_copybuffer = new byte[Utility.Utility.DEFAULT_BUFFER_SIZE];
- private static ISystemIO systemIO = SystemIO.IO_OS(Utility.Utility.IsClientWindows);
+ private static ISystemIO systemIO = SystemIO.IO_OS;
public File()
{
diff --git a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj index d5371d2ab..2593539ed 100644 --- a/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj +++ b/Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj @@ -63,7 +63,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs b/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs index e92cde381..59b87a924 100644 --- a/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs +++ b/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs @@ -24,7 +24,7 @@ using Newtonsoft.Json; using Duplicati.Library.Backend.GoogleServices;
using Duplicati.Library.Interface;
using Duplicati.Library.Utility;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.GoogleCloudStorage
{
diff --git a/Duplicati/Library/Backend/GoogleServices/GoogleDrive.cs b/Duplicati/Library/Backend/GoogleServices/GoogleDrive.cs index 96daa158b..bca240c3f 100644 --- a/Duplicati/Library/Backend/GoogleServices/GoogleDrive.cs +++ b/Duplicati/Library/Backend/GoogleServices/GoogleDrive.cs @@ -25,7 +25,7 @@ using Newtonsoft.Json; using Duplicati.Library.Backend.GoogleServices;
using Duplicati.Library.Interface;
using Duplicati.Library.Utility;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.GoogleDrive
{
diff --git a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj index d6a6c4159..33be3c12b 100644 --- a/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj +++ b/Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj @@ -63,7 +63,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Jottacloud/Jottacloud.cs b/Duplicati/Library/Backend/Jottacloud/Jottacloud.cs index be1cc2bf3..472043acf 100644 --- a/Duplicati/Library/Backend/Jottacloud/Jottacloud.cs +++ b/Duplicati/Library/Backend/Jottacloud/Jottacloud.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using Duplicati.Library.Interface; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend { diff --git a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj index 3247ba94a..ccae2aeb9 100644 --- a/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj +++ b/Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj @@ -61,7 +61,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Mega/MegaBackend.cs b/Duplicati/Library/Backend/Mega/MegaBackend.cs index 5e7358d40..2a5859922 100644 --- a/Duplicati/Library/Backend/Mega/MegaBackend.cs +++ b/Duplicati/Library/Backend/Mega/MegaBackend.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Collections.Generic;
using Duplicati.Library.Interface;
using CG.Web.MegaApiClient;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.Mega
{
diff --git a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj index 5c36586ca..fcea5a894 100644 --- a/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj +++ b/Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj @@ -83,7 +83,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Duplicati/Library/Backend/OneDrive/MicrosoftGraphBackend.cs b/Duplicati/Library/Backend/OneDrive/MicrosoftGraphBackend.cs index 954b4872b..d3d80836a 100644 --- a/Duplicati/Library/Backend/OneDrive/MicrosoftGraphBackend.cs +++ b/Duplicati/Library/Backend/OneDrive/MicrosoftGraphBackend.cs @@ -10,7 +10,7 @@ using System.Threading; using Duplicati.Library.Backend.MicrosoftGraph;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility;
using Newtonsoft.Json;
diff --git a/Duplicati/Library/Backend/OneDrive/OneDrive.cs b/Duplicati/Library/Backend/OneDrive/OneDrive.cs index a1cd14969..a355db687 100644 --- a/Duplicati/Library/Backend/OneDrive/OneDrive.cs +++ b/Duplicati/Library/Backend/OneDrive/OneDrive.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions;
using System.Net;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj index 7a29c14b8..9dd73469f 100644 --- a/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj +++ b/Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj @@ -61,7 +61,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs index 7217ed41a..05e1a03d1 100644 --- a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs +++ b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs @@ -25,7 +25,7 @@ using Newtonsoft.Json.Converters; using Duplicati.Library.Strings;
using System.Net;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.OpenStack
{
diff --git a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj index dfc3d2e2e..e4a642064 100644 --- a/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj +++ b/Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj @@ -56,7 +56,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Rclone/Rclone.cs b/Duplicati/Library/Backend/Rclone/Rclone.cs index 9f73b324f..a7c344caa 100644 --- a/Duplicati/Library/Backend/Rclone/Rclone.cs +++ b/Duplicati/Library/Backend/Rclone/Rclone.cs @@ -27,7 +27,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq;
using System.Globalization;
using System.IO;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj index f236681b0..646350f5b 100644 --- a/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj +++ b/Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj @@ -74,7 +74,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index 8776f95d8..a0d7be2d8 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.Text;
using System.Text.RegularExpressions;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/S3/S3Wrapper.cs b/Duplicati/Library/Backend/S3/S3Wrapper.cs index 5288dfbd4..fd577b5fb 100644 --- a/Duplicati/Library/Backend/S3/S3Wrapper.cs +++ b/Duplicati/Library/Backend/S3/S3Wrapper.cs @@ -169,7 +169,7 @@ namespace Duplicati.Library.Backend {
if (alreadyReturned.Add(obj.Key))
{
- yield return new IO.FileEntry(
+ yield return new Common.IO.FileEntry(
obj.Key,
obj.Size,
obj.LastModified,
diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index da2e9242f..9cc164115 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -64,7 +64,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs index 4b7e8d791..af0801f53 100644 --- a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs +++ b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Linq;
using System.Text;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Renci.SshNet;
using Renci.SshNet.Common;
diff --git a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj index 534f08e56..ea0b38118 100644 --- a/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj +++ b/Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj @@ -78,7 +78,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs b/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs index 5bd913d92..5c6337fa5 100644 --- a/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs +++ b/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs @@ -29,7 +29,7 @@ using Duplicati.Library.Interface; using SP = Microsoft.SharePoint.Client; using Microsoft.SharePoint.Client; // Plain 'using' for extension methods -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend { diff --git a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj index d632c39a7..cde63c034 100644 --- a/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj +++ b/Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj @@ -60,7 +60,7 @@ </ProjectReference> <ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/Library/Backend/Sia/Sia.cs b/Duplicati/Library/Backend/Sia/Sia.cs index c23892317..cac4ab2f4 100644 --- a/Duplicati/Library/Backend/Sia/Sia.cs +++ b/Duplicati/Library/Backend/Sia/Sia.cs @@ -6,7 +6,7 @@ using System.Net; using Duplicati.Library.Interface; using Duplicati.Library.Utility; using Newtonsoft.Json; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend.Sia { diff --git a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj index ccaceef36..7889305f0 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj +++ b/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj @@ -70,7 +70,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs b/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs index 480c254aa..f253a2686 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs +++ b/Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs @@ -24,7 +24,7 @@ using Duplicati.Library.Interface; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj index 41c556bbc..35a22eeb1 100644 --- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj +++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj @@ -63,7 +63,7 @@ </ProjectReference>
<ProjectReference Include="..\..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs index b7afcc79e..8d175cc4b 100644 --- a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs +++ b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic;
using System.Text;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Backend
{
diff --git a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj index 3629e000e..4c961097a 100644 --- a/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj +++ b/Duplicati/Library/Compression/Duplicati.Library.Compression.csproj @@ -72,7 +72,7 @@ </ProjectReference>
<ProjectReference Include="..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Compression/FileArchiveDirectory.cs b/Duplicati/Library/Compression/FileArchiveDirectory.cs index 17ff48576..da28d545a 100644 --- a/Duplicati/Library/Compression/FileArchiveDirectory.cs +++ b/Duplicati/Library/Compression/FileArchiveDirectory.cs @@ -24,7 +24,7 @@ using System; using System.Collections.Generic;
using System.Text;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Compression
{
diff --git a/Duplicati/Library/IO/Duplicati.Library.IO.csproj b/Duplicati/Library/IO/Duplicati.Library.Common.csproj index a784ae16c..0b8bd0289 100644 --- a/Duplicati/Library/IO/Duplicati.Library.IO.csproj +++ b/Duplicati/Library/IO/Duplicati.Library.Common.csproj @@ -59,14 +59,15 @@ </ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ISystemIO.cs" />
- <Compile Include="SystemIO.cs" />
- <Compile Include="SystemIOWindows.cs" />
- <Compile Include="SystemIOLinux.cs" />
- <Compile Include="VssBackupComponents.cs" />
- <Compile Include="Util.cs" />
- <Compile Include="DefineDosDevice.cs" />
- <Compile Include="FileEntry.cs" />
+ <Compile Include="Platform\Platform.cs" />
+ <Compile Include="IO\SystemIO.cs" />
+ <Compile Include="IO\SystemIOLinux.cs" />
+ <Compile Include="IO\SystemIOWindows.cs" />
+ <Compile Include="IO\ISystemIO.cs" />
+ <Compile Include="IO\FileEntry.cs" />
+ <Compile Include="IO\VssBackupComponents.cs" />
+ <Compile Include="IO\Util.cs" />
+ <Compile Include="IO\DefineDosDevice.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
@@ -92,5 +93,9 @@ <Name>Duplicati.Library.Interface</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="IO\" />
+ <Folder Include="Platform\" />
+ </ItemGroup>
<Import Project="..\..\..\packages\AlphaVSS.1.4.0\build\net45\AlphaVSS.targets" Condition="Exists('..\..\..\packages\AlphaVSS.1.4.0\build\net45\AlphaVSS.targets')" />
</Project>
diff --git a/Duplicati/Library/IO/DefineDosDevice.cs b/Duplicati/Library/IO/IO/DefineDosDevice.cs index fcd787c52..f6149bc04 100644 --- a/Duplicati/Library/IO/DefineDosDevice.cs +++ b/Duplicati/Library/IO/IO/DefineDosDevice.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text;
using System.IO;
-namespace Duplicati.Library.IO
+namespace Duplicati.Library.Common.IO
{
/// <summary>
/// Implements a convenient wrapping for mapping a path to a drive letter
diff --git a/Duplicati/Library/IO/FileEntry.cs b/Duplicati/Library/IO/IO/FileEntry.cs index aafeddf0f..689163ba9 100644 --- a/Duplicati/Library/IO/FileEntry.cs +++ b/Duplicati/Library/IO/IO/FileEntry.cs @@ -20,7 +20,7 @@ using System;
using Duplicati.Library.Interface;
-namespace Duplicati.Library.IO
+namespace Duplicati.Library.Common.IO
{
/// <summary>
/// The primary implementation of the file interface
diff --git a/Duplicati/Library/IO/ISystemIO.cs b/Duplicati/Library/IO/IO/ISystemIO.cs index e53d2339f..8fe034b19 100644 --- a/Duplicati/Library/IO/ISystemIO.cs +++ b/Duplicati/Library/IO/IO/ISystemIO.cs @@ -20,7 +20,7 @@ using System.IO; using System.Collections.Generic;
using Duplicati.Library.Interface; -namespace Duplicati.Library.IO
+namespace Duplicati.Library.Common.IO
{
/// <summary>
/// Interface for wrapping System.IO operations.
diff --git a/Duplicati/Library/IO/SystemIO.cs b/Duplicati/Library/IO/IO/SystemIO.cs index e5a6c71ec..0dc1a1d5b 100644 --- a/Duplicati/Library/IO/SystemIO.cs +++ b/Duplicati/Library/IO/IO/SystemIO.cs @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System; -namespace Duplicati.Library.IO +namespace Duplicati.Library.Common.IO { public static class SystemIO {
@@ -44,11 +44,11 @@ namespace Duplicati.Library.IO }
- public static ISystemIO IO_OS(bool useWindowsIO) + public static ISystemIO IO_OS { - {
- return useWindowsIO ? _IO_WIN : _IO_SYS; - } + get {
+ return Platform.IsClientWindows ? _IO_WIN : _IO_SYS;
+ } }
}
}
\ No newline at end of file diff --git a/Duplicati/Library/IO/SystemIOLinux.cs b/Duplicati/Library/IO/IO/SystemIOLinux.cs index 41586abe3..fecdf5f5f 100644 --- a/Duplicati/Library/IO/SystemIOLinux.cs +++ b/Duplicati/Library/IO/IO/SystemIOLinux.cs @@ -21,7 +21,7 @@ using System.Linq; using System.Collections.Generic;
using Duplicati.Library.Interface; -namespace Duplicati.Library.IO
+namespace Duplicati.Library.Common.IO
{
public struct SystemIOLinux : ISystemIO
{
diff --git a/Duplicati/Library/IO/SystemIOWindows.cs b/Duplicati/Library/IO/IO/SystemIOWindows.cs index 8fd7ee28c..f6d641b64 100644 --- a/Duplicati/Library/IO/SystemIOWindows.cs +++ b/Duplicati/Library/IO/IO/SystemIOWindows.cs @@ -20,11 +20,10 @@ using System.Collections.Generic; using System.Security.AccessControl;
using System.IO;
-using Alphaleonis.Win32.Vss;
using AlphaFS = Alphaleonis.Win32.Filesystem;
using Duplicati.Library.Interface;
-namespace Duplicati.Library.IO
+namespace Duplicati.Library.Common.IO
{
public struct SystemIOWindows : ISystemIO
{
diff --git a/Duplicati/Library/IO/Util.cs b/Duplicati/Library/IO/IO/Util.cs index 52287fcce..879da2609 100644 --- a/Duplicati/Library/IO/Util.cs +++ b/Duplicati/Library/IO/IO/Util.cs @@ -17,7 +17,7 @@ using System; using System.IO; -namespace Duplicati.Library.IO +namespace Duplicati.Library.Common.IO { public static class Util { diff --git a/Duplicati/Library/IO/VssBackupComponents.cs b/Duplicati/Library/IO/IO/VssBackupComponents.cs index 0368310a9..e236aff8c 100644 --- a/Duplicati/Library/IO/VssBackupComponents.cs +++ b/Duplicati/Library/IO/IO/VssBackupComponents.cs @@ -20,7 +20,7 @@ using System.IO; using System.Linq; using Alphaleonis.Win32.Vss;
-namespace Duplicati.Library.IO +namespace Duplicati.Library.Common.IO {
public class WriterMetaData {
diff --git a/Duplicati/Library/IO/Platform/Platform.cs b/Duplicati/Library/IO/Platform/Platform.cs new file mode 100644 index 000000000..47974a1f5 --- /dev/null +++ b/Duplicati/Library/IO/Platform/Platform.cs @@ -0,0 +1,32 @@ +// Copyright (C) 2018, The Duplicati Team
+// http://www.duplicati.com, info@duplicati.com
+//
+// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+using System; +namespace Duplicati.Library.Common +{ + public static class Platform + { + /// <value>
+ /// Gets or sets a value indicating if the client is Linux/Unix based
+ /// </value>
+ public static bool IsClientLinux => Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX;
+
+ /// <summary>
+ /// Gets a value indicating if the client is Windows based
+ /// </summary>
+ public static bool IsClientWindows => !IsClientLinux;
+ } +} diff --git a/Duplicati/Library/Main/Controller.cs b/Duplicati/Library/Main/Controller.cs index 216a48742..b4fa50e91 100644 --- a/Duplicati/Library/Main/Controller.cs +++ b/Duplicati/Library/Main/Controller.cs @@ -23,7 +23,7 @@ using System.Linq; using System;
using System.Collections.Generic;
using Duplicati.Library.Utility;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main
{
diff --git a/Duplicati/Library/Main/Database/LocalBugReportDatabase.cs b/Duplicati/Library/Main/Database/LocalBugReportDatabase.cs index fe9fc40c0..15be9fb4e 100644 --- a/Duplicati/Library/Main/Database/LocalBugReportDatabase.cs +++ b/Duplicati/Library/Main/Database/LocalBugReportDatabase.cs @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main.Database
{
diff --git a/Duplicati/Library/Main/Database/LocalListDatabase.cs b/Duplicati/Library/Main/Database/LocalListDatabase.cs index abd2f4a8e..77f7de6ac 100644 --- a/Duplicati/Library/Main/Database/LocalListDatabase.cs +++ b/Duplicati/Library/Main/Database/LocalListDatabase.cs @@ -19,7 +19,7 @@ using System; using System.Linq;
using System.Collections.Generic;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main.Database
{
diff --git a/Duplicati/Library/Main/Database/LocalRestoreDatabase.cs b/Duplicati/Library/Main/Database/LocalRestoreDatabase.cs index 3e82f3d93..e36b6f543 100644 --- a/Duplicati/Library/Main/Database/LocalRestoreDatabase.cs +++ b/Duplicati/Library/Main/Database/LocalRestoreDatabase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Main.Volumes;
namespace Duplicati.Library.Main.Database
diff --git a/Duplicati/Library/Main/Database/PathLookupHelper.cs b/Duplicati/Library/Main/Database/PathLookupHelper.cs index d0d693f2c..ba734cab9 100644 --- a/Duplicati/Library/Main/Database/PathLookupHelper.cs +++ b/Duplicati/Library/Main/Database/PathLookupHelper.cs @@ -19,7 +19,7 @@ using System; using System.IO;
using System.Linq;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main.Database
{
diff --git a/Duplicati/Library/Main/Duplicati.Library.Main.csproj b/Duplicati/Library/Main/Duplicati.Library.Main.csproj index 23a7ce837..9515d77f8 100644 --- a/Duplicati/Library/Main/Duplicati.Library.Main.csproj +++ b/Duplicati/Library/Main/Duplicati.Library.Main.csproj @@ -187,7 +187,7 @@ </ProjectReference>
<ProjectReference Include="..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs index 7294afecb..ec924dbfe 100644 --- a/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs +++ b/Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs @@ -23,7 +23,7 @@ using System.Linq; using Duplicati.Library.Interface;
using Duplicati.Library.Main.Operation.Common;
using Duplicati.Library.Snapshots;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main.Operation.Backup
{
@@ -289,7 +289,7 @@ namespace Duplicati.Library.Main.Operation.Backup {
foreach (var n in ignorenames)
{
- var ignorepath = SystemIO.IO_OS(Library.Utility.Utility.IsClientWindows).PathCombine(path, n);
+ var ignorepath = SystemIO.IO_OS.PathCombine(path, n);
if (snapshot.FileExists(ignorepath))
{
Logging.Log.WriteVerboseMessage(FILTER_LOGTAG, "ExcludingPathDueToIgnoreFile", "Excluding path because ignore file was found: {0}", ignorepath);
diff --git a/Duplicati/Library/Main/Operation/BackupHandler.cs b/Duplicati/Library/Main/Operation/BackupHandler.cs index 679d47510..d83086703 100644 --- a/Duplicati/Library/Main/Operation/BackupHandler.cs +++ b/Duplicati/Library/Main/Operation/BackupHandler.cs @@ -32,7 +32,7 @@ using CoCoL; using System.Threading;
using Duplicati.Library.Snapshots;
using Duplicati.Library.Utility;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Main.Operation
{
diff --git a/Duplicati/Library/Main/Operation/RestoreHandler.cs b/Duplicati/Library/Main/Operation/RestoreHandler.cs index 5ab45830e..b661a061b 100644 --- a/Duplicati/Library/Main/Operation/RestoreHandler.cs +++ b/Duplicati/Library/Main/Operation/RestoreHandler.cs @@ -1,9 +1,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Main.Database;
using Duplicati.Library.Main.Volumes;
@@ -20,7 +19,6 @@ namespace Duplicati.Library.Main.Operation private readonly Options m_options;
private byte[] m_blockbuffer;
private readonly RestoreResults m_result; - private static readonly ISystemIO m_systemIO = SystemIO.IO_OS(Duplicati.Library.Utility.Utility.IsClientWindows);
private static readonly string DIRSEP = Util.DirectorySeparatorString;
public RestoreHandler(string backendurl, Options options, RestoreResults result)
@@ -88,7 +86,7 @@ namespace Duplicati.Library.Main.Operation // If we have both target paths and a filter, combine into a single filter
filter = Library.Utility.JoinedFilterExpression.Join(new Library.Utility.FilterExpression(paths), filter);
- if (!m_options.NoLocalDb && m_systemIO.FileExists(m_options.Dbpath))
+ if (!m_options.NoLocalDb && SystemIO.IO_OS.FileExists(m_options.Dbpath))
{
using(var db = new LocalRestoreDatabase(m_options.Dbpath))
{
@@ -162,16 +160,16 @@ namespace Duplicati.Library.Main.Operation try
{
- var folderpath = m_systemIO.PathGetDirectoryName(targetpath);
- if (!options.Dryrun && !m_systemIO.DirectoryExists(folderpath))
+ var folderpath = SystemIO.IO_OS.PathGetDirectoryName(targetpath);
+ if (!options.Dryrun && !SystemIO.IO_OS.DirectoryExists(folderpath))
{
Logging.Log.WriteWarningMessage(LOGTAG, "CreateMissingFolder", null, "Creating missing folder {0} for file {1}", folderpath, targetpath);
- m_systemIO.DirectoryCreate(folderpath);
+ SystemIO.IO_OS.DirectoryCreate(folderpath);
}
// TODO: Much faster if we iterate the volume and checks what blocks are used,
// because the compressors usually like sequential reading
- using(var file = m_systemIO.FileOpenWrite(targetpath))
+ using(var file = SystemIO.IO_OS.FileOpenWrite(targetpath))
foreach(var targetblock in restorelist.Blocks)
{
file.Position = targetblock.Offset;
@@ -270,10 +268,10 @@ namespace Duplicati.Library.Main.Operation try
{
var folderpath = Duplicati.Library.Utility.Utility.GetParent(targetpath, false);
- if (!options.Dryrun && !m_systemIO.DirectoryExists(folderpath))
+ if (!options.Dryrun && !SystemIO.IO_OS.DirectoryExists(folderpath))
{
Logging.Log.WriteWarningMessage(LOGTAG, "CreateMissingFolder", null, "Creating missing folder {0} for target {1}", folderpath, targetpath);
- m_systemIO.DirectoryCreate(folderpath);
+ SystemIO.IO_OS.DirectoryCreate(folderpath);
}
ApplyMetadata(targetpath, metainfo.Value, options.RestorePermissions, options.RestoreSymlinkMetadata, options.Dryrun);
@@ -398,7 +396,7 @@ namespace Duplicati.Library.Main.Operation // Restore empty files. They might not have any blocks so don't appear in any volume.
foreach (var file in database.GetFilesToRestore(true).Where(item => item.Length == 0)) {
// Just create the file and close it right away, empty statement is intentional.
- using (m_systemIO.FileCreate(file.Path))
+ using (SystemIO.IO_OS.FileCreate(file.Path))
{
}
}
@@ -438,7 +436,7 @@ namespace Duplicati.Library.Main.Operation string key;
long size;
- using(var fs = m_systemIO.FileOpenRead(file.Path))
+ using(var fs = SystemIO.IO_OS.FileOpenRead(file.Path))
{
size = fs.Length;
key = Convert.ToBase64String(filehasher.ComputeHash(fs));
@@ -492,13 +490,13 @@ namespace Duplicati.Library.Main.Operation // Make the symlink first, otherwise we cannot apply metadata to it
if (metadata.TryGetValue("CoreSymlinkTarget", out k))
- m_systemIO.CreateSymlink(targetpath, k, isDirTarget);
+ SystemIO.IO_OS.CreateSymlink(targetpath, k, isDirTarget);
// If the target is a folder, make sure we create it first
- else if (isDirTarget && !m_systemIO.DirectoryExists(targetpath))
- m_systemIO.DirectoryCreate(targetpath);
+ else if (isDirTarget && !SystemIO.IO_OS.DirectoryExists(targetpath))
+ SystemIO.IO_OS.DirectoryCreate(targetpath);
// Avoid setting restoring symlink metadata, as that writes the symlink target, not the symlink itself
- if (!restoreSymlinkMetadata && Snapshots.SnapshotUtility.IsSymlink(m_systemIO, targetpath))
+ if (!restoreSymlinkMetadata && Snapshots.SnapshotUtility.IsSymlink(SystemIO.IO_OS, targetpath))
{
Logging.Log.WriteVerboseMessage(LOGTAG, "no-symlink-metadata-restored", "Not applying metadata to symlink: {0}", targetpath);
return;
@@ -507,23 +505,23 @@ namespace Duplicati.Library.Main.Operation if (metadata.TryGetValue("CoreLastWritetime", out k) && long.TryParse(k, out t))
{
if (isDirTarget)
- m_systemIO.DirectorySetLastWriteTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
+ SystemIO.IO_OS.DirectorySetLastWriteTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
else
- m_systemIO.FileSetLastWriteTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
+ SystemIO.IO_OS.FileSetLastWriteTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
}
if (metadata.TryGetValue("CoreCreatetime", out k) && long.TryParse(k, out t))
{
if (isDirTarget)
- m_systemIO.DirectorySetCreationTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
+ SystemIO.IO_OS.DirectorySetCreationTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
else
- m_systemIO.FileSetCreationTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
+ SystemIO.IO_OS.FileSetCreationTimeUtc(targetpath, new DateTime(t, DateTimeKind.Utc));
}
if (metadata.TryGetValue("CoreAttributes", out k) && Enum.TryParse(k, true, out fa))
- m_systemIO.SetFileAttributes(targetpath, fa);
+ SystemIO.IO_OS.SetFileAttributes(targetpath, fa);
- m_systemIO.SetMetadata(path, metadata, restorePermissions);
+ SystemIO.IO_OS.SetMetadata(path, metadata, restorePermissions);
}
}
@@ -542,20 +540,20 @@ namespace Duplicati.Library.Main.Operation try
{
- if (m_systemIO.FileExists(sourcepath))
+ if (SystemIO.IO_OS.FileExists(sourcepath))
{
- var folderpath = m_systemIO.PathGetDirectoryName(targetpath);
- if (!options.Dryrun && !m_systemIO.DirectoryExists(folderpath))
+ var folderpath = SystemIO.IO_OS.PathGetDirectoryName(targetpath);
+ if (!options.Dryrun && !SystemIO.IO_OS.DirectoryExists(folderpath))
{
Logging.Log.WriteWarningMessage(LOGTAG, "CreateMissingFolder", null, "Creating missing folder {0} for file {1}", folderpath, targetpath);
- m_systemIO.DirectoryCreate(folderpath);
+ SystemIO.IO_OS.DirectoryCreate(folderpath);
}
- using(var targetstream = options.Dryrun ? null : m_systemIO.FileOpenWrite(targetpath))
+ using(var targetstream = options.Dryrun ? null : SystemIO.IO_OS.FileOpenWrite(targetpath))
{
try
{
- using(var sourcestream = m_systemIO.FileOpenRead(sourcepath))
+ using(var sourcestream = SystemIO.IO_OS.FileOpenRead(sourcepath))
{
foreach(var block in entry.Blocks)
{
@@ -648,14 +646,14 @@ namespace Duplicati.Library.Main.Operation if (result.TaskControlRendevouz() == TaskControlState.Stop)
return;
- var folderpath = m_systemIO.PathGetDirectoryName(targetpath);
- if (!options.Dryrun && !m_systemIO.DirectoryExists(folderpath))
+ var folderpath = SystemIO.IO_OS.PathGetDirectoryName(targetpath);
+ if (!options.Dryrun && !SystemIO.IO_OS.DirectoryExists(folderpath))
{
Logging.Log.WriteWarningMessage(LOGTAG, "CreateMissingFolder", null, "Creating missing folder {0} for file {1}", folderpath, targetpath);
- m_systemIO.DirectoryCreate(folderpath);
+ SystemIO.IO_OS.DirectoryCreate(folderpath);
}
- using (var file = options.Dryrun ? null : m_systemIO.FileOpenWrite(targetpath))
+ using (var file = options.Dryrun ? null : SystemIO.IO_OS.FileOpenWrite(targetpath))
foreach (var targetblock in restorelist.Blocks)
{
foreach (var source in targetblock.Blocksources)
@@ -665,7 +663,7 @@ namespace Duplicati.Library.Main.Operation if (result.TaskControlRendevouz() == TaskControlState.Stop)
return;
- if (m_systemIO.FileExists(source.Path))
+ if (SystemIO.IO_OS.FileExists(source.Path))
{
if (source.IsMetadata)
{
@@ -676,7 +674,7 @@ namespace Duplicati.Library.Main.Operation }
else
{
- using (var sourcefile = m_systemIO.FileOpenRead(source.Path))
+ using (var sourcefile = SystemIO.IO_OS.FileOpenRead(source.Path))
{
sourcefile.Position = source.Offset;
int size = Library.Utility.Utility.ForceStreamRead(sourcefile, blockbuffer, blockbuffer.Length);
@@ -778,14 +776,14 @@ namespace Duplicati.Library.Main.Operation {
// This part is not protected by try/catch as we need the target folder to exist
if (!string.IsNullOrEmpty(options.Restorepath))
- if (!m_systemIO.DirectoryExists(options.Restorepath))
+ if (!SystemIO.IO_OS.DirectoryExists(options.Restorepath))
{
Logging.Log.WriteVerboseMessage(LOGTAG, "CreateFolder", "Creating folder: {0}", options.Restorepath);
if (options.Dryrun)
Logging.Log.WriteDryrunMessage(LOGTAG, "WouldCreateFolder", "Would create folder: {0}", options.Restorepath);
else
- m_systemIO.DirectoryCreate(options.Restorepath);
+ SystemIO.IO_OS.DirectoryCreate(options.Restorepath);
}
foreach (var folder in database.GetTargetFolders())
@@ -795,7 +793,7 @@ namespace Duplicati.Library.Main.Operation if (result.TaskControlRendevouz() == TaskControlState.Stop)
return;
- if (!m_systemIO.DirectoryExists(folder))
+ if (!SystemIO.IO_OS.DirectoryExists(folder))
{
result.FoldersRestored++;
@@ -804,7 +802,7 @@ namespace Duplicati.Library.Main.Operation if (options.Dryrun)
Logging.Log.WriteDryrunMessage(LOGTAG, "WouldCreateFolder", "Would create folder: {0}", folder);
else
- m_systemIO.DirectoryCreate(folder);
+ SystemIO.IO_OS.DirectoryCreate(folder);
}
}
catch (Exception ex)
@@ -829,14 +827,14 @@ namespace Duplicati.Library.Main.Operation var targetfileid = restorelist.TargetFileID;
var targetfilehash = restorelist.TargetHash;
var targetfilelength = restorelist.Length;
- if (m_systemIO.FileExists(targetpath))
+ if (SystemIO.IO_OS.FileExists(targetpath))
{
try
{
if (result.TaskControlRendevouz() == TaskControlState.Stop)
return;
- var currentfilelength = m_systemIO.FileLength(targetpath);
+ var currentfilelength = SystemIO.IO_OS.FileLength(targetpath);
var wasTruncated = false;
// Adjust file length in overwrite mode if necessary (smaller is ok, will be extended during restore)
@@ -844,18 +842,18 @@ namespace Duplicati.Library.Main.Operation // be truncated (i.e. forthwritten log files).
if (!rename && currentfilelength > targetfilelength)
{
- var currentAttr = m_systemIO.GetFileAttributes(targetpath);
+ var currentAttr = SystemIO.IO_OS.GetFileAttributes(targetpath);
if ((currentAttr & System.IO.FileAttributes.ReadOnly) != 0) // clear readonly attribute
{
if (options.Dryrun)
Logging.Log.WriteDryrunMessage(LOGTAG, "WouldResetReadOnlyAttribute", "Would reset read-only attribute on file: {0}", targetpath);
- else m_systemIO.SetFileAttributes(targetpath, currentAttr & ~System.IO.FileAttributes.ReadOnly);
+ else SystemIO.IO_OS.SetFileAttributes(targetpath, currentAttr & ~System.IO.FileAttributes.ReadOnly);
}
if (options.Dryrun)
Logging.Log.WriteDryrunMessage(LOGTAG, "WouldTruncateFile", "Would truncate file '{0}' to length of {1:N0} bytes", targetpath, targetfilelength);
else
{
- using (var file = m_systemIO.FileOpenWrite(targetpath))
+ using (var file = SystemIO.IO_OS.FileOpenWrite(targetpath))
file.SetLength(targetfilelength);
currentfilelength = targetfilelength;
}
@@ -873,7 +871,7 @@ namespace Duplicati.Library.Main.Operation bool calcFileHash = (currentfilelength == targetfilelength);
if (calcFileHash) filehasher.Initialize();
- using (var file = m_systemIO.FileOpenRead(targetpath))
+ using (var file = SystemIO.IO_OS.FileOpenRead(targetpath))
using (var block = new Blockprocessor(file, blockbuffer))
foreach (var targetblock in restorelist.Blocks)
{
@@ -923,12 +921,12 @@ namespace Duplicati.Library.Main.Operation if (!rename && !fullfilehashmatch && !wasTruncated) // Reset read-only attribute (if set) to overwrite
{
- var currentAttr = m_systemIO.GetFileAttributes(targetpath);
+ var currentAttr = SystemIO.IO_OS.GetFileAttributes(targetpath);
if ((currentAttr & System.IO.FileAttributes.ReadOnly) != 0)
{
if (options.Dryrun)
Logging.Log.WriteDryrunMessage(LOGTAG, "WouldResetReadOnlyAttribyte", "Would reset read-only attribute on file: {0}", targetpath);
- else m_systemIO.SetFileAttributes(targetpath, currentAttr & ~System.IO.FileAttributes.ReadOnly);
+ else SystemIO.IO_OS.SetFileAttributes(targetpath, currentAttr & ~System.IO.FileAttributes.ReadOnly);
}
}
@@ -972,15 +970,15 @@ namespace Duplicati.Library.Main.Operation if (rename)
{
//Select a new filename
- var ext = m_systemIO.PathGetExtension(targetpath) ?? "";
+ var ext = SystemIO.IO_OS.PathGetExtension(targetpath) ?? "";
if (!string.IsNullOrEmpty(ext) && !ext.StartsWith(".", StringComparison.Ordinal))
ext = "." + ext;
// First we try with a simple date append, assuming that there are not many conflicts there
- var newname = m_systemIO.PathChangeExtension(targetpath, null) + "." + database.RestoreTime.ToLocalTime().ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
+ var newname = SystemIO.IO_OS.PathChangeExtension(targetpath, null) + "." + database.RestoreTime.ToLocalTime().ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
var tr = newname + ext;
var c = 0;
- while (m_systemIO.FileExists(tr) && c < 1000)
+ while (SystemIO.IO_OS.FileExists(tr) && c < 1000)
{
try
{
@@ -989,7 +987,7 @@ namespace Duplicati.Library.Main.Operation filehasher.Initialize();
string key;
- using(var file = m_systemIO.FileOpenRead(tr))
+ using(var file = SystemIO.IO_OS.FileOpenRead(tr))
key = Convert.ToBase64String(filehasher.ComputeHash(file));
if (key == targetfilehash)
diff --git a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj index a59162cbe..4e709d6f2 100644 --- a/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj +++ b/Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj @@ -92,7 +92,7 @@ </ProjectReference>
<ProjectReference Include="..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Library/Snapshots/HyperVUtility.cs b/Duplicati/Library/Snapshots/HyperVUtility.cs index cdaa8ce84..f4ce0f060 100644 --- a/Duplicati/Library/Snapshots/HyperVUtility.cs +++ b/Duplicati/Library/Snapshots/HyperVUtility.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO;
using System.Linq;
using System.Management;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Snapshots/LinuxSnapshot.cs b/Duplicati/Library/Snapshots/LinuxSnapshot.cs index a35fa2447..1e51a5498 100644 --- a/Duplicati/Library/Snapshots/LinuxSnapshot.cs +++ b/Duplicati/Library/Snapshots/LinuxSnapshot.cs @@ -22,7 +22,7 @@ using System; using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Snapshots/MSSQLUtility.cs b/Duplicati/Library/Snapshots/MSSQLUtility.cs index 7d92dd590..adcc2bdf5 100644 --- a/Duplicati/Library/Snapshots/MSSQLUtility.cs +++ b/Duplicati/Library/Snapshots/MSSQLUtility.cs @@ -1,4 +1,4 @@ -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/Duplicati/Library/Snapshots/NoSnapshotLinux.cs b/Duplicati/Library/Snapshots/NoSnapshotLinux.cs index 441be3259..3a9e9d253 100644 --- a/Duplicati/Library/Snapshots/NoSnapshotLinux.cs +++ b/Duplicati/Library/Snapshots/NoSnapshotLinux.cs @@ -17,7 +17,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Snapshots/NoSnapshotWindows.cs b/Duplicati/Library/Snapshots/NoSnapshotWindows.cs index 85c0ab819..33db9c8d6 100644 --- a/Duplicati/Library/Snapshots/NoSnapshotWindows.cs +++ b/Duplicati/Library/Snapshots/NoSnapshotWindows.cs @@ -17,7 +17,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Snapshots/SnapshotBase.cs b/Duplicati/Library/Snapshots/SnapshotBase.cs index ef831b433..e59118f44 100644 --- a/Duplicati/Library/Snapshots/SnapshotBase.cs +++ b/Duplicati/Library/Snapshots/SnapshotBase.cs @@ -23,7 +23,7 @@ using System.Linq; using System; using System.Collections.Generic; using System.IO; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots { diff --git a/Duplicati/Library/Snapshots/SnapshotUtility.cs b/Duplicati/Library/Snapshots/SnapshotUtility.cs index d81dbb44e..bddfd8201 100644 --- a/Duplicati/Library/Snapshots/SnapshotUtility.cs +++ b/Duplicati/Library/Snapshots/SnapshotUtility.cs @@ -20,7 +20,7 @@ using System.Collections.Generic;
using System.IO;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Snapshots/USNJournal.cs b/Duplicati/Library/Snapshots/USNJournal.cs index ce6a1c0ff..138e20d58 100644 --- a/Duplicati/Library/Snapshots/USNJournal.cs +++ b/Duplicati/Library/Snapshots/USNJournal.cs @@ -26,7 +26,7 @@ using System.Diagnostics; using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Microsoft.Win32.SafeHandles;
namespace Duplicati.Library.Snapshots
diff --git a/Duplicati/Library/Snapshots/UsnJournalService.cs b/Duplicati/Library/Snapshots/UsnJournalService.cs index 132dea3fd..657543cc5 100644 --- a/Duplicati/Library/Snapshots/UsnJournalService.cs +++ b/Duplicati/Library/Snapshots/UsnJournalService.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.IO;
using System.Linq;
using Duplicati.Library.Interface;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility;
namespace Duplicati.Library.Snapshots
diff --git a/Duplicati/Library/Snapshots/WindowsSnapshot.cs b/Duplicati/Library/Snapshots/WindowsSnapshot.cs index 542935128..826076ffa 100644 --- a/Duplicati/Library/Snapshots/WindowsSnapshot.cs +++ b/Duplicati/Library/Snapshots/WindowsSnapshot.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using System.IO;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Snapshots
{
diff --git a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj index a146c9445..b2a35870f 100644 --- a/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj +++ b/Duplicati/Library/Utility/Duplicati.Library.Utility.csproj @@ -111,7 +111,7 @@ </ProjectReference>
<ProjectReference Include="..\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
diff --git a/Duplicati/Library/Utility/FilterGroups.cs b/Duplicati/Library/Utility/FilterGroups.cs index f3cb428e4..1e5582876 100644 --- a/Duplicati/Library/Utility/FilterGroups.cs +++ b/Duplicati/Library/Utility/FilterGroups.cs @@ -17,7 +17,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Localization.Short;
namespace Duplicati.Library.Utility
diff --git a/Duplicati/Library/Utility/TempFile.cs b/Duplicati/Library/Utility/TempFile.cs index 8bb53370d..3f5f7f93c 100644 --- a/Duplicati/Library/Utility/TempFile.cs +++ b/Duplicati/Library/Utility/TempFile.cs @@ -1,4 +1,4 @@ -#region Disclaimer / License
+#region Disclaimer / License
// Copyright (C) 2015, The Duplicati Team
// http://www.duplicati.com, info@duplicati.com
//
@@ -20,7 +20,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Utility
{
@@ -90,7 +90,7 @@ namespace Duplicati.Library.Utility /// <returns>The application temp files.</returns>
private static IEnumerable<string> GetApplicationTempFiles()
{
- return SystemIO.IO_OS(Utility.IsClientWindows).GetFiles(TempFolder.SystemTempPath, APPLICATION_PREFIX + "*");
+ return SystemIO.IO_OS.GetFiles(TempFolder.SystemTempPath, APPLICATION_PREFIX + "*");
}
/// <summary>
diff --git a/Duplicati/Library/Utility/TempFolder.cs b/Duplicati/Library/Utility/TempFolder.cs index 0a412bf73..8fb510090 100644 --- a/Duplicati/Library/Utility/TempFolder.cs +++ b/Duplicati/Library/Utility/TempFolder.cs @@ -18,7 +18,7 @@ //
#endregion
using System;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Utility
{
diff --git a/Duplicati/Library/Utility/Utility.cs b/Duplicati/Library/Utility/Utility.cs index ccb753c72..65ada56b8 100644 --- a/Duplicati/Library/Utility/Utility.cs +++ b/Duplicati/Library/Utility/Utility.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2015, The Duplicati Team
+// Copyright (C) 2015, The Duplicati Team
// http://www.duplicati.com, info@duplicati.com
//
// This library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@ using System.Linq; using System.Threading.Tasks;
using System.Text;
using System.Text.RegularExpressions;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Library.Utility
{
@@ -227,7 +227,7 @@ namespace Duplicati.Library.Utility /// <returns>A list of the full filenames</returns>
public static IEnumerable<string> EnumerateFileSystemEntries(string rootpath, EnumerationFilterDelegate callback)
{
- return EnumerateFileSystemEntries(rootpath, callback, SystemIO.IO_OS(Utility.IsClientWindows).GetDirectories, Directory.GetFiles);
+ return EnumerateFileSystemEntries(rootpath, callback, SystemIO.IO_OS.GetDirectories, Directory.GetFiles);
}
/// <summary>
diff --git a/Duplicati/License/Duplicati.License.csproj b/Duplicati/License/Duplicati.License.csproj index af6ac8d0c..4ae90ee8e 100644 --- a/Duplicati/License/Duplicati.License.csproj +++ b/Duplicati/License/Duplicati.License.csproj @@ -429,7 +429,7 @@ <ItemGroup>
<ProjectReference Include="..\Library\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
<ProjectReference Include="..\Library\Utility\Duplicati.Library.Utility.csproj">
<Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>
diff --git a/Duplicati/License/LicenseReader.cs b/Duplicati/License/LicenseReader.cs index ebc48fe13..2cfffe7ce 100644 --- a/Duplicati/License/LicenseReader.cs +++ b/Duplicati/License/LicenseReader.cs @@ -1,4 +1,4 @@ -#region Disclaimer / License
+#region Disclaimer / License
// Copyright (C) 2015, The Duplicati Team
// http://www.duplicati.com, info@duplicati.com
//
@@ -20,7 +20,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; namespace Duplicati.License
@@ -52,7 +52,7 @@ namespace Duplicati.License {
List<LicenseEntry> res = new List<LicenseEntry>();
- string[] folders = SystemIO.IO_OS(Utility.IsClientWindows).GetDirectories(basefolder);
+ string[] folders = SystemIO.IO_OS.GetDirectories(basefolder);
Array.Sort(folders);
foreach (string folder in folders)
diff --git a/Duplicati/Server/Duplicati.Server.csproj b/Duplicati/Server/Duplicati.Server.csproj index d34e81084..7cc6703f6 100644 --- a/Duplicati/Server/Duplicati.Server.csproj +++ b/Duplicati/Server/Duplicati.Server.csproj @@ -321,7 +321,7 @@ </ProjectReference>
<ProjectReference Include="..\Library\IO\Duplicati.Library.IO.csproj">
<Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>
- <Name>Duplicati.Library.IO</Name>
+ <Name>Duplicati.Library.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/Duplicati/Server/Program.cs b/Duplicati/Server/Program.cs index 4dbd8ee54..1fe3844a4 100644 --- a/Duplicati/Server/Program.cs +++ b/Duplicati/Server/Program.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Server
{
diff --git a/Duplicati/Server/SingleInstance.cs b/Duplicati/Server/SingleInstance.cs index 8fb16f8fd..aa52d2166 100644 --- a/Duplicati/Server/SingleInstance.cs +++ b/Duplicati/Server/SingleInstance.cs @@ -1,4 +1,4 @@ -#region Disclaimer / License
+#region Disclaimer / License
// Copyright (C) 2015, The Duplicati Team
// http://www.duplicati.com, info@duplicati.com
//
@@ -20,7 +20,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; namespace Duplicati.Server
@@ -171,7 +171,7 @@ namespace Duplicati.Server DateTime startup = System.IO.File.GetLastWriteTime(m_lockfilename);
//Clean up any files that were created before the app launched
- foreach(string s in SystemIO.IO_OS(Utility.IsClientWindows).GetFiles(m_controldir))
+ foreach(string s in SystemIO.IO_OS.GetFiles(m_controldir))
if (s != m_lockfilename && System.IO.File.GetCreationTime(s) < startup)
try { System.IO.File.Delete(s); }
catch { }
diff --git a/Duplicati/Server/SpecialFolders.cs b/Duplicati/Server/SpecialFolders.cs index 268c33910..7c3334aa7 100644 --- a/Duplicati/Server/SpecialFolders.cs +++ b/Duplicati/Server/SpecialFolders.cs @@ -18,7 +18,7 @@ using System;
using System.Linq;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Server
{
@@ -148,8 +148,6 @@ namespace Duplicati.Server internal static Dictionary<string, string> GetSourceNames(Serialization.Interface.IBackup backup)
{
- var systemIO = SystemIO.IO_OS(Library.Utility.Utility.IsClientWindows);
-
if (backup.Sources == null || backup.Sources.Length == 0)
return new Dictionary<string, string>();
@@ -165,7 +163,7 @@ namespace Duplicati.Server var nx = x;
if (nx.EndsWith(Util.DirectorySeparatorString, StringComparison.Ordinal))
nx = nx.Substring(0, nx.Length - 1);
- var n = systemIO.PathGetFileName(nx);
+ var n = SystemIO.IO_OS.PathGetFileName(nx);
if (!string.IsNullOrWhiteSpace(n))
return new KeyValuePair<string, string>(x, n);
}
diff --git a/Duplicati/Server/WebServer/IndexHtmlHandler.cs b/Duplicati/Server/WebServer/IndexHtmlHandler.cs index dd9d78a85..508264719 100644 --- a/Duplicati/Server/WebServer/IndexHtmlHandler.cs +++ b/Duplicati/Server/WebServer/IndexHtmlHandler.cs @@ -20,7 +20,7 @@ using System.Linq; using HttpServer;
using HttpServer.HttpModules;
using HttpServer.Exceptions;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Server.WebServer
{
diff --git a/Duplicati/Server/WebServer/RESTMethods/Acknowledgements.cs b/Duplicati/Server/WebServer/RESTMethods/Acknowledgements.cs index 2183fd4e1..6ca1bd459 100644 --- a/Duplicati/Server/WebServer/RESTMethods/Acknowledgements.cs +++ b/Duplicati/Server/WebServer/RESTMethods/Acknowledgements.cs @@ -16,7 +16,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System;
using System.Collections.Generic;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; namespace Duplicati.Server.WebServer.RESTMethods
@@ -31,7 +31,7 @@ namespace Duplicati.Server.WebServer.RESTMethods public void GET(string key, RequestInfo info)
{
- var path = SystemIO.IO_OS(Utility.IsClientWindows).PathCombine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "acknowledgements.txt");
+ var path = SystemIO.IO_OS.PathCombine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "acknowledgements.txt");
info.OutputOK(new GetResponse() {
Status = "OK",
Acknowledgements = System.IO.File.ReadAllText(path)
diff --git a/Duplicati/Server/WebServer/RESTMethods/BackupDefaults.cs b/Duplicati/Server/WebServer/RESTMethods/BackupDefaults.cs index 8074b6e39..fc6725cca 100644 --- a/Duplicati/Server/WebServer/RESTMethods/BackupDefaults.cs +++ b/Duplicati/Server/WebServer/RESTMethods/BackupDefaults.cs @@ -16,7 +16,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; namespace Duplicati.Server.WebServer.RESTMethods
@@ -50,7 +50,7 @@ namespace Duplicati.Server.WebServer.RESTMethods try
{
// Add install defaults/overrides, if present
- var path = SystemIO.IO_OS(Utility.IsClientWindows).PathCombine(Library.AutoUpdater.UpdaterManager.InstalledBaseDir, "newbackup.json");
+ var path = SystemIO.IO_OS.PathCombine(Library.AutoUpdater.UpdaterManager.InstalledBaseDir, "newbackup.json");
if (System.IO.File.Exists(path))
{
Newtonsoft.Json.Linq.JObject n;
diff --git a/Duplicati/Server/WebServer/RESTMethods/Filesystem.cs b/Duplicati/Server/WebServer/RESTMethods/Filesystem.cs index f407b641e..8c346c72f 100644 --- a/Duplicati/Server/WebServer/RESTMethods/Filesystem.cs +++ b/Duplicati/Server/WebServer/RESTMethods/Filesystem.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; using System.Linq;
using System.IO;
using Duplicati.Library.Snapshots;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.Server.WebServer.RESTMethods
{
@@ -207,15 +207,13 @@ namespace Duplicati.Server.WebServer.RESTMethods return false;
};
- var systemIO = SystemIO.IO_OS(Library.Utility.Utility.IsClientWindows);
-
- foreach (var s in systemIO.EnumerateFileSystemEntries(entrypath))
+ foreach (var s in SystemIO.IO_OS.EnumerateFileSystemEntries(entrypath))
{
Serializable.TreeNode tn = null;
try
{
- var attr = systemIO.GetFileAttributes(s);
- var isSymlink = systemIO.IsSymlink(s, attr);
+ var attr = SystemIO.IO_OS.GetFileAttributes(s);
+ var isSymlink = SystemIO.IO_OS.IsSymlink(s, attr);
var isFolder = (attr & FileAttributes.Directory) != 0;
var isFile = !isFolder;
var isHidden = (attr & FileAttributes.Hidden) != 0;
@@ -233,7 +231,7 @@ namespace Duplicati.Server.WebServer.RESTMethods tn = new Serializable.TreeNode()
{
id = rawid,
- text = systemIO.PathGetFileName(s),
+ text = SystemIO.IO_OS.PathGetFileName(s),
hidden = isHidden,
symlink = isSymlink,
iconCls = isFolder ? (accessible ? (isSymlink ? "x-tree-icon-symlink" : "x-tree-icon-parent") : "x-tree-icon-locked") : "x-tree-icon-leaf",
diff --git a/Duplicati/Server/WebServer/Server.cs b/Duplicati/Server/WebServer/Server.cs index 7c23994e0..efa46c538 100644 --- a/Duplicati/Server/WebServer/Server.cs +++ b/Duplicati/Server/WebServer/Server.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq;
using HttpServer.HttpModules;
using System.Security.Cryptography.X509Certificates;
-using Duplicati.Library.IO;
+using Duplicati.Library.Common.IO;
namespace Duplicati.Server.WebServer
{
diff --git a/Duplicati/UnitTest/Duplicati.UnitTest.csproj b/Duplicati/UnitTest/Duplicati.UnitTest.csproj index 982dfed52..e84486588 100644 --- a/Duplicati/UnitTest/Duplicati.UnitTest.csproj +++ b/Duplicati/UnitTest/Duplicati.UnitTest.csproj @@ -179,7 +179,7 @@ </ProjectReference> <ProjectReference Include="..\Library\IO\Duplicati.Library.IO.csproj"> <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project> - <Name>Duplicati.Library.IO</Name> + <Name>Duplicati.Library.Common</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/Duplicati/UnitTest/FilterTest.cs b/Duplicati/UnitTest/FilterTest.cs index 945777094..e8219f662 100644 --- a/Duplicati/UnitTest/FilterTest.cs +++ b/Duplicati/UnitTest/FilterTest.cs @@ -17,7 +17,7 @@ using System; using System.IO; using System.Linq; -using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using NUnit.Framework; namespace Duplicati.UnitTest diff --git a/Duplicati/UnitTest/IOTests.cs b/Duplicati/UnitTest/IOTests.cs index 1fa1c4408..a8a6ee02c 100644 --- a/Duplicati/UnitTest/IOTests.cs +++ b/Duplicati/UnitTest/IOTests.cs @@ -18,7 +18,7 @@ using System.Text;
using NUnit.Framework;
-using Duplicati.Library.IO;
+using Duplicati.Library.Common.IO;
using Duplicati.Library.Utility;
namespace Duplicati.UnitTest @@ -37,7 +37,7 @@ namespace Duplicati.UnitTest public void TestGetPathRootWithLongPath()
{
var pathRoot = Utility.IsClientWindows ? "C:\\" : "/";
- var root = SystemIO.IO_OS(Utility.IsClientWindows).GetPathRoot(LongPath(pathRoot));
+ var root = SystemIO.IO_OS.GetPathRoot(LongPath(pathRoot));
Assert.AreEqual(pathRoot, root);
}
@@ -71,13 +71,13 @@ namespace Duplicati.UnitTest var pathRoot = Utility.IsClientWindows ? "C:\\" : "/";
var longPath = LongPath(pathRoot);
- if (SystemIO.IO_OS(Utility.IsClientWindows).DirectoryExists(longPath))
+ if (SystemIO.IO_OS.DirectoryExists(longPath))
{
return;
}
//In particular don't throw PathTooLongException
- Assert.Throws<System.IO.DirectoryNotFoundException>(() => SystemIO.IO_OS(Utility.IsClientWindows).GetFiles(longPath));
+ Assert.Throws<System.IO.DirectoryNotFoundException>(() => SystemIO.IO_OS.GetFiles(longPath));
}
[Test]
@@ -86,13 +86,13 @@ namespace Duplicati.UnitTest var pathRoot = Utility.IsClientWindows ? "C:\\" : "/";
var longPath = LongPath(pathRoot);
- if (SystemIO.IO_OS(Utility.IsClientWindows).DirectoryExists(longPath)) + if (SystemIO.IO_OS.DirectoryExists(longPath)) {
return;
}
//In particular don't throw PathTooLongException
- Assert.Throws<System.IO.DirectoryNotFoundException>(() => SystemIO.IO_OS(Utility.IsClientWindows).GetDirectories(longPath));
+ Assert.Throws<System.IO.DirectoryNotFoundException>(() => SystemIO.IO_OS.GetDirectories(longPath));
}
} } diff --git a/Duplicati/UnitTest/PurgeTesting.cs b/Duplicati/UnitTest/PurgeTesting.cs index dd0ade94d..a5e253e36 100644 --- a/Duplicati/UnitTest/PurgeTesting.cs +++ b/Duplicati/UnitTest/PurgeTesting.cs @@ -18,7 +18,7 @@ using System; using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; using Duplicati.Library.Utility; using NUnit.Framework;
@@ -184,7 +184,7 @@ namespace Duplicati.UnitTest Assert.AreEqual(res.AddedFiles, round1.Length);
}
- var dblock_file = SystemIO.IO_OS(Utility.IsClientWindows)
+ var dblock_file = SystemIO.IO_OS
.GetFiles(TARGETFOLDER, "*.dblock.zip.aes")
.Select(x => new FileInfo(x))
.OrderBy(x => x.LastWriteTimeUtc)
diff --git a/Duplicati/UnitTest/SVNCheckoutsTest.cs b/Duplicati/UnitTest/SVNCheckoutsTest.cs index bf87ce43e..2cfe21745 100644 --- a/Duplicati/UnitTest/SVNCheckoutsTest.cs +++ b/Duplicati/UnitTest/SVNCheckoutsTest.cs @@ -27,7 +27,7 @@ using System.Text; using Duplicati.Library.Logging;
using Duplicati.Library.Utility;
using System.Linq;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.UnitTest
{
diff --git a/Duplicati/UnitTest/SizeOmittingBackend.cs b/Duplicati/UnitTest/SizeOmittingBackend.cs index 10480a530..ed8487cf3 100644 --- a/Duplicati/UnitTest/SizeOmittingBackend.cs +++ b/Duplicati/UnitTest/SizeOmittingBackend.cs @@ -19,7 +19,7 @@ using System.Linq; using Duplicati.Library.Interface;
using System.Collections.Generic;
using System.IO;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.UnitTest
{
diff --git a/Duplicati/UnitTest/TestUtils.cs b/Duplicati/UnitTest/TestUtils.cs index 93fd67d03..80e301b9b 100644 --- a/Duplicati/UnitTest/TestUtils.cs +++ b/Duplicati/UnitTest/TestUtils.cs @@ -21,7 +21,7 @@ using Duplicati.Library.Utility; using System.Linq;
using Duplicati.Library.Logging;
using System.Reflection;
-using Duplicati.Library.IO; +using Duplicati.Library.Common.IO; namespace Duplicati.UnitTest
{
diff --git a/Duplicati/UnitTest/UtilityTests.cs b/Duplicati/UnitTest/UtilityTests.cs index 65b3db4e2..49e9b358a 100644 --- a/Duplicati/UnitTest/UtilityTests.cs +++ b/Duplicati/UnitTest/UtilityTests.cs @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using Duplicati.Library.Utility;
-using Duplicati.Library.IO;
+using Duplicati.Library.Common.IO;
using NUnit.Framework;
using System;
using System.Collections.Generic;
|