Merge pull request #79 from mateuszskoczek/features/new_settings

new settings added

VDownload.Core/VDownload.Core.Strings/Strings/en-US/SettingsViewResources.resw

@@ -180,6 +180,15 @@
   <data name="TasksMediaType.Header" xml:space="preserve">
     <value>Media type</value>
   </data>
+  <data name="TasksMeteredConnectionWarning.Header" xml:space="preserve">
+    <value>Show warning before downloading on a metered connection</value>
+  </data>
+  <data name="TasksReplaceOutputFile.Description" xml:space="preserve">
+    <value>If file with same name as output file, already exists, it will be replaced. Otherwise new file with unique name will be created.</value>
+  </data>
+  <data name="TasksReplaceOutputFile.Header" xml:space="preserve">
+    <value>Replace output file if exists</value>
+  </data>
   <data name="TasksRunningTasks.Header" xml:space="preserve">
     <value>Maximum number of tasks running in parallel</value>
   </data>

VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs

@@ -250,7 +250,12 @@ namespace VDownload.Core.Tasks
             StorageFolder destination = await StorageFolder.GetFolderFromPathAsync(DownloadOptions.Directory);
 
             string filename = $"{DownloadOptions.Filename}.{DownloadOptions.Extension}";
-            await outputFile.CopyAsync(destination, filename, NameCollisionOption.ReplaceExisting);
+
+            NameCollisionOption nameCollisionOption = _settingsService.Data.Common.Tasks.ReplaceOutputFileIfExists
+                ? NameCollisionOption.ReplaceExisting
+                : NameCollisionOption.GenerateUniqueName;
+
+            await outputFile.CopyAsync(destination, filename, nameCollisionOption);
         }
 
         protected void UpdateStatusWithDispatcher(DownloadTaskStatus status) => _dispatcherQueue.TryEnqueue(() => Status = status);

VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using VDownload.Core.Tasks;
+using VDownload.Services.Data.Settings;
 using VDownload.Services.UI.Dialogs;
 using VDownload.Services.UI.StringResources;
 
@@ -21,6 +22,7 @@ namespace VDownload.Core.ViewModels.Home
 
         protected readonly IDialogsService _dialogsService;
         protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly ISettingsService _settingsService;
 
         #endregion
 
@@ -39,13 +41,14 @@ namespace VDownload.Core.ViewModels.Home
 
         #region CONSTRUCTORS
 
-        public HomeDownloadsViewModel(IDownloadTaskManager tasksManager, IDialogsService dialogsService, IStringResourcesService stringResourcesService)
+        public HomeDownloadsViewModel(IDownloadTaskManager tasksManager, IDialogsService dialogsService, IStringResourcesService stringResourcesService, ISettingsService settingsService)
         {
             _tasksManager = tasksManager;
             _tasksManager.TaskCollectionChanged += Tasks_CollectionChanged;
 
             _dialogsService = dialogsService;
             _stringResourcesService = stringResourcesService;
+            _settingsService = settingsService;
 
             _taskListIsEmpty = _tasksManager.Tasks.Count == 0;
         }
@@ -77,7 +80,12 @@ namespace VDownload.Core.ViewModels.Home
                 }
 
                 bool continueEnqueue = true;
