Merge pull request #2 from strohitv/duration

Uploader now shows durations of upload.

STFU.Executable.AutoUploader/Forms/UploadForm.cs

@@ -3,6 +3,7 @@
 using STFU.Lib.Youtube.Interfaces.Model.Enums;
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace STFU.Executable.AutoUploader.Forms
@@ -12,9 +13,10 @@ public partial class UploadForm : Form
 		IAutomationUploader autoUploader = null;
 
 		string fileText = string.Empty;
-		string statusText = "Warte auf Dateien für den Upload...";
 		int progress = 0;
 
+		string[] statusTextLines = new [] { "Warte auf Dateien für den Upload...", string.Empty };
+
 		bool aborted = false;
 		bool ended = false;
 		bool allowChosingProcs = false;
@@ -55,11 +57,11 @@ private void CurrentUploadPropertyChanged(object sender, PropertyChangedEventArg
 			{
 				if (job.State == UploadState.ThumbnailUploading)
 				{
-					statusText = $"Lade Thumbnail hoch: {job.Progress:0.00} %";
+					statusTextLines[0] = $"Lade Thumbnail hoch: {job.Progress:0.00} %";
 				}
 				else
 				{
-					statusText = $"Lade Video hoch: {job.Progress:0.00} %";
+					statusTextLines[0] = $"Lade Video hoch: {job.Progress:0.00} %";
 				}
 				progress = (int)(job.Progress * 100);
 			}
@@ -70,19 +72,24 @@ private void CurrentUploadPropertyChanged(object sender, PropertyChangedEventArg
 					case UploadState.NotStarted:
 					case UploadState.Running:
 						fileText = job.Video.Title;
-						statusText = $"Video-Upload wird gestartet...";
+						statusTextLines[0] = $"Video-Upload wird gestartet...";
+						statusTextLines[1] = string.Empty;
 						break;
 					case UploadState.ThumbnailUploading:
-						statusText = $"Thumbnail-Upload wird gestartet...";
+						statusTextLines[0] = $"Thumbnail-Upload wird gestartet...";
+						statusTextLines[1] = string.Empty;
 						break;
 					case UploadState.CancelPending:
-						statusText = $"Upload wird abgebrochen...";
+						statusTextLines[0] = $"Upload wird abgebrochen...";
+						statusTextLines[1] = string.Empty;
 						break;
 					case UploadState.Error:
-						statusText = $"Es gab einen Fehler beim Upload.";
+						statusTextLines[0] = $"Es gab einen Fehler beim Upload.";
+						statusTextLines[1] = string.Empty;
 						break;
 					case UploadState.Canceled:
-						statusText = $"Upload wurde abgebrochen.";
+						statusTextLines[0] = $"Upload wurde abgebrochen.";
+						statusTextLines[1] = string.Empty;
 						break;
 					case UploadState.Successful:
 						fileText = oldtitle;
@@ -91,13 +98,18 @@ private void CurrentUploadPropertyChanged(object sender, PropertyChangedEventArg
 						throw new ArgumentException("Dieser Status wird nicht unterstützt.");
 				}
 			}
+			else if (e.PropertyName == nameof(job.RemainingDuration) || e.PropertyName == nameof(job.UploadedDuration))
+			{
+				statusTextLines[1] = $"Bisher benötigt: {job.UploadedDuration.ToString("hh\\:mm\\:ss")}, verbleibende Zeit: {job.RemainingDuration.ToString("hh\\:mm\\:ss")}";
+			}
 		}
 
 		private void UploaderPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == nameof(autoUploader.Uploader.State) && autoUploader.Uploader.State == UploaderState.Waiting)
 			{
-				statusText = $"Upload abgeschlossen.{Environment.NewLine}Warte auf Dateien für den Upload...";
+				statusTextLines[0] = "Upload abgeschlossen.";
+				statusTextLines[1] = "Warte auf Dateien für den Upload...";
 			}
 		}
 
