Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-29 10:25:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

+

Browse Source
This commit is contained in:
辉鸭蛋
2025-01-14 00:28:42 +08:00
parent d57564c74c
commit 8aded2bd48
5 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BetterGenshinImpact/BetterGenshinImpact.csproj
View File

@@ -10,7 +10,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationIcon>Assets\Images\logo.ico</ApplicationIcon>
<AssemblyName>BetterGI</AssemblyName>
<AssemblyVersion>10.39.1</AssemblyVersion>
<AssemblyVersion>10.39.2</AssemblyVersion>
<Platforms>x64</Platforms>
<DebugType>embedded</DebugType>
</PropertyGroup>
@@ -43,6 +43,7 @@
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="LiteDB" Version="5.0.21" />
<PackageReference Include="MediaInfo.Wrapper.Core" Version="21.9.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />

11
BetterGenshinImpact/Core/Video/ObsRecorder.cs
View File

@@ -9,6 +9,7 @@ using BetterGenshinImpact.Core.Config;
using BetterGenshinImpact.Core.Recorder;
using BetterGenshinImpact.Core.Recorder.Model;
using BetterGenshinImpact.GameTask.Common;
using MediaInfo;
using Microsoft.Extensions.Logging;
using OBSWebsocketDotNet;
using OBSWebsocketDotNet.Communication;
@@ -206,14 +207,18 @@ public class ObsRecorder : IVideoRecorder
{
var jsonPath = Path.Combine(folderPath, $"systemInfo.json");
// 计算视频文件大小
var fileInfo = new FileInfo(videoPath);
var fileSize = fileInfo.Length;
MediaInfo.MediaInfo mediaInfo = new MediaInfo.MediaInfo();
mediaInfo.Open(videoPath);
string durationString = mediaInfo.Get(StreamKind.General, 0, "Duration");
Console.WriteLine($"视频时长: {durationString}");
// 读取json
var json = File.ReadAllText(jsonPath);
var info = JsonSerializer.Deserialize<KeyMouseScriptInfo>(json, KeyMouseRecorderJsonLine.JsonOptions);
if (info != null)
{
info.VideoSize = fileSize.ToString();
info.VideoSize = durationString;
// 写入json
File.WriteAllText(jsonPath, JsonSerializer.Serialize(info, KeyMouseRecorderJsonLine.JsonOptions));
}

73
BetterGenshinImpact/Model/KeyMouseScriptItem.cs
View File

@@ -66,16 +66,27 @@ public partial class KeyMouseScriptItem : ObservableObject
[ObservableProperty]
private bool _isPartiallyUploaded;
[ObservableProperty]
private string _selectedTask = "";
public List<string> TaskOptions { get; } =
[
"", "任务一", "任务二", "任务三", "任务四", "任务五",
"任务六", "任务七", "任务八", "任务九"
];
private string FormatSpeed(double bytesPerSecond)
{
if (bytesPerSecond >= 1024 * 1024) // MB/s
{
return $"{bytesPerSecond / (1024 * 1024):F1} MB/s";
}
if (bytesPerSecond >= 1024) // KB/s
{
return $"{bytesPerSecond / 1024:F1} KB/s";
}
return $"{bytesPerSecond:F0} B/s";
}
@@ -84,14 +95,19 @@ public partial class KeyMouseScriptItem : ObservableObject
var dirName = new DirectoryInfo(Path).Name;
var userName = TaskContext.Instance().Config.CommonConfig.UserName;
var uid = TaskContext.Instance().Config.CommonConfig.Uid;
if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(uid))
{
throw new InvalidOperationException("用户名或UID未设置");
throw new InvalidOperationException("请先设置用户名和UID");
}
if (string.IsNullOrEmpty(SelectedTask))
{
throw new InvalidOperationException("请选择本条记录的任务");
}
var relativePath = localFilePath.Replace(_scriptPath, "").TrimStart('\\');
var remotePath = $"{dirName[..10]}_{userName}_{uid}/{relativePath}";
var remotePath = $"{dirName[..10]}_{userName}_{uid}_{SelectedTask}/{relativePath}";
return remotePath.Replace(@"\", "/");
}
@@ -101,17 +117,17 @@ public partial class KeyMouseScriptItem : ObservableObject
{
var collection = DbLiteService.Instance.UserDb.GetCollection<FileUploadItem>("FileUploads");
var files = Directory.GetFiles(Path, "*.*", SearchOption.AllDirectories);
var hasUploadedFiles = false;
var allFilesUploaded = true;
foreach (var file in files)
{
try
{
var remotePath = GetRemotePath(file);
var fileUploadItem = collection.FindById(remotePath);
if (fileUploadItem?.Status == UploadStatus.UploadSuccess.ToString())
{
hasUploadedFiles = true;
@@ -128,7 +144,7 @@ public partial class KeyMouseScriptItem : ObservableObject
return;
}
}
IsUploadSuccess = allFilesUploaded;
IsPartiallyUploaded = !allFilesUploaded && hasUploadedFiles;
}
@@ -174,23 +190,23 @@ public partial class KeyMouseScriptItem : ObservableObject
IsUploading = true;
IsUploadSuccess = false;
UploadProgress = 0;
var dirName = new DirectoryInfo(Path).Name;
_logger.LogDebug($"{dirName} 开始上传...");
await Task.Run(() =>
{
try
{
var tosClient = new TosClientHelper();
var files = Directory.GetFiles(Path, "*.*", SearchOption.AllDirectories);
// 计算所有文件的总大小
long totalSize = 0;
long uploadedSize = 0;
_lastUploadedSize = 0;
_lastProgressUpdateTime = DateTime.Now;
foreach (var file in files)
{
_uploadCts.Token.ThrowIfCancellationRequested();
@@ -201,19 +217,19 @@ public partial class KeyMouseScriptItem : ObservableObject
{
_uploadCts.Token.ThrowIfCancellationRequested();
var remotePath = GetRemotePath(file);
var needUploadFileName = System.IO.Path.GetFileName(file);
var fileSize = new FileInfo(file).Length;
if (needUploadFileName == "video.mkv" || needUploadFileName == "video.mp4")
{
tosClient.UploadLargeFile(file, remotePath, 20 * 1024 * 1024, (bytes, totalBytes, percentage) =>
tosClient.UploadLargeFile(file, remotePath, 20 * 1024 * 1024, (bytes, totalBytes, percentage) =>
{
_uploadCts.Token.ThrowIfCancellationRequested();
var currentFileProgress = bytes;
var overallProgress = ((double)(uploadedSize + currentFileProgress) / totalSize) * 100;
UploadProgress = Math.Min(overallProgress, 99.9);
// 计算速度
var now = DateTime.Now;
var timeDiff = (now - _lastProgressUpdateTime).TotalSeconds;
@@ -222,11 +238,11 @@ public partial class KeyMouseScriptItem : ObservableObject
var sizeDiff = uploadedSize + currentFileProgress - _lastUploadedSize;
var speed = sizeDiff / timeDiff;
UploadSpeed = FormatSpeed(speed);
_lastProgressUpdateTime = now;
_lastUploadedSize = uploadedSize + currentFileProgress;
}
_logger.LogDebug($"上传进度: {overallProgress:F}%");
});
}
@@ -234,15 +250,15 @@ public partial class KeyMouseScriptItem : ObservableObject
{
tosClient.UploadFile(file, remotePath);
}
uploadedSize += fileSize;
var progress = ((double)uploadedSize / totalSize) * 100;
UploadProgress = Math.Min(progress, 99.9);
}
UploadProgress = 100;
UploadSpeed = string.Empty; // 清空速度显示
// 上传完成后，不需要额外的文件夹状态更新
// FileUploadItem 的状态已经在 TosClientHelper 中更新
IsUploadSuccess = true;
@@ -274,6 +290,7 @@ public partial class KeyMouseScriptItem : ObservableObject
{
UploadProgress = 0;
}
_uploadCts?.Dispose();
_uploadCts = null;
}
@@ -290,6 +307,7 @@ public partial class KeyMouseScriptItem : ObservableObject
{
break;
}
await Task.Delay(100);
}
}
@@ -297,7 +315,6 @@ public partial class KeyMouseScriptItem : ObservableObject
[RelayCommand]
private async Task DeleteUploadedFiles()
{
try
{
// 提前验证用户信息，避免开始上传后才发现问题
@@ -308,7 +325,7 @@ public partial class KeyMouseScriptItem : ObservableObject
await MessageBox.ErrorAsync("请先设置用户名和UID");
return;
}
try
{
var dirName = new DirectoryInfo(Path).Name;
@@ -323,9 +340,9 @@ public partial class KeyMouseScriptItem : ObservableObject
IsDeleting = true;
IsDeleteSuccess = false;
DeleteProgress = 0;
_logger.LogDebug($"{dirName} 开始删除...");
await Task.Run(() =>
{
try
@@ -333,7 +350,7 @@ public partial class KeyMouseScriptItem : ObservableObject
var tosClient = new TosClientHelper();
var files = Directory.GetFiles(Path, "*.*", SearchOption.AllDirectories);
var collection = DbLiteService.Instance.UserDb.GetCollection<FileUploadItem>("FileUploads");
foreach (var file in files)
{
_deleteCts.Token.ThrowIfCancellationRequested();
@@ -341,10 +358,10 @@ public partial class KeyMouseScriptItem : ObservableObject
try
{
var remotePath = GetRemotePath(file);
// 删除对象存储中的文件
tosClient.DeleteObject(remotePath);
// 删除数据库中的记录
collection.Delete(remotePath);
}
@@ -353,7 +370,7 @@ public partial class KeyMouseScriptItem : ObservableObject
_logger.LogError($"删除文件失败：{ex.Message}");
}
}
IsDeleteSuccess = true;
// 重置上传状态
IsUploadSuccess = false;
@@ -391,7 +408,7 @@ public partial class KeyMouseScriptItem : ObservableObject
{
_deleteCts?.Cancel();
}
public bool VerifyFileHashes(string pcFolder, string hashFolder)
{
var hashFilePath = System.IO.Path.Combine(hashFolder, "hash.json");

40
BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml
View File

@@ -115,14 +115,16 @@
<Grid Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="180" />
<ColumnDefinition Width="160" />
<ColumnDefinition Width="170" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="20" />
</Grid.ColumnDefinitions>
<Grid x:Name="Col1" Grid.Column="0" />
<Grid x:Name="Col2" Grid.Column="1" />
<Grid x:Name="Col3" Grid.Column="2" />
<Grid x:Name="Col4" Grid.Column="3" />
</Grid>
<ui:ListView Grid.Row="6"
HorizontalAlignment="Stretch"
@@ -137,7 +139,39 @@
<GridViewColumn Width="{Binding ElementName=Col2, Path=ActualWidth}"
DisplayMemberBinding="{Binding CreateTimeStr}"
Header="创建时间" />
<GridViewColumn Width="{Binding ElementName=Col3, Path=ActualWidth}" Header="上传操作">
<GridViewColumn Width="{Binding ElementName=Col3, Path=ActualWidth}" Header="任务">
<GridViewColumn.CellTemplate>
<DataTemplate>
<ComboBox ItemsSource="{Binding TaskOptions}"
SelectedItem="{Binding SelectedTask, Mode=TwoWay}"
Width="100">
<ComboBox.Resources>
<Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}">
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsUploadSuccess}" Value="True" />
</MultiDataTrigger.Conditions>
<Setter Property="IsEnabled" Value="False" />
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsPartiallyUploaded}" Value="True" />
</MultiDataTrigger.Conditions>
<Setter Property="IsEnabled" Value="False" />
</MultiDataTrigger>
<DataTrigger Binding="{Binding IsUploading}" Value="True">
<Setter Property="IsEnabled" Value="False" />
</DataTrigger>
</Style.Triggers>
</Style>
</ComboBox.Resources>
</ComboBox>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="{Binding ElementName=Col4, Path=ActualWidth}"
Header="上传操作">
<GridViewColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">

1
BetterGenshinImpact/ViewModel/Pages/KeyMouseRecordPageViewModel.cs
View File

@@ -75,6 +75,7 @@ public partial class KeyMouseRecordPageViewModel : ObservableObject, INavigation
if (existingItem != null)
{
// 如果找到现有项目，保留其状态
existingItem.InitializeUploadStatus();
updatedItems.Add(existingItem);
}
else