-                if (NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection)
+                if 
+                (
+                    _settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings
+                    &&
+                    NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection
+                )
                 {
                     string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle");
                     string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage");

VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs

@@ -297,7 +297,14 @@ namespace VDownload.Core.ViewModels.Home
 
         protected async Task CreateTasks(bool download)
         {
-            if (download && NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection)
+            if     
+            (
+                download
+                &&
+                _settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings
+                && 
+                NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection
+            )
             {
                 string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle");
                 string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage");

VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs

@@ -175,7 +175,14 @@ namespace VDownload.Core.ViewModels.Home
 
         protected async Task CreateTask(bool download)
         {
-            if (download && NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection)
+            if 
+            (
+                download 
+                &&
+                _settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings
+                &&
+                NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection
+            )
             {
                 string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle");
                 string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage");

VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs

@@ -341,6 +341,8 @@ namespace VDownload.Core.ViewModels.Home
 
         [RelayCommand]
         public async Task Download()
+        {
+            if (_downloadTaskManager.Tasks.Count > 0)
             {
                 if (!NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable)
                 {
@@ -348,7 +350,12 @@ namespace VDownload.Core.ViewModels.Home
                     return;
                 }
 
-            if (_downloadTaskManager.Tasks.Count > 0 && NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection)
+                if 
+                (
+                    _settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings 
+                    && 
+                    NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection
+                )
                 {
                     string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle");
                     string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage");
@@ -364,6 +371,7 @@ namespace VDownload.Core.ViewModels.Home
                     task.Enqueue();
                 }
             }
+        }
 
         [RelayCommand]
         public async Task Cancel()

VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs

@@ -65,6 +65,12 @@ namespace VDownload.Core.ViewModels.Settings
             set => SetProperty(_settingsService.Data.Common.Tasks.FilenameTemplate, value, _settingsService.Data.Common.Tasks, (u, n) => u.FilenameTemplate = n);
         }
 
+        public bool TasksMeteredConnectionWarning
+        {
+            get => _settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings;
+            set => SetProperty(_settingsService.Data.Common.Tasks.ShowMeteredConnectionWarnings, value, _settingsService.Data.Common.Tasks, (u, n) => u.ShowMeteredConnectionWarnings = n);
+        }
+
         public bool TasksSaveLastOutputDirectory
         {
             get => _settingsService.Data.Common.Tasks.SaveLastOutputDirectory;
@@ -77,6 +83,12 @@ namespace VDownload.Core.ViewModels.Settings
             set => SetProperty(_settingsService.Data.Common.Tasks.DefaultOutputDirectory, value, _settingsService.Data.Common.Tasks, (u, n) => u.DefaultOutputDirectory = n);
         }
 
+        public bool TasksReplaceOutputFile
+        {
+            get => _settingsService.Data.Common.Tasks.ReplaceOutputFileIfExists;
+            set => SetProperty(_settingsService.Data.Common.Tasks.ReplaceOutputFileIfExists, value, _settingsService.Data.Common.Tasks, (u, n) => u.ReplaceOutputFileIfExists = n);
+        }
+
         public string ProcessingFFmpegLocation
         {
             get => _settingsService.Data.Common.Processing.FFmpegLocation;

VDownload.Core/VDownload.Core.Views/Settings/SettingsView.xaml

@@ -105,6 +105,13 @@
                         <TextBox Text="{Binding TasksFilenameTemplate, Mode=TwoWay}"
                                  ToolTipService.ToolTip="{Binding TasksFilenameTemplateTooltip}"/>
                     </ctc:SettingsCard>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksMeteredConnectionWarning">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageSettingsViewTasksMeteredConnectionWarning}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <ToggleSwitch IsOn="{Binding TasksMeteredConnectionWarning, Mode=TwoWay}"/>
+                    </ctc:SettingsCard>
                     <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksSaveLastOutputDirectory">
                         <ctc:SettingsExpander.HeaderIcon>
                             <BitmapIcon ShowAsMonochrome="False" 
@@ -120,6 +127,13 @@
                             </ctc:SettingsCard>
                         </ctc:SettingsExpander.Items>
                     </ctc:SettingsExpander>
+                    <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/SettingsViewResources/TasksReplaceOutputFile">
+                        <ctc:SettingsCard.HeaderIcon>
+                            <BitmapIcon ShowAsMonochrome="False" 
+                                        UriSource="{ThemeResource ImageSettingsViewTasksReplaceOutputFile}"/>
+                        </ctc:SettingsCard.HeaderIcon>
+                        <ToggleSwitch IsOn="{Binding TasksReplaceOutputFile, Mode=TwoWay}"/>
+                    </ctc:SettingsCard>
                 </StackPanel>
                 
                 <!-- Processing -->

VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Settings/Models/Tasks.cs

@@ -30,5 +30,11 @@ namespace VDownload.Services.Data.Settings.Models
 
         [JsonProperty("max_number_of_running_tasks")]
         public int MaxNumberOfRunningTasks { get; set; } = 5;
+
+        [JsonProperty("show_metered_connection_warnings")]
+        public bool ShowMeteredConnectionWarnings { get; set; } = true;
+
+        [JsonProperty("replace_output_file_if_exists")]
+        public bool ReplaceOutputFileIfExists { get; set; } = false;
     }
 }

VDownload/Dictionaries/Images/ImagesSettingsView.xaml

@@ -8,7 +8,9 @@
             <x:String x:Key="ImageSettingsViewTasksDefaultMediaOptions">/Assets/SettingsView/TasksDefaultMediaOptionsLight.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksRunningTasks">/Assets/SettingsView/TasksRunningTasksLight.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksFilenameTemplate">/Assets/SettingsView/TasksFilenameTemplateLight.png</x:String>
+            <x:String x:Key="ImageSettingsViewTasksMeteredConnectionWarning">/Assets/SettingsView/TasksMeteredConnectionWarningLight.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksOutputDirectory">/Assets/SettingsView/TasksOutputDirectoryLight.png</x:String>
+            <x:String x:Key="ImageSettingsViewTasksReplaceOutputFile">/Assets/SettingsView/TasksReplaceOutputFileLight.png</x:String>
             <x:String x:Key="ImageSettingsViewTempDirectory">/Assets/SettingsView/TempDirectoryLight.png</x:String>
             <x:String x:Key="ImageSettingsViewTempDeleteOnFail">/Assets/SettingsView/TempDeleteOnFailLight.png</x:String>
             <x:String x:Key="ImageSettingsViewNotificationOnSuccessful">/Assets/SettingsView/NotificationOnSuccessfulLight.png</x:String>
@@ -23,7 +25,9 @@
             <x:String x:Key="ImageSettingsViewTasksDefaultMediaOptions">/Assets/SettingsView/TasksDefaultMediaOptionsDark.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksRunningTasks">/Assets/SettingsView/TasksRunningTasksDark.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksFilenameTemplate">/Assets/SettingsView/TasksFilenameTemplateDark.png</x:String>
+            <x:String x:Key="ImageSettingsViewTasksMeteredConnectionWarning">/Assets/SettingsView/TasksMeteredConnectionWarningDark.png</x:String>
             <x:String x:Key="ImageSettingsViewTasksOutputDirectory">/Assets/SettingsView/TasksOutputDirectoryDark.png</x:String>
+            <x:String x:Key="ImageSettingsViewTasksReplaceOutputFile">/Assets/SettingsView/TasksReplaceOutputFileDark.png</x:String>
             <x:String x:Key="ImageSettingsViewTempDirectory">/Assets/SettingsView/TempDirectoryDark.png</x:String>
             <x:String x:Key="ImageSettingsViewTempDeleteOnFail">/Assets/SettingsView/TempDeleteOnFailDark.png</x:String>
             <x:String x:Key="ImageSettingsViewNotificationOnSuccessful">/Assets/SettingsView/NotificationOnSuccessfulDark.png</x:String>

VDownload/VDownload.csproj

@@ -266,6 +266,18 @@
     <Content Update="Assets\SettingsView\TasksDefaultMediaOptionsLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\SettingsView\TasksMeteredConnectionWarningDark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\SettingsView\TasksMeteredConnectionWarningLight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\SettingsView\TasksReplaceOutputFileDark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\SettingsView\TasksReplaceOutputFileLight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="Assets\SettingsView\TasksRunningTasksDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>