@@ -118,7 +130,7 @@ private void AutoUploaderPropertyChanged(object sender, PropertyChangedEventArgs
 		private void refreshTimerTick(object sender, EventArgs e)
 		{
 			fileLabel.Text = fileText;
-			statusLabel.Text = statusText;
+			statusLabel.Text = statusTextLines.Aggregate((i, j) => i + Environment.NewLine + j);
 			prgbarProgress.Value = progress;
 
 			if (ended)

STFU.Lib.Youtube.Automation/Programming/ScriptType.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace STFU.Lib.Youtube.Automation.Programming
+namespace STFU.Lib.Youtube.Automation.Programming
 {
 	internal enum ScriptType
 	{

STFU.Lib.Youtube.Interfaces/Model/IYoutubeJob.cs

@@ -40,5 +40,15 @@ public interface IYoutubeJob : INotifyPropertyChanged
 		/// Contains information about the error if something fails
 		/// </summary>
 		IYoutubeError Error { get; }
+
+		/// <summary>
+		/// Time the Job has being uploaded
+		/// </summary>
+		TimeSpan UploadedDuration { get; }
+
+		/// <summary>
+		/// Remaining Time the Job will probably need to finish uploading
+		/// </summary>
+		TimeSpan RemainingDuration { get; }
 	}
 }

STFU.Lib.Youtube/Internal/InternalYoutubeJob.cs

@@ -65,6 +65,41 @@ public UploadState State
 			}
 		}
 
+		private TimeSpan uploadedDuration = new TimeSpan(0, 0, 0);
+		private TimeSpan remainingDuration = new TimeSpan(0, 0, 0);
+
+		public TimeSpan UploadedDuration
+		{
+			get
+			{
+				return uploadedDuration;
+			}
+			 set
+			{
+				if (uploadedDuration != value)
+				{
+					uploadedDuration = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		public TimeSpan RemainingDuration
+		{
+			get
+			{
+				return remainingDuration;
+			}
+			set
+			{
+				if (remainingDuration != value)
+				{
+					remainingDuration = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		public IYoutubeVideo Video { get; }
 
 		public Uri Uri { get; set; }

STFU.Lib.Youtube/Internal/Upload/FileUploader.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.IO;
 using System.Net;
 using System.Runtime.CompilerServices;
@@ -25,6 +26,42 @@ private set
 			}
 		}
 
+		private DateTime started;
+		private TimeSpan uploadedDuration = new TimeSpan(0, 0, 0);
+		private TimeSpan remainingDuration = new TimeSpan(0, 0, 0);
+
+		public TimeSpan UploadedDuration
+		{
+			get
+			{
+				return uploadedDuration;
+			}
+			private set
+			{
+				if (uploadedDuration != value)
+				{
+					uploadedDuration = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		public TimeSpan RemainingDuration
+		{
+			get
+			{
+				return remainingDuration;
+			}
+			private set
+			{
+				if (remainingDuration != value)
+				{
+					remainingDuration = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		private RunningState state = RunningState.NotRunning;
 		public RunningState State
 		{
@@ -81,6 +118,7 @@ internal bool UploadFile(string path, HttpWebRequest request, long maxFileSize,
 					fileStream.Position = startPosition;
 				}
 
+				started = DateTime.Now;
 				State = RunningState.Running;
 
 				// Upload initiieren
@@ -95,6 +133,9 @@ internal bool UploadFile(string path, HttpWebRequest request, long maxFileSize,
 					{
 						requestStream.Write(buffer, 0, bytesRead);
 						Progress = fileStream.Position / (double)fileStream.Length * 100;
+
+						UploadedDuration = DateTime.Now - started;
+						RemainingDuration = new TimeSpan(0 , 0, (int)(UploadedDuration.TotalSeconds / Progress * 100));
 					}
 				}
 				catch (WebException)

STFU.Lib.Youtube/Internal/Upload/YoutubeThumbnailUploader.cs

@@ -103,6 +103,14 @@ private void FileUploaderPropertyChanged(object sender, PropertyChangedEventArgs
 			{
 				Job.Progress = fileUploader.Progress;
 			}
+			else if (e.PropertyName ==  nameof(fileUploader.RemainingDuration))
+			{
+				Job.RemainingDuration = fileUploader.RemainingDuration;
+			}
+			else if (e.PropertyName == nameof(fileUploader.UploadedDuration))
+			{
+				Job.UploadedDuration = fileUploader.UploadedDuration;
+			}
 			else
 			{
 				Job.Error = FailReasonConverter.GetError(fileUploader.FailureReason);

STFU.Lib.Youtube/Internal/Upload/YoutubeVideoUploader.cs

@@ -83,6 +83,14 @@ private void OnUploadProgressChanged(object sender, PropertyChangedEventArgs e)
 			{
 				Job.Progress = fileUploader.Progress;
 			}
+			else if (e.PropertyName == nameof(fileUploader.RemainingDuration))
+			{
+				Job.RemainingDuration = fileUploader.RemainingDuration;
+			}
+			else if (e.PropertyName == nameof(fileUploader.UploadedDuration))
+			{
+				Job.UploadedDuration = fileUploader.UploadedDuration;
+			}
 			else
 			{
 				Job.Error = FailReasonConverter.GetError(fileUploader.FailureReason);