feat(Upload/WebDav):迁移Dlass并添加WebDav管理 (#381)
* feat(Upload/Common): 重构上传功能以添加通用设置管理 - 新增UploadSettings类用于管理上传通用设置 - 重构上传逻辑,将延迟上传功能移至UploadHelper - 在Dlass设置窗口添加通用设置标签页 - 支持多上传提供者管理及取消操作 - 增强文件上传前的验证和错误处理 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * feat(upload): 添加WebDav文件上传支持 - 新增WebDavUploader工具类实现文件上传功能 - 添加WebDavUploadProvider作为上传提供者 - 在设置界面增加WebDav配置选项 - 添加WebDav.Client NuGet包依赖 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * feat(WebDAV): 实现WebDAV上传队列管理 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * feat(Upload): 重命名Dlass设置项为云存储以支持WebDav保存 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * feat(Dlass):迁移Dlass注册位置 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * refactor(Upload): 优化上传逻辑和界面交互 - 修改Dlass标签页检测逻辑,使用Tag属性替代Header - 限制WebDav上传队列的批量处理大小 - 移除多处上传延迟逻辑,统一在通用设置中配置 - 更新Dlass设置界面提示文本 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * chore:修改窗口命名 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * refactor(upload): 重构上传队列为统一管理架构 重构上传队列系统,引入BaseUploadQueue基类实现通用队列管理逻辑,创建UploadQueueHelper统一管理所有上传队列。将DlassUploadQueue和WebDavUploadQueue重构为继承自BaseUploadQueue的具体实现,简化代码并提高可维护性。修改MainWindow初始化代码以使用新的统一初始化方法。 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * refactor(Upload): 重构上传队列系统,改进错误处理和资源管理 - 将上传队列改为可释放资源,实现IDisposable接口 - 移除硬编码的文件验证逻辑,改为可重写方法 - 改进API客户端,支持取消操作和更好的资源管理 - 优化队列初始化流程,增加错误处理 - 统一上传提供者的队列注册方式 - 改进日志记录和错误信息 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * Update Settings.cs * refactor(UpLoad/Queue): 移除冗余的上传成功/失败日志记录 优化WebDav上传逻辑,增加目录创建重试机制 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> * refactor(MW_Settings): 重构全选复选框状态更新逻辑 将直接设置全选复选框状态的逻辑拆分为两步,先计算所有分类复选框状态,再更新全选复选框,提高代码可读性 Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> --------- Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com> Co-authored-by: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,171 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using WebDav;
|
||||
|
||||
namespace Ink_Canvas.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// WebDav上传工具类
|
||||
/// </summary>
|
||||
public static class WebDavUploader
|
||||
{
|
||||
/// <summary>
|
||||
/// 上传文件到WebDav服务器
|
||||
/// </summary>
|
||||
/// <param name="filePath">文件路径</param>
|
||||
/// <param name="cancellationToken">取消令牌</param>
|
||||
/// <returns>是否上传成功</returns>
|
||||
public static async Task<bool> UploadFileAsync(string filePath, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
// 检查文件是否存在
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// 获取WebDav设置
|
||||
var webDavUrl = MainWindow.Settings?.Dlass?.WebDavUrl;
|
||||
var username = MainWindow.Settings?.Dlass?.WebDavUsername;
|
||||
var password = MainWindow.Settings?.Dlass?.WebDavPassword;
|
||||
var rootDirectory = MainWindow.Settings?.Dlass?.WebDavRootDirectory;
|
||||
|
||||
// 验证设置
|
||||
if (string.IsNullOrEmpty(webDavUrl))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// 构建完整的目标路径
|
||||
var fileName = Path.GetFileName(filePath);
|
||||
var targetPath = Path.Combine(rootDirectory ?? string.Empty, fileName).Replace("\\", "/");
|
||||
if (targetPath.StartsWith("/"))
|
||||
{
|
||||
targetPath = targetPath.Substring(1);
|
||||
}
|
||||
|
||||
// 创建WebDav客户端
|
||||
var clientParams = new WebDavClientParams
|
||||
{
|
||||
BaseAddress = new Uri(webDavUrl),
|
||||
Credentials = new NetworkCredential(username ?? string.Empty, password ?? string.Empty)
|
||||
};
|
||||
|
||||
using (var client = new WebDavClient(clientParams))
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
// 先直接尝试上传文件
|
||||
using (var fileStream = File.OpenRead(filePath))
|
||||
{
|
||||
// 检查取消令牌
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
var result = await client.PutFile(targetPath, fileStream);
|
||||
if (result.IsSuccessful)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 上传失败,尝试创建目录
|
||||
var directoryPath = Path.GetDirectoryName(targetPath);
|
||||
if (!string.IsNullOrEmpty(directoryPath))
|
||||
{
|
||||
await EnsureDirectoryExistsAsync(client, directoryPath, cancellationToken);
|
||||
|
||||
// 再次尝试上传文件
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
using (var retryStream = File.OpenRead(filePath))
|
||||
{
|
||||
var retryResult = await client.PutFile(targetPath, retryStream);
|
||||
return retryResult.IsSuccessful;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 没有目录路径,直接返回失败
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 确保WebDav目录存在
|
||||
/// </summary>
|
||||
/// <param name="client">WebDav客户端</param>
|
||||
/// <param name="directoryPath">目录路径</param>
|
||||
/// <param name="cancellationToken">取消令牌</param>
|
||||
private static async Task EnsureDirectoryExistsAsync(IWebDavClient client, string directoryPath, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
// 分割路径并逐级创建目录
|
||||
var pathParts = directoryPath.Split('/');
|
||||
var currentPath = string.Empty;
|
||||
|
||||
foreach (var part in pathParts)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
if (string.IsNullOrEmpty(part))
|
||||
continue;
|
||||
|
||||
currentPath = Path.Combine(currentPath, part).Replace("\\", "/");
|
||||
|
||||
// 检查取消令牌
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
// 尝试创建目录
|
||||
await client.Mkcol(currentPath);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
// 静默处理目录创建错误
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检查WebDAV是否已启用
|
||||
/// </summary>
|
||||
/// <returns>是否启用</returns>
|
||||
public static bool IsWebDavEnabled()
|
||||
{
|
||||
// 检查WebDav设置是否有效
|
||||
var webDavUrl = MainWindow.Settings?.Dlass?.WebDavUrl;
|
||||
if (string.IsNullOrEmpty(webDavUrl))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// 尝试解析URL
|
||||
try
|
||||
{
|
||||
new Uri(webDavUrl);
|
||||
return true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user