fix: linux path

trueai-org · Jun 18, 2024 · 3f5246e · 3f5246e
1 parent e7ddd53
commit 3f5246e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git a/src/MDriveSync.Core/Services/AliyunJob.cs b/src/MDriveSync.Core/Services/AliyunJob.cs
@@ -1859,11 +1859,14 @@ private void AliyunDriveInitialize()
 
                     _log.LogInformation($"Linux: {isLinux}");
 
-                    // 格式化路径
-                    _localRestorePath = _jobConfig.Restore.TrimPath();
-                    if (isLinux && !string.IsNullOrWhiteSpace(_localRestorePath))
+                    // 处理 RestoreRootPath
+                    if (isLinux && (_jobConfig.Restore?.StartsWith("/") ?? false))
                     {
-                        _localRestorePath = $"/{_localRestorePath}";
+                        _localRestorePath = "/" + _jobConfig.Restore.TrimPath();
+                    }
+                    else
+                    {
+                        _localRestorePath = _jobConfig.Restore.TrimPath();
                     }
 
                     _driveSavePath = _jobConfig.Target.TrimPrefix();
@@ -1873,22 +1876,18 @@ private void AliyunDriveInitialize()
                     _jobConfig.Sources.Clear();
                     foreach (var item in sources)
                     {
-                        var path = item.TrimPath();
-                        if (isLinux && !string.IsNullOrWhiteSpace(path))
+                        if (isLinux && item.StartsWith('/'))
                         {
-                            // Linux
-                            path = $"/{path}";
-                            var dir = new DirectoryInfo(path);
+                            var dir = new DirectoryInfo(item);
                             if (!dir.Exists)
                             {
                                 dir.Create();
                             }
-                            _jobConfig.Sources.Add($"/{dir.FullName.TrimPath()}");
+                            _jobConfig.Sources.Add($"{dir.FullName.TrimPath()}");
                         }
                         else
                         {
-                            // Windows
-                            var dir = new DirectoryInfo(path);
+                            var dir = new DirectoryInfo(item);
                             if (!dir.Exists)
                             {
                                 dir.Create();

diff --git a/src/MDriveSync.Core/Services/LocalStorageJob.cs b/src/MDriveSync.Core/Services/LocalStorageJob.cs
@@ -1457,7 +1457,7 @@ private string GetDirectoryKey(string rootDirFullPath, DirectoryInfo directoryIn
             var baseDirName = baseDirInfo.Name;
 
             var subPath = directoryInfo.FullName.TrimPrefix(rootDirFullPath);
-            return $"{baseDirName}/{subPath}".TrimPath();
+            return $"{baseDirName}/{subPath.TrimPath()}";
         }
 
         /// <summary>
@@ -1472,7 +1472,7 @@ private string GetFileKey(string rootPath, string fileFullPath)
             var rootPathName = rootInfo.Name;
 
             var subPath = fileFullPath.TrimPrefix(rootInfo.FullName);
-            return $"{rootPathName}/{subPath}".TrimPath();
+            return $"{rootPathName}/{subPath.TrimPath()}";
         }
 
         /// <summary>
@@ -1487,7 +1487,7 @@ private string GetFileKeyPath(string rootPath, FileInfo fileInfo)
             var rootName = rootInfo.Name;
 
             var subPath = Path.GetDirectoryName(fileInfo.FullName).TrimPrefix(rootInfo.FullName);
-            return $"{rootName}/{subPath}".TrimPath();
+            return $"{rootName}/{subPath.TrimPath()}";
         }
 
         /// <summary>
@@ -1725,22 +1725,18 @@ private void Initialize()
                     _jobConfig.Sources.Clear();
                     foreach (var item in sources)
                     {
-                        var path = item.TrimPath();
-                        if (isLinux && !string.IsNullOrWhiteSpace(path))
+                        if (isLinux && item.StartsWith('/'))
                         {
-                            // Linux
-                            path = $"/{path}";
-                            var dir = new DirectoryInfo(path);
+                            var dir = new DirectoryInfo(item);
                             if (!dir.Exists)
                             {
                                 dir.Create();
                             }
-                            _jobConfig.Sources.Add($"/{dir.FullName.TrimPath()}");
+                            _jobConfig.Sources.Add($"{dir.FullName.TrimPath()}");
                         }
                         else
                         {
-                            // Windows
-                            var dir = new DirectoryInfo(path);
+                            var dir = new DirectoryInfo(item);
                             if (!dir.Exists)
                             {
                                 dir.Create();
@@ -2317,7 +2313,7 @@ private void SyncFile(LocalStorageFileInfo localFileInfo)
                         //outputFileStream1.Close();
 
                         // 计算文件存储路径
-                        var targetFileFullName = $"{saveParentPath}/{name}".TrimPath();
+                        var targetFileFullName = $"{saveParentPath}/{name}";
 
                         // 更新上传文件信息
                         // 将文件重命名为
@@ -2419,7 +2415,7 @@ private void SyncFileDoWork(LocalStorageFileInfo localFileInfo)
             Directory.CreateDirectory(saveParentPath);
 
             // 计算文件存储路径
-            var targetFileFullName = $"{saveParentPath}/{localFileInfo.Name}".TrimPath();
+            var targetFileFullName = $"{saveParentPath}/{localFileInfo.Name.TrimPath()}";
 
             // 计算 hash
             if (string.IsNullOrWhiteSpace(localFileInfo.Hash))