Browse Source

Fix file path

Neeraj Gupta 1 năm trước cách đây
mục cha
commit
29925a910c
2 tập tin đã thay đổi với 3 bổ sung2 xóa
  1. 2 1
      pkg/remote_to_disk_album.go
  2. 1 1
      pkg/remote_to_disk_file.go

+ 2 - 1
pkg/remote_to_disk_album.go

@@ -38,6 +38,7 @@ func (c *ClICtrl) createLocalFolderForRemoteAlbums(ctx context.Context, account
 			continue
 		}
 		metaByID := albumIDToMetaMap[album.ID]
+
 		if metaByID != nil {
 			if strings.EqualFold(metaByID.AlbumName, album.AlbumName) {
 				//log.Printf("Skipping album %s as it already exists", album.AlbumName)
@@ -45,7 +46,7 @@ func (c *ClICtrl) createLocalFolderForRemoteAlbums(ctx context.Context, account
 			}
 		}
 
-		albumFolderName := album.AlbumName
+		albumFolderName := filepath.Clean(album.AlbumName)
 		albumID := album.ID
 
 		if _, ok := folderToMetaMap[albumFolderName]; ok {

+ 1 - 1
pkg/remote_to_disk_file.go

@@ -116,7 +116,7 @@ func (c *ClICtrl) downloadEntry(ctx context.Context,
 		fileDiskMetadata := mapper.MapRemoteFileToDiskMetadata(file)
 		// Get the extension
 		extension := filepath.Ext(fileDiskMetadata.Title)
-		baseFileName := strings.TrimSuffix(filepath.Base(fileDiskMetadata.Title), extension)
+		baseFileName := strings.TrimSuffix(filepath.Clean(filepath.Base(fileDiskMetadata.Title)), extension)
 		potentialDiskFileName := fmt.Sprintf("%s%s.json", baseFileName, extension)
 		count := 1
 		for diskInfo.IsMetaFileNamePresent(potentialDiskFileName) {