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:
@@ -32,6 +32,9 @@ namespace Ink_Canvas
|
||||
[JsonProperty("dlass")]
|
||||
public DlassSettings Dlass { get; set; } = new DlassSettings();
|
||||
|
||||
[JsonProperty("upload")]
|
||||
public UploadSettings Upload { get; set; } = new UploadSettings();
|
||||
|
||||
[JsonProperty("security")]
|
||||
public Security Security { get; set; } = new Security();
|
||||
}
|
||||
@@ -102,13 +105,10 @@ namespace Ink_Canvas
|
||||
public bool LineEndpointSnapping { get; set; } = true; // 是否启用直线端点吸附
|
||||
[JsonProperty("lineEndpointSnappingThreshold")]
|
||||
public int LineEndpointSnappingThreshold { get; set; } = 15; // 直线端点吸附的距离阈值(像素)
|
||||
|
||||
[JsonProperty("usingWhiteboard")]
|
||||
public bool UsingWhiteboard { get; set; }
|
||||
|
||||
[JsonProperty("customBackgroundColor")]
|
||||
public string CustomBackgroundColor { get; set; } = "#162924";
|
||||
|
||||
[JsonProperty("hyperbolaAsymptoteOption")]
|
||||
public OptionalOperation HyperbolaAsymptoteOption { get; set; } = OptionalOperation.Ask;
|
||||
[JsonProperty("isCompressPicturesUploaded")]
|
||||
@@ -121,8 +121,6 @@ namespace Ink_Canvas
|
||||
public bool ClearCanvasAlsoClearImages { get; set; } = true;
|
||||
[JsonProperty("showCircleCenter")]
|
||||
public bool ShowCircleCenter { get; set; }
|
||||
|
||||
// 墨迹渐隐功能设置
|
||||
[JsonProperty("enableInkFade")]
|
||||
public bool EnableInkFade { get; set; } = false;
|
||||
[JsonProperty("inkFadeTime")]
|
||||
@@ -448,6 +446,7 @@ namespace Ink_Canvas
|
||||
|
||||
[JsonProperty("isAutoFoldInEasiNote3")]
|
||||
public bool IsAutoFoldInEasiNote3 { get; set; }
|
||||
|
||||
[JsonProperty("isAutoFoldInEasiNote3C")]
|
||||
public bool IsAutoFoldInEasiNote3C { get; set; }
|
||||
|
||||
@@ -859,6 +858,37 @@ namespace Ink_Canvas
|
||||
get { return _autoUploadDelayMinutes; }
|
||||
set { _autoUploadDelayMinutes = Math.Max(0, value); }
|
||||
}
|
||||
|
||||
[JsonProperty("webDavUrl")]
|
||||
public string WebDavUrl { get; set; } = string.Empty;
|
||||
|
||||
[JsonProperty("webDavUsername")]
|
||||
public string WebDavUsername { get; set; } = string.Empty;
|
||||
|
||||
[JsonProperty("webDavPassword")]
|
||||
public string WebDavPassword { get; set; } = string.Empty;
|
||||
|
||||
[JsonProperty("webDavRootDirectory")]
|
||||
public string WebDavRootDirectory { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
public class UploadSettings
|
||||
{
|
||||
[JsonProperty("uploadDelayMinutes")]
|
||||
public int UploadDelayMinutes
|
||||
{
|
||||
get { return _uploadDelayMinutes; }
|
||||
set { _uploadDelayMinutes = Math.Max(0, Math.Min(60, value)); }
|
||||
}
|
||||
private int _uploadDelayMinutes = 0;
|
||||
|
||||
[JsonProperty("enabledProviders")]
|
||||
public List<string> EnabledProviders
|
||||
{
|
||||
get { return _enabledProviders; }
|
||||
set { _enabledProviders = value ?? new List<string>(); }
|
||||
}
|
||||
private List<string> _enabledProviders = new List<string>();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user