mirror/slsk-batchdl
1
0
Fork 0
mirror of https://github.com/fiso64/slsk-batchdl.git synced 2024-12-22 14:32:40 +00:00
Code Issues Activity

expand tildes in input paths

Browse source
This commit is contained in:
fiso64 2024-10-11 23:49:00 +02:00
parent d5a4750da0
commit 13f3cbff47
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
slsk-batchdl/Extractors/Csv.cs
View file

@ -17,19 +17,19 @@ namespace Extractors
public async Task<TrackLists> GetTracks(string input, int maxTracks, int offset, bool reverse) public async Task<TrackLists> GetTracks(string input, int maxTracks, int offset, bool reverse)
{ {
if (!File.Exists(input)) csvFilePath = Utils.ExpandUser(input);
throw new FileNotFoundException($"CSV file '{input}' not found");
csvFilePath = input; if (!File.Exists(csvFilePath))
throw new FileNotFoundException($"CSV file '{csvFilePath}' not found");
var tracks = await ParseCsvIntoTrackInfo(input, Config.I.artistCol, Config.I.titleCol, Config.I.lengthCol, var tracks = await ParseCsvIntoTrackInfo(csvFilePath, Config.I.artistCol, Config.I.titleCol, Config.I.lengthCol,
Config.I.albumCol, Config.I.descCol, Config.I.ytIdCol, Config.I.trackCountCol, Config.I.timeUnit, Config.I.ytParse); Config.I.albumCol, Config.I.descCol, Config.I.ytIdCol, Config.I.trackCountCol, Config.I.timeUnit, Config.I.ytParse);
if (reverse) if (reverse)
tracks.Reverse(); tracks.Reverse();
var trackLists = TrackLists.FromFlattened(tracks.Skip(offset).Take(maxTracks)); var trackLists = TrackLists.FromFlattened(tracks.Skip(offset).Take(maxTracks));
var csvName = Path.GetFileNameWithoutExtension(input); var csvName = Path.GetFileNameWithoutExtension(csvFilePath);
foreach (var tle in trackLists.lists) foreach (var tle in trackLists.lists)
{ {

12
slsk-batchdl/Extractors/List.cs
View file

@ -16,12 +16,12 @@ namespace Extractors
public async Task<TrackLists> GetTracks(string input, int maxTracks, int offset, bool reverse) public async Task<TrackLists> GetTracks(string input, int maxTracks, int offset, bool reverse)
{ {
if (!File.Exists(input)) listFilePath = Utils.ExpandUser(input);
throw new FileNotFoundException($"List file '{input}' not found");
if (!File.Exists(listFilePath))
throw new FileNotFoundException($"List file '{listFilePath}' not found");
listFilePath = input; var lines = File.ReadAllLines(listFilePath);
var lines = File.ReadAllLines(input);
var trackLists = new TrackLists(); var trackLists = new TrackLists();
@ -30,7 +30,7 @@ namespace Extractors
int count = 0; int count = 0;
int added = 0; int added = 0;
string foldername = Path.GetFileNameWithoutExtension(input); string foldername = Path.GetFileNameWithoutExtension(listFilePath);
for (int i = start; i < lines.Length && i >= 0; i += step) for (int i = start; i < lines.Length && i >= 0; i += step)
{ {