Redesign DookLiberation control flow.

FileLiberator/BackupBook.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using DataLayer;
 using Dinah.Core.ErrorHandling;
-using FileManager;
 
 namespace FileLiberator
 {
@@ -20,10 +19,16 @@ namespace FileLiberator
         public event EventHandler<string> StatusUpdate;
         public event EventHandler<LibraryBook> Completed;
 
-        public DownloadDecryptBook DownloadDecryptBook { get; } = new DownloadDecryptBook();
-		public DownloadPdf DownloadPdf { get; } = new DownloadPdf();
+        public DownloadDecryptBook DownloadDecryptBook { get; }
+		public DownloadPdf DownloadPdf { get; }
 
-		public bool Validate(LibraryBook libraryBook)
+        public BackupBook(DownloadDecryptBook downloadDecryptBook, DownloadPdf downloadPdf)
+		{
+            DownloadDecryptBook = downloadDecryptBook;
+            DownloadPdf = downloadPdf;
+        }
+
+        public bool Validate(LibraryBook libraryBook)
             => !ApplicationServices.TransitionalFileLocator.Audio_Exists(libraryBook.Book);
 
 		// do NOT use ConfigureAwait(false) on ProcessAsync()
@@ -35,16 +40,16 @@ namespace FileLiberator
             try
 			{
 				{
-					var statusHandler = await DownloadDecryptBook.TryProcessAsync(libraryBook);
-					if (statusHandler.HasErrors)
+                    var statusHandler = await DownloadDecryptBook.TryProcessAsync(libraryBook);
+                    if (statusHandler.HasErrors)
 						return statusHandler;
 				}
 
-				{
-					var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
+                {
+                    var statusHandler = await DownloadPdf.TryProcessAsync(libraryBook);
 					if (statusHandler.HasErrors)
 						return statusHandler;
-				}
+                }
 
 				return new StatusHandler();
 			}

FileLiberator/ConvertToMp3.cs

@@ -3,6 +3,7 @@ using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using Dinah.Core.IO;
+using Dinah.Core.Net.Http;
 using FileManager;
 using System;
 using System.IO;
@@ -11,25 +12,26 @@ using System.Threading.Tasks;
 
 namespace FileLiberator
 {
-    public class ConvertToMp3 : IDecryptable
+    public class ConvertToMp3 : IAudioDecodable
     {
-        public event EventHandler<string> DecryptBegin;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-        public event EventHandler<TimeSpan> UpdateRemainingTime;
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<LibraryBook> Completed;
-
-        public event EventHandler<string> StatusUpdate;
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
 
         private Mp4File m4bBook;
 
-        private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
+		public event EventHandler<Action<byte[]>> RequestCoverArt;
+		public event EventHandler<string> TitleDiscovered;
+		public event EventHandler<string> AuthorsDiscovered;
+		public event EventHandler<string> NarratorsDiscovered;
+		public event EventHandler<byte[]> CoverImageFilepathDiscovered;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<LibraryBook> Begin;
+		public event EventHandler<string> StatusUpdate;
+		public event EventHandler<LibraryBook> Completed;
+
+        private long fileSize;
+		private string Mp3FileName(string m4bPath) => m4bPath is null ? string.Empty : PathLib.ReplaceExtension(m4bPath, ".mp3");
 
         public void Cancel() => m4bBook?.Cancel();
 
@@ -43,15 +45,16 @@ namespace FileLiberator
         {
             Begin?.Invoke(this, libraryBook);
 
-            DecryptBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
+            StreamingBegin?.Invoke(this, $"Begin converting {libraryBook} to mp3");
 
             try
             {
                 var m4bPath = ApplicationServices.TransitionalFileLocator.Audio_GetPath(libraryBook.Book);
-
                 m4bBook = new Mp4File(m4bPath, FileAccess.Read);
                 m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 
+                fileSize = m4bBook.InputStream.Length;
+
                 TitleDiscovered?.Invoke(this, m4bBook.AppleTags.Title);
                 AuthorsDiscovered?.Invoke(this, m4bBook.AppleTags.FirstAuthor);
                 NarratorsDiscovered?.Invoke(this, m4bBook.AppleTags.Narrator);
@@ -76,7 +79,7 @@ namespace FileLiberator
             }
             finally
             {
-                DecryptCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
+                StreamingCompleted?.Invoke(this, $"Completed converting to mp3: {libraryBook.Book.Title}");
                 Completed?.Invoke(this, libraryBook);
             }
         }
@@ -88,11 +91,17 @@ namespace FileLiberator
             double estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
 
             if (double.IsNormal(estTimeRemaining))
-                UpdateRemainingTime?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
+                StreamingTimeRemaining?.Invoke(this, TimeSpan.FromSeconds(estTimeRemaining));
 
             double progressPercent = 100 * e.ProcessPosition.TotalSeconds / duration.TotalSeconds;
 
-            UpdateProgress?.Invoke(this, (int)progressPercent);
+            StreamingProgressChanged?.Invoke(this,
+                new DownloadProgress
+                {
+                    ProgressPercentage = progressPercent,
+                    BytesReceived = (long)(fileSize * progressPercent),
+                    TotalBytesToReceive = fileSize
+                });
         }
     }
 }

