Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/duplicati/duplicati.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/Duplicati/Server
diff options
context:
space:
mode:
Diffstat (limited to 'Duplicati/Server')
-rw-r--r--Duplicati/Server/Duplicati.Server.csproj2
-rw-r--r--Duplicati/Server/Program.cs2
-rw-r--r--Duplicati/Server/SingleInstance.cs6
-rw-r--r--Duplicati/Server/SpecialFolders.cs6
-rw-r--r--Duplicati/Server/WebServer/IndexHtmlHandler.cs2
-rw-r--r--Duplicati/Server/WebServer/RESTMethods/Acknowledgements.cs4
-rw-r--r--Duplicati/Server/WebServer/RESTMethods/BackupDefaults.cs4
-rw-r--r--Duplicati/Server/WebServer/RESTMethods/Filesystem.cs12
-rw-r--r--Duplicati/Server/WebServer/Server.cs2
9 files changed, 18 insertions, 22 deletions
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
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 01:23:27 +0300