下载逻辑修改
parent
c3a052fc4d
commit
8e604f7359
|
|
@ -438,16 +438,7 @@ namespace Hopetry.Services
|
|||
};
|
||||
var token = downTask.StopDownTs.Token;
|
||||
long totalBytes = 0;
|
||||
var index = objectKey.LastIndexOf("/", StringComparison.Ordinal);
|
||||
if (index > 0)
|
||||
{
|
||||
var dir = Path.Combine(filePath, objectKey.Substring(0, index));
|
||||
if (!Directory.Exists(dir))
|
||||
{
|
||||
Directory.CreateDirectory(dir);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var args = new StatObjectArgs()
|
||||
.WithBucket(string.IsNullOrEmpty(bucketName) ? _bucketName : bucketName)
|
||||
.WithObject(objectKey);
|
||||
|
|
@ -455,7 +446,18 @@ namespace Hopetry.Services
|
|||
totalBytes = stat.Size;
|
||||
//var localPath = Path.Combine(filePath, objectKey.Replace('/', Path.DirectorySeparatorChar));
|
||||
var localPath = Path.Combine(filePath,
|
||||
objectKey);
|
||||
objectKey[(objectKey.LastIndexOf('/') + 1)..]);
|
||||
|
||||
var index = localPath.LastIndexOf("/", StringComparison.Ordinal);
|
||||
if (index > 0)
|
||||
{
|
||||
var dir = localPath.Substring(0, index);
|
||||
if (!Directory.Exists(dir))
|
||||
{
|
||||
Directory.CreateDirectory(dir);
|
||||
}
|
||||
}
|
||||
|
||||
var getObjectArgs = new GetObjectArgs()
|
||||
.WithBucket(string.IsNullOrEmpty(bucketName) ? _bucketName : bucketName)
|
||||
.WithObject(objectKey)
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@ namespace HeBianGu.App.Disk
|
|||
var temp = (MinIODirectoryInfo)dir.Model;
|
||||
//Console.WriteLine($"bucket: {temp.BucketName} objectKey {temp.FullName}");
|
||||
var objectKey = temp.FullName.Replace(temp.BucketName + "/", "");
|
||||
ViewModelLocator.DownViewModel.AddDirTask(temp.BucketName, objectKey, downDir);
|
||||
ViewModelLocator.DownViewModel.AddDirTask(temp.BucketName, objectKey,temp.Name, downDir);
|
||||
}
|
||||
|
||||
MessageProxy.Snacker.Show("已加入下载队列");
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ public class DownViewModel : MvcViewModelBase
|
|||
{
|
||||
}
|
||||
|
||||
public async void AddDirTask(string bucketName, string objectKey, string downDir)
|
||||
public async void AddDirTask(string bucketName, string objectKey, string name,string downDir)
|
||||
{
|
||||
// 情景1 只选了一个文件夹
|
||||
// 情景2 只选了一个存储桶
|
||||
|
|
|
|||
Loading…
Reference in New Issue