FileLiberator/DownloadDecryptBook.cs

@@ -8,27 +8,30 @@ using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
+using Dinah.Core.Net.Http;
 using FileManager;
 
 namespace FileLiberator
 {
-    public class DownloadDecryptBook : IDecryptable
+    public class DownloadDecryptBook : IAudioDecodable
     {
-        public event EventHandler<Action<byte[]>> RequestCoverArt;
-        public event EventHandler<LibraryBook> Begin;
-        public event EventHandler<string> DecryptBegin;
-        public event EventHandler<string> TitleDiscovered;
-        public event EventHandler<string> AuthorsDiscovered;
-        public event EventHandler<string> NarratorsDiscovered;
-        public event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        public event EventHandler<int> UpdateProgress;
-        public event EventHandler<TimeSpan> UpdateRemainingTime;
-        public event EventHandler<string> DecryptCompleted;
-        public event EventHandler<LibraryBook> Completed;
-        public event EventHandler<string> StatusUpdate;
 
-        private AaxcDownloadConverter aaxcDownloader;
-        public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
+		private AaxcDownloadConverter aaxcDownloader;
+
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
+		public event EventHandler<Action<byte[]>> RequestCoverArt;
+		public event EventHandler<string> TitleDiscovered;
+		public event EventHandler<string> AuthorsDiscovered;
+		public event EventHandler<string> NarratorsDiscovered;
+		public event EventHandler<byte[]> CoverImageFilepathDiscovered;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<LibraryBook> Begin;
+		public event EventHandler<string> StatusUpdate;
+		public event EventHandler<LibraryBook> Completed;
+
+		public async Task<StatusHandler> ProcessAsync(LibraryBook libraryBook)
         {
             Begin?.Invoke(this, libraryBook);
 
@@ -63,7 +66,7 @@ namespace FileLiberator
 
         private async Task<string> aaxToM4bConverterDecryptAsync(string cacheDir, string destinationDir, LibraryBook libraryBook)
         {
-            DecryptBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
+            StreamingBegin?.Invoke(this, $"Begin decrypting {libraryBook}");
 
             try
             {
@@ -103,8 +106,8 @@ namespace FileLiberator
 
 
                 aaxcDownloader = new AaxcDownloadConverter(outFileName, cacheDir, aaxcDecryptDlLic, format) { AppName = "Libation" };
-                aaxcDownloader.DecryptProgressUpdate += (s, progress) => UpdateProgress?.Invoke(this, progress);
-                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => UpdateRemainingTime?.Invoke(this, remaining);
+                aaxcDownloader.DecryptProgressUpdate += (s, progress) => StreamingProgressChanged?.Invoke(this, progress);
+                aaxcDownloader.DecryptTimeRemaining += (s, remaining) => StreamingTimeRemaining?.Invoke(this, remaining);
                 aaxcDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
                 aaxcDownloader.RetrievedTags += aaxcDownloader_RetrievedTags;
 
@@ -119,11 +122,12 @@ namespace FileLiberator
             }
             finally
             {
-                DecryptCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
+                StreamingCompleted?.Invoke(this, $"Completed downloading and decrypting {libraryBook.Book.Title}");
             }
         }
 
-        private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
+
+		private void AaxcDownloader_RetrievedCoverArt(object sender, byte[] e)
         {
             if (e is null && Configuration.Instance.AllowLibationFixup)
             {

FileLiberator/DownloadFile.cs

@@ -6,20 +6,21 @@ using Dinah.Core.Net.Http;
 namespace FileLiberator
 {
 	// currently only used to download the .zip flies for upgrade
-	public class DownloadFile : IDownloadable
+	public class DownloadFile : IStreamable
 	{
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
 
 		public async Task<string> PerformDownloadFileAsync(string downloadUrl, string proposedDownloadFilePath)
 		{
 			var client = new HttpClient();
 
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += OnProgressChanged;
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
 
 			try
 			{
@@ -28,8 +29,12 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
+		private void OnProgressChanged(object sender, DownloadProgress e)
+		{
+			StreamingProgressChanged?.Invoke(this, e);
+		}
 	}
 }

FileLiberator/DownloadableBase.cs

@@ -6,16 +6,18 @@ using Dinah.Core.Net.Http;
 
 namespace FileLiberator
 {
-	public abstract class DownloadableBase : IDownloadableProcessable
+	public abstract class DownloadableBase : IStreamProcessable
 	{
 		public event EventHandler<LibraryBook> Begin;
 		public event EventHandler<LibraryBook> Completed;
 
-		public event EventHandler<string> DownloadBegin;
-		public event EventHandler<DownloadProgress> DownloadProgressChanged;
-		public event EventHandler<string> DownloadCompleted;
+		public event EventHandler<string> StreamingBegin;
+		public event EventHandler<DownloadProgress> StreamingProgressChanged;
+		public event EventHandler<string> StreamingCompleted;
 
 		public event EventHandler<string> StatusUpdate;
+		public event EventHandler<TimeSpan> StreamingTimeRemaining;
+
 		protected void Invoke_StatusUpdate(string message) => StatusUpdate?.Invoke(this, message);
 
         public abstract bool Validate(LibraryBook libraryBook);
@@ -44,9 +46,9 @@ namespace FileLiberator
 		protected async Task<string> PerformDownloadAsync(string proposedDownloadFilePath, Func<Progress<DownloadProgress>, Task<string>> func)
 		{
 			var progress = new Progress<DownloadProgress>();
-			progress.ProgressChanged += (_, e) => DownloadProgressChanged?.Invoke(this, e);
+			progress.ProgressChanged += (_, e) => StreamingProgressChanged?.Invoke(this, e);
 
-			DownloadBegin?.Invoke(this, proposedDownloadFilePath);
+			StreamingBegin?.Invoke(this, proposedDownloadFilePath);
 
 			try
 			{
@@ -57,7 +59,7 @@ namespace FileLiberator
 			}
 			finally
 			{
-				DownloadCompleted?.Invoke(this, proposedDownloadFilePath);
+				StreamingCompleted?.Invoke(this, proposedDownloadFilePath);
 			}
 		}
 	}

FileLiberator/IAudioDecodable.cs

@@ -1,20 +1,17 @@
-using System;
+using Dinah.Core.Net.Http;
+using System;
 
 namespace FileLiberator
 {
-    public interface IDecryptable : IProcessable
+    public interface IAudioDecodable : IStreamProcessable
     {
-        event EventHandler<string> DecryptBegin;
 
         event EventHandler<Action<byte[]>> RequestCoverArt;
         event EventHandler<string> TitleDiscovered;
         event EventHandler<string> AuthorsDiscovered;
         event EventHandler<string> NarratorsDiscovered;
         event EventHandler<byte[]> CoverImageFilepathDiscovered;
-        event EventHandler<int> UpdateProgress;
-        event EventHandler<TimeSpan> UpdateRemainingTime;
 
-        event EventHandler<string> DecryptCompleted;
         void Cancel();
     }
 }

FileLiberator/IDownloadable.cs

@@ -1,12 +0,0 @@
-using System;
-using Dinah.Core.Net.Http;
-
-namespace FileLiberator
-{
-    public interface IDownloadable 
-    {
-        event EventHandler<string> DownloadBegin;
-        event EventHandler<DownloadProgress> DownloadProgressChanged;
-        event EventHandler<string> DownloadCompleted;
-    }
-}

FileLiberator/IDownloadableProcessable.cs

@@ -1,4 +0,0 @@
-namespace FileLiberator
-{
-    public interface IDownloadableProcessable : IDownloadable, IProcessable { }
-}

FileLiberator/IStreamProcessable.cs

@@ -0,0 +1,5 @@
+
+namespace FileLiberator
+{
+	public interface IStreamProcessable : IStreamable, IProcessable { }
+}

FileLiberator/IStreamable.cs

@@ -0,0 +1,13 @@
+using System;
+using Dinah.Core.Net.Http;
+
+namespace FileLiberator
+{
+    public interface IStreamable
+    {
+        event EventHandler<string> StreamingBegin;
+		event EventHandler<DownloadProgress> StreamingProgressChanged;
+        event EventHandler<TimeSpan> StreamingTimeRemaining;
+        event EventHandler<string> StreamingCompleted;
+    }
+}