github/ZonyLrcToolsX
1
0
Fork 0
mirror of https://github.com/real-zony/ZonyLrcToolsX.git synced 2025-07-01 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #132 from real-zony/issue-128

Browse Source 
fix: Fixed the path issue #128.
This commit is contained in:
Zony 2023-03-19 12:01:18 +08:00 committed by GitHub
commit 82af3009d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZonyLrcTools.Cli/Program.cs
View File

@ -83,7 +83,7 @@ namespace ZonyLrcTools.Cli
.ConfigureHostConfiguration(builder => .ConfigureHostConfiguration(builder =>
{ {
builder builder
.SetBasePath(Directory.GetCurrentDirectory()) .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
.AddYamlFile("config.yaml"); .AddYamlFile("config.yaml");
}) })
.ConfigureServices((_, services) => .ConfigureServices((_, services) =>

2
src/ZonyLrcTools.Common/Infrastructure/DependencyInject/ServiceCollectionExtensions.cs
View File

@ -43,7 +43,7 @@ namespace ZonyLrcTools.Common.Infrastructure.DependencyInject
public static IServiceCollection ConfigureConfiguration(this IServiceCollection services) public static IServiceCollection ConfigureConfiguration(this IServiceCollection services)
{ {
var configuration = new ConfigurationBuilder() var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory()) .SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
.AddYamlFile("config.yaml") .AddYamlFile("config.yaml")
.Build(); .Build();

2
src/ZonyLrcTools.Common/Infrastructure/Exceptions/ErrorCodeHelper.cs
View File

@ -26,7 +26,7 @@ namespace ZonyLrcTools.Common.Infrastructure.Exceptions
return; return;
} }
var jsonPath = Path.Combine(Directory.GetCurrentDirectory(), "Resources", "error_msg.json"); var jsonPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "error_msg.json");
using var jsonReader = new JsonTextReader(File.OpenText(jsonPath)); using var jsonReader = new JsonTextReader(File.OpenText(jsonPath));
var jsonObj = JObject.Load(jsonReader); var jsonObj = JObject.Load(jsonReader);

2
src/ZonyLrcTools.Common/Lyrics/LyricsDownloader.cs
View File

@ -67,7 +67,7 @@ public class LyricsDownloader : ILyricsDownloader, ISingletonDependency
await Task.WhenAll(downloadTasks); await Task.WhenAll(downloadTasks);
await _logger.InfoAsync($"歌词数据下载完成，成功: {needDownloadMusicInfos.Count(m => m.IsSuccessful)} 失败{needDownloadMusicInfos.Count(m => m.IsSuccessful == false)}。"); await _logger.InfoAsync($"歌词数据下载完成，成功: {needDownloadMusicInfos.Count(m => m.IsSuccessful)} 失败{needDownloadMusicInfos.Count(m => m.IsSuccessful == false)}。");
await LogFailedSongFilesInfo(Path.Combine(Directory.GetCurrentDirectory(), $"歌词下载失败列表_{DateTime.Now:yyyyMMddHHmmss}.txt"), needDownloadMusicInfos); await LogFailedSongFilesInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"歌词下载失败列表_{DateTime.Now:yyyyMMddHHmmss}.txt"), needDownloadMusicInfos);
} }
private async Task DownloadAndWriteLyricsAsync(ILyricsProvider provider, MusicInfo info) private async Task DownloadAndWriteLyricsAsync(ILyricsProvider provider, MusicInfo info)

5
tests/ZonyLrcTools.Tests/Infrastructure/Album/QQMusicAlbumDownloaderTests.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -20,7 +21,7 @@ namespace ZonyLrcTools.Tests.Infrastructure.Album
albumBytes.Length.ShouldBeGreaterThan(0); albumBytes.Length.ShouldBeGreaterThan(0);
// 显示具体的图像。 // 显示具体的图像。
var tempAlbumPath = Path.Combine(Directory.GetCurrentDirectory(), "tempAlbum.png"); var tempAlbumPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "tempAlbum.png");
File.Delete(tempAlbumPath); File.Delete(tempAlbumPath);
await using var file = File.Create(tempAlbumPath); await using var file = File.Create(tempAlbumPath);

4
tests/ZonyLrcTools.Tests/Infrastructure/Tag/TagLoaderTests.cs
View File

@ -1,9 +1,9 @@
using System;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Shouldly; using Shouldly;
using Xunit; using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Tag;
using ZonyLrcTools.Common.TagInfo; using ZonyLrcTools.Common.TagInfo;
namespace ZonyLrcTools.Tests.Infrastructure.Tag namespace ZonyLrcTools.Tests.Infrastructure.Tag
@ -16,7 +16,7 @@ namespace ZonyLrcTools.Tests.Infrastructure.Tag
var tagLoader = ServiceProvider.GetRequiredService<ITagLoader>(); var tagLoader = ServiceProvider.GetRequiredService<ITagLoader>();
tagLoader.ShouldNotBeNull(); tagLoader.ShouldNotBeNull();
var info = await tagLoader.LoadTagAsync(Path.Combine(Directory.GetCurrentDirectory(), "MusicFiles", "曾经艺也 - 荀彧(纯音乐版).mp3")); var info = await tagLoader.LoadTagAsync(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "MusicFiles", "曾经艺也 - 荀彧(纯音乐版).mp3"));
info.ShouldNotBeNull(); info.ShouldNotBeNull();
info.Name.ShouldBe("荀彧(纯音乐版)"); info.Name.ShouldBe("荀彧(纯音乐版)");
info.Artist.ShouldBe("曾经艺也"); info.Artist.ShouldBe("曾经艺也");