Merge branch 'master' into already_downloaded_error

OF DL/Program.cs

@@ -2818,7 +2818,10 @@ public class Program
 			{
 				totalSize = post.SinglePosts.Count;
 			}
-		bool isNew = false;
+
+			bool anyNew = false;
+			bool anyExisting = false;
+			bool anyFailed = false;
 			await AnsiConsole.Progress()
 			.Columns(GetProgressColumns(downloadContext.DownloadConfig.ShowScrapeSize))
 			.StartAsync(async ctx =>
@@ -2858,7 +2861,7 @@ public class Program
 						SinglePost.Medium mediaInfo = post.SinglePostMedia.FirstOrDefault(m => m.id == postKVP.Key);
 						SinglePost postInfo = post.SinglePostObjects.FirstOrDefault(p => p?.media?.Contains(mediaInfo) == true);
 
-					isNew = await downloadContext.DownloadHelper.DownloadPostDRMVideo(
+						bool downloaded = await downloadContext.DownloadHelper.DownloadPostDRMVideo(
 							policy: policy,
 							signature: signature,
 							kvp: kvp,
@@ -2874,6 +2877,23 @@ public class Program
 							postMedia: mediaInfo,
 							author: postInfo?.author,
 							users: users);
+						if (downloaded)
+						{
+							anyNew = true;
+						}
+						else
+						{
+							bool recorded = await downloadContext.DBHelper.CheckDownloaded(path, postKVP.Key, "Posts");
+							if (recorded)
+							{
+								anyExisting = true;
+							}
+							else
+							{
+								anyFailed = true;
+								Log.Error("Failed to download DRM media {MediaId} for post {PostId}; not marked downloaded", postKVP.Key, post_id);
+							}
+						}
 					}
 					else
 					{
@@ -2882,7 +2902,7 @@ public class Program
 							SinglePost.Medium? mediaInfo = post.SinglePostMedia.FirstOrDefault(m => (m?.id == postKVP.Key) == true);
 							SinglePost? postInfo = post.SinglePostObjects.FirstOrDefault(p => p?.media?.Contains(mediaInfo) == true);
 
-						isNew = await downloadContext.DownloadHelper.DownloadPostMedia(
+							bool downloaded = await downloadContext.DownloadHelper.DownloadPostMedia(
 								url: postKVP.Value,
 								folder: path,
 								media_id: postKVP.Key,
@@ -2893,6 +2913,23 @@ public class Program
 								postMedia: mediaInfo,
 								author: postInfo?.author,
 								users: users);
+							if (downloaded)
+							{
+								anyNew = true;
+							}
+							else
+							{
+								bool recorded = await downloadContext.DBHelper.CheckDownloaded(path, postKVP.Key, "Posts");
+								if (recorded)
+								{
+									anyExisting = true;
+								}
+								else
+								{
+									anyFailed = true;
+									Log.Error("Failed to download media {MediaId} for post {PostId}; not marked downloaded", postKVP.Key, post_id);
+								}
+							}
 						}
 						catch
 						{
@@ -2902,16 +2939,21 @@ public class Program
 				}
 				task.StopTask();
 			});
-		if (isNew)
+			if (anyNew)
 			{
 				AnsiConsole.Markup($"[red]Post {post_id} downloaded\n[/]");
 				Log.Debug($"Post {post_id} downloaded");
 			}
-		else
+			else if (anyExisting && !anyFailed)
 			{
 				AnsiConsole.Markup($"[red]Post {post_id} already downloaded\n[/]");
 				Log.Debug($"Post {post_id} already downloaded");
 			}
+			else
+			{
+				AnsiConsole.Markup($"[red]Post {post_id} failed to download; no media marked as downloaded\n[/]");
+				Log.Error("Post {PostId} failed to download; no media marked as downloaded", post_id);
+			}
 		}
 
 	public static async Task<(bool IsExit, Dictionary<string, long>? selectedUsers, Entities.Config? updatedConfig)> HandleUserSelection(APIHelper apiHelper, Entities.Config currentConfig, Dictionary<string, long> users, Dictionary<string, long> lists)