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

lock attempt

Browse source
This commit is contained in:
fiso64 2023-06-01 19:00:15 +02:00
parent 85edae7e99
commit 3e688192ab
1 changed files with 61 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
slsk-batchdl/Program.cs
View file

@ -18,10 +18,12 @@ class Program
static string musicDir = ""; static string musicDir = "";
static string ytdlpFormat = ""; static string ytdlpFormat = "";
static int downloadMaxStaleTime = 0; static int downloadMaxStaleTime = 0;
static int updateDelay = 200; static int updateDelay = 300;
static int slowUpdateDelay = 5000; static int slowUpdateDelay = 5000;
static bool slowConsoleOutput = false; static bool slowConsoleOutput = false;
private static object consoleLock = new object();
static DateTime lastUpdate; static DateTime lastUpdate;
static bool skipUpdate = false; static bool skipUpdate = false;
@ -113,7 +115,7 @@ class Program
"\n --max-retries <num> Maximum number of users to try downloading from before" + "\n --max-retries <num> Maximum number of users to try downloading from before" +
"\n skipping track (default: 30)" + "\n skipping track (default: 30)" +
"\n" + "\n" +
"\n --slow-output Enable if the progress bars aren't properly updated (bug)"); "\n --simple-output No download bars in console");
} }
static async Task Main(string[] args) static async Task Main(string[] args)
@ -715,7 +717,9 @@ class Program
Console.ResetColor(); Console.ResetColor();
ProgressBar progress = new ProgressBar(PbStyle.DoubleLine, 100); ProgressBar progress = new ProgressBar(PbStyle.DoubleLine, 100);
progress.Refresh(0, $"Searching: {title}"); lock (consoleLock) {
progress.Refresh(0, $"Searching: {title}");
}
Action<SearchResponse> responseHandler = (r) => Action<SearchResponse> responseHandler = (r) =>
{ {
@ -785,7 +789,10 @@ class Program
var searchQuery1 = SearchQuery.FromText($"{track.Album} {track.TrackTitle}"); var searchQuery1 = SearchQuery.FromText($"{track.Album} {track.TrackTitle}");
var searchQuery2 = SearchQuery.FromText($"{track.ArtistName} {track.Album}"); var searchQuery2 = SearchQuery.FromText($"{track.ArtistName} {track.Album}");
progress.Refresh(0, $"Searching (album name): {title}"); lock (consoleLock)
{
progress.Refresh(0, $"Searching (album name): {title}");
}
try try
{ {
await WaitForInternetConnection(); await WaitForInternetConnection();
@ -821,7 +828,10 @@ class Program
minimumPeerUploadSpeed: 1, searchTimeout: 8000, minimumPeerUploadSpeed: 1, searchTimeout: 8000,
fileFilter: (file) => { return IsMusicFile(file.Filename) && necessaryCond.FileSatisfies(file, track); } fileFilter: (file) => { return IsMusicFile(file.Filename) && necessaryCond.FileSatisfies(file, track); }
); );
progress.Refresh(0, $"Searching (no channel name): {searchText}"); lock (consoleLock)
{
progress.Refresh(0, $"Searching (no channel name): {searchText}");
}
try try
{ {
await WaitForInternetConnection(); await WaitForInternetConnection();
@ -878,7 +888,10 @@ class Program
bool pref = preferredCond.FileSatisfies(x.file, track); bool pref = preferredCond.FileSatisfies(x.file, track);
if (skipIfPrefFailed && attemptedDownloadPref && !pref) if (skipIfPrefFailed && attemptedDownloadPref && !pref)
{ {
progress.Refresh(0, $"Pref. version of the file exists, but couldn't be downloaded: {track}, skipping"); lock (consoleLock)
{
progress.Refresh(0, $"Pref. version of the file exists, but couldn't be downloaded: {track}, skipping");
}
var failedDownloadInfo = $"{track} [Pref. version of the file exists, but couldn't be downloaded]"; var failedDownloadInfo = $"{track} [Pref. version of the file exists, but couldn't be downloaded]";
WriteLineOutputFile(failedDownloadInfo); WriteLineOutputFile(failedDownloadInfo);
return ""; return "";
@ -899,7 +912,10 @@ class Program
downloading = false; downloading = false;
if (--maxRetriesPerFile <= 0) if (--maxRetriesPerFile <= 0)
{ {
progress.Refresh(0, $"Out of download retries: {track}, skipping"); lock (consoleLock)
{
progress.Refresh(0, $"Out of download retries: {track}, skipping");
}
var failedDownloadInfo = $"{track} [Out of download retries]"; var failedDownloadInfo = $"{track} [Out of download retries]";
WriteLineOutputFile(failedDownloadInfo); WriteLineOutputFile(failedDownloadInfo);
return ""; return "";
@ -912,7 +928,10 @@ class Program
{ {
notFound = false; notFound = false;
try { try {
progress.Refresh(0, $"Not found, searching with yt-dlp: {track}"); lock (consoleLock)
{
progress.Refresh(0, $"Not found, searching with yt-dlp: {track}");
}
downloading = true; downloading = true;
string fname = GetSaveName(track); string fname = GetSaveName(track);
await YtdlpSearchAndDownload(track, necessaryCond, Path.Combine(outputFolder, fname), progress); await YtdlpSearchAndDownload(track, necessaryCond, Path.Combine(outputFolder, fname), progress);
@ -921,7 +940,10 @@ class Program
{ {
if (IsMusicFile(file)) if (IsMusicFile(file))
{ {
progress.Refresh(100, $"yt-dlp: Completed download for {track}"); lock (consoleLock)
{
progress.Refresh(100, $"yt-dlp: Completed download for {track}");
}
saveFilePath = file; saveFilePath = file;
break; break;
} }
@ -934,7 +956,10 @@ class Program
downloading = false; downloading = false;
if (e.Message.Contains("No matching files found")) if (e.Message.Contains("No matching files found"))
notFound = true; notFound = true;
progress.Refresh(0, $"{e.Message}"); lock (consoleLock)
{
progress.Refresh(0, $"{e.Message}");
}
} }
} }
@ -942,13 +967,19 @@ class Program
{ {
if (notFound) if (notFound)
{ {
progress.Refresh(0, $"Not found: {track}, skipping"); lock (consoleLock)
{
progress.Refresh(0, $"Not found: {track}, skipping");
}
var failedDownloadInfo = $"{track} [No suitable file found]"; var failedDownloadInfo = $"{track} [No suitable file found]";
WriteLineOutputFile(failedDownloadInfo); WriteLineOutputFile(failedDownloadInfo);
} }
else else
{ {
progress.Refresh(0, $"Failed to download: {track}, skipping"); lock (consoleLock)
{
progress.Refresh(0, $"Failed to download: {track}, skipping");
}
var failedDownloadInfo = $"{track} [All downloads failed]"; var failedDownloadInfo = $"{track} [All downloads failed]";
WriteLineOutputFile(failedDownloadInfo); WriteLineOutputFile(failedDownloadInfo);
} }
@ -1092,7 +1123,10 @@ class Program
startInfo.FileName = "yt-dlp"; startInfo.FileName = "yt-dlp";
string search = $"{track.ArtistName} - {track.TrackTitle}"; string search = $"{track.ArtistName} - {track.TrackTitle}";
startInfo.Arguments = $"\"ytsearch3:{search}\" --print \"%(duration>%H:%M:%S)s ¦¦ %(id)s ¦¦ %(title)s\""; startInfo.Arguments = $"\"ytsearch3:{search}\" --print \"%(duration>%H:%M:%S)s ¦¦ %(id)s ¦¦ %(title)s\"";
progress.Refresh(0, $"{startInfo.FileName} {startInfo.Arguments}"); lock (consoleLock)
{
progress.Refresh(0, $"{startInfo.FileName} {startInfo.Arguments}");
}
startInfo.RedirectStandardOutput = true; startInfo.RedirectStandardOutput = true;
startInfo.RedirectStandardError = true; startInfo.RedirectStandardError = true;
@ -1144,7 +1178,10 @@ class Program
startInfo.FileName = "yt-dlp"; startInfo.FileName = "yt-dlp";
startInfo.Arguments = $"\"{id}\" -f {ytdlpFormat} -ci -o \"{savePathNoExt}.%(ext)s\" -x"; startInfo.Arguments = $"\"{id}\" -f {ytdlpFormat} -ci -o \"{savePathNoExt}.%(ext)s\" -x";
progress.Refresh(0, $"yt-dlp \"{id}\" -f {ytdlpFormat} -ci -o \"{Path.GetFileNameWithoutExtension(savePathNoExt + ".m")}.%(ext)s\" -x"); lock (consoleLock)
{
progress.Refresh(0, $"yt-dlp \"{id}\" -f {ytdlpFormat} -ci -o \"{Path.GetFileNameWithoutExtension(savePathNoExt + ".m")}.%(ext)s\" -x");
}
startInfo.RedirectStandardOutput = true; startInfo.RedirectStandardOutput = true;
startInfo.RedirectStandardError = true; startInfo.RedirectStandardError = true;
@ -1193,7 +1230,10 @@ class Program
$"[{file.Length}s{sampleRate}{bitRate}/{fileSize}]"; $"[{file.Length}s{sampleRate}{bitRate}/{fileSize}]";
this.progress = progress; this.progress = progress;
progress.Refresh(0, displayText); lock (consoleLock)
{
progress.Refresh(0, displayText);
}
} }
public string UpdateText() public string UpdateText()
@ -1226,8 +1266,12 @@ class Program
success = true; success = true;
string txt = $"{bar}{state}:".PadRight(14, ' '); string txt = $"{bar}{state}:".PadRight(14, ' ');
Console.ResetColor();
progress.Refresh((int)((percentage ?? 0) * 100), $"{txt} {displayText}"); lock (consoleLock)
{
Console.ResetColor();
progress.Refresh((int)((percentage ?? 0) * 100), $"{txt} {displayText}");
}
return progress.Line1 + "\n" + progress.Line2; return progress.Line1 + "\n" + progress.Line2;
} }