Added file size info and MB uploaded info to upload control.

Drexel2k · Jun 17, 2020 · 2c48f18 · 2c48f18
1 parent 6b8d526
commit 2c48f18
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/VidUp.Business/Upload.cs b/VidUp.Business/Upload.cs
@@ -51,6 +51,8 @@ public class Upload : INotifyPropertyChanged
         [JsonProperty]
         private long bytesSent;
 
+        private long fileLength;
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         public Guid Guid { get => this.guid; }
@@ -248,13 +250,16 @@ public long FileLength
         {
             get
             {
-                FileInfo fileInfo = new FileInfo(this.filePath);
-                if (fileInfo.Exists)
+                if (this.fileLength <= 0)
                 {
-                    return fileInfo.Length;
+                    FileInfo fileInfo = new FileInfo(this.filePath);
+                    if (fileInfo.Exists)
+                    {
+                        this.fileLength = fileInfo.Length;
+                    }
                 }
 
-                return 0;
+                return this.fileLength;
             }
         }
 

diff --git a/VidUp.UI/Controls/UploadControl.xaml b/VidUp.UI/Controls/UploadControl.xaml
@@ -34,6 +34,7 @@
                 <RowDefinition MinHeight="30" Height="10*"></RowDefinition>
                 <RowDefinition MinHeight="30" Height="10*"></RowDefinition>
                 <RowDefinition MinHeight="30" Height="10*"></RowDefinition>
+                <RowDefinition MinHeight="30" Height="10*"></RowDefinition>
             </Grid.RowDefinitions>
             <Canvas Grid.Row="0" Grid.ColumnSpan="3" Margin="1 0 1 0">
                 <Canvas.Background>
@@ -145,7 +146,7 @@
                     </ComboBox.ItemTemplate>
                 </ComboBox>
 
-            <StackPanel  Grid.Row="7" Grid.Column="3" Orientation="Horizontal">
+            <StackPanel  Grid.Row="7" Grid.Column="2" Orientation="Horizontal">
                 <CheckBox IsChecked="{Binding PublishAt}" VerticalAlignment="Top" Margin="0 3 0 0" IsEnabled="{Binding ControlsEnabled}" />
                 <Label Content="Publish At: " Width="96" />
                 <DatePicker Width="100" materialDesign:HintAssist.Hint="Pick Date" Style="{StaticResource MaterialDesignDatePicker}" SelectedDate="{Binding PublishAtDate}" IsEnabled="{Binding PublishAt}" DisplayDateStart="{Binding PublishAtFirstDate, Mode=OneWay}" Margin="0 3 0 0" />
@@ -177,6 +178,12 @@
                 </StackPanel>
             </StackPanel>
 
+            <Label Grid.Row="10" Grid.Column="0" Content="File Size: " Width="110" />
+            <Label Grid.Row="10" Grid.Column="1"  Content="{Binding FileSizeInMegaByte}"  Width="190"  HorizontalAlignment="Left" />
+            <StackPanel  Grid.Row="10" Grid.Column="2" Orientation="Horizontal">
+                <Label Content="Uploaded: " Width="96" />
+                <Label Content="{Binding UploadedInMegaByte}" Width="96" />
+            </StackPanel>
 
         </Grid>
 

diff --git a/VidUp.UI/MainWindow.xaml b/VidUp.UI/MainWindow.xaml
@@ -149,7 +149,7 @@
                         <Label Content="Current File MB left: " />
                         <Label Content="{Binding CurrentFileMbLeft, Mode=OneWay}" />
                         <Label Content="  |  " />
-                        <Label Content="Current Upload Speed (KByte/s): " />
+                        <Label Content="Current Upload Speed (KBytes/s): " />
                         <Label Content="{Binding CurrentUploadSpeedInKiloBytesPerSecond, Mode=OneWay}" />
                     </StackPanel>
                     <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="right">

diff --git a/VidUp.UI/ViewModels/UploadViewModel.cs b/VidUp.UI/ViewModels/UploadViewModel.cs
@@ -3,11 +3,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
+using System.Runtime.Remoting.Messaging;
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
 using Drexel.VidUp.Business;
 using Drexel.VidUp.JSON;
+using Drexel.VidUp.Utils;
 
 #endregion
 
@@ -245,6 +248,16 @@ public Visibility Visibility
             }
         }
 
+        public string FileSizeInMegaByte
+        {
+            get => $"{((float)this.upload.FileLength / Constants.ByteMegaByteFactor).ToString("N0", CultureInfo.CurrentCulture)} MB";
+        }
+
+        public string UploadedInMegaByte
+        {
+            get => $"{((float)this.upload.BytesSent / Constants.ByteMegaByteFactor).ToString("N0", CultureInfo.CurrentCulture)} MB";
+        }
+
         public string ShowFileNotExistsIcon
         {
             get
@@ -432,6 +445,11 @@ private void uploadPropertyChanged(object sender, PropertyChangedEventArgs e)
 
                 return;
             }
+
+            if (e.PropertyName == "BytesSent")
+            {
+                this.raisePropertyChanged("UploadedInMegaByte");
+            }
         }
 
         private void raisePropertyChanged(string propertyName)