fix: linux backup

trueai-org · Jun 18, 2024 · d02345e · d02345e
1 parent 6ef998a
commit d02345e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/MDriveSync.Core/Services/AliyunJob.cs b/src/MDriveSync.Core/Services/AliyunJob.cs
@@ -1641,9 +1641,8 @@ private void ClearDownloadCache(string saveRootPath)
         private string GetDirectoryKey(string localRootPath, DirectoryInfo directoryInfo)
         {
             var localRootInfo = new DirectoryInfo(localRootPath);
-            var rootPathName = localRootInfo.Name;
-            var subPath = directoryInfo.FullName.TrimPrefix(localRootPath);
-            return $"{rootPathName}/{subPath}".TrimPath();
+            var subPath = directoryInfo.FullName.TrimPrefix(localRootInfo.FullName);
+            return $"{localRootInfo.Name}/{subPath}".TrimPath();
         }
 
         /// <summary>
@@ -1655,9 +1654,8 @@ private string GetDirectoryKey(string localRootPath, DirectoryInfo directoryInfo
         private string GetFileKey(string localRootPath, string fileFullPath)
         {
             var localRootInfo = new DirectoryInfo(localRootPath);
-            var rootPathName = localRootInfo.Name;
             var subPath = fileFullPath.TrimPrefix(localRootInfo.FullName);
-            return $"{rootPathName}/{subPath}".TrimPath();
+            return $"{localRootInfo.Name}/{subPath}".TrimPath();
         }
 
         /// <summary>
@@ -1669,9 +1667,11 @@ private string GetFileKey(string localRootPath, string fileFullPath)
         private string GetFileKeyPath(string localRootPath, FileInfo fileInfo)
         {
             var localRootInfo = new DirectoryInfo(localRootPath);
-            var rootPathName = localRootInfo.Name;
-            var subPath = Path.GetDirectoryName(fileInfo.FullName).TrimPrefix(localRootInfo.FullName);
-            return $"{rootPathName}/{subPath}".TrimPath();
+
+            // fix: GetDirectoryName none / end
+            var subPath = Path.GetDirectoryName(fileInfo.FullName).TrimPath()
+            .TrimPrefix(localRootInfo.FullName.TrimPath());
+            return $"{localRootInfo.Name}/{subPath}".TrimPath();
         }
 
         /// <summary>

diff --git a/src/MDriveSync.Core/Services/LocalStorageJob.cs b/src/MDriveSync.Core/Services/LocalStorageJob.cs
@@ -1307,7 +1307,7 @@ void LoadFiles(string dir)
                     {
                         IsFile = false,
                         Hash = string.Empty,
-                        Key = dirInfo.FullName.TrimPath().TrimPrefix(rootInfo.FullName).TrimPath(),
+                        Key = dirInfo.FullName.TrimPrefix(rootInfo.FullName).TrimPath(),
                         Length = 0,
                         FullName = dirInfo.FullName,
                         Name = dirInfo.Name,
@@ -1333,7 +1333,7 @@ void LoadFiles(string dir)
                         {
                             IsFile = true,
                             Hash = string.Empty,
-                            Key = fileInfo.FullName.TrimPath().TrimPrefix(rootInfo.FullName).TrimPath(),
+                            Key = fileInfo.FullName.TrimPrefix(rootInfo.FullName).TrimPath(),
                             Length = fileInfo.Length,
                             FullName = fileInfo.FullName,
                             CreationTime = fileInfo.CreationTime,
@@ -2360,7 +2360,7 @@ private void SyncFile(LocalStorageFileInfo localFileInfo)
                             IsFile = true,
                             Hash = string.Empty,
                             Length = targetFileInfo.Length,
-                            Key = targetFileInfo.FullName.TrimPath().TrimPrefix(rootInfo.FullName).TrimPath(),
+                            Key = targetFileInfo.FullName.TrimPrefix(rootInfo.FullName).TrimPath(),
                             Name = targetFileInfo.Name,
 
                             IsExists = targetFileInfo.Exists,