#171 - create mask counter number

jwallet · May 6, 2020 · 98932b1 · 98932b1
1 parent 2786411
commit 98932b1
Show file tree

Hide file tree

Showing 20 changed files with 267 additions and 62 deletions.
diff --git a/EspionSpotify.Tests/UserSettingTests.cs b/EspionSpotify.Tests/UserSettingTests.cs
@@ -13,7 +13,8 @@ internal void DefaultUserSettings_ReturnsDefault()
             Assert.Equal(1, userSettings.InternalOrderNumber);
             Assert.False(userSettings.HasRecordingTimerEnabled);
             Assert.Equal(0.0, userSettings.RecordingTimerMilliseconds);
-            Assert.Null(userSettings.OrderNumber);
+            Assert.Null(userSettings.OrderNumberAsFile);
+            Assert.Null(userSettings.OrderNumberAsTag);
             Assert.False(userSettings.IsSpotifyAPISet);
         }
 
@@ -39,10 +40,29 @@ internal void RecordingTimer_ReturnsRecordingTimerMilliseconds()
         }
 
         [Fact]
-        internal void InternalOrderNumber_ReturnsOrderNumberValue()
+        internal void OrderNumberMask_ReturnsMaskAsMax()
         {
-            Assert.Equal(1, new UserSettings { OrderNumberInfrontOfFileEnabled = true }.OrderNumber);
-            Assert.Equal(1, new UserSettings { OrderNumberInMediaTagEnabled = true }.OrderNumber);
+            Assert.Equal(99999, new UserSettings { OrderNumberMask = "00000" }.OrderNumberMax);
+        }
+
+        [Fact]
+        internal void HasOrderNumberEnabled_ReturnsAsExpected()
+        {
+            Assert.True(new UserSettings { OrderNumberInfrontOfFileEnabled = true }.HasOrderNumberEnabled);
+            Assert.True(new UserSettings { OrderNumberInMediaTagEnabled = true }.HasOrderNumberEnabled);
+            Assert.False(new UserSettings().HasOrderNumberEnabled);
+        }
+
+        [Fact]
+        internal void InternalOrderNumber_ReturnsOrderNumberAsFile()
+        {
+            Assert.Equal(1, new UserSettings { OrderNumberInfrontOfFileEnabled = true }.OrderNumberAsFile);
+        }
+
+        [Fact]
+        internal void InternalOrderNumber_ReturnsOrderNumberAsTag()
+        {
+            Assert.Equal(1, new UserSettings { OrderNumberInMediaTagEnabled = true }.OrderNumberAsTag);
         }
 
         [Fact]

diff --git a/EspionSpotify.Tests/WatcherTests.cs b/EspionSpotify.Tests/WatcherTests.cs
@@ -229,5 +229,21 @@ internal void IsNewTrack_ReturnsExpectedResults()
             Assert.False(watcher.IsNewTrack(new Track { Artist = "Spotify Free" }));
             Assert.True(watcher.IsNewTrack(new Track { Artist = "Artist", Title = "Title" }));
         }
+
+        [Theory]
+        [InlineData(true, 10000, true)]
+        [InlineData(true, 9999, true)]
+        [InlineData(false, 9999, false)]
+        [InlineData(true, 9998, false)]
+        internal void IsMaxOrderNumberAsFileExceeded_ReturnsExpectedResults(bool enabled, int orderNumber, bool expected)
+        {
+            _userSettings.OrderNumberInfrontOfFileEnabled = enabled;
+            _userSettings.OrderNumberInMediaTagEnabled = true;
+            _userSettings.OrderNumberMask = "0000";
+            _userSettings.InternalOrderNumber = orderNumber;
+            var watcher = new Watcher(_formMock, _userSettings, new Track(), _fileSystem);
+
+            Assert.Equal(expected, watcher.IsMaxOrderNumberAsFileExceeded);
+        }
     }
 }
diff --git a/EspionSpotify/App.config b/EspionSpotify/App.config
@@ -86,6 +86,9 @@
         <value>
         </value>
       </setting>
+      <setting name="OrderNumberMask" serializeAs="String">
+        <value>000</value>
+      </setting>
     </EspionSpotify.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/EspionSpotify/Enums/TranslationKeys.cs b/EspionSpotify/Enums/TranslationKeys.cs
@@ -31,6 +31,7 @@ public enum TranslationKeys
         logAd,
         logDeleting,
         logInvalidOutput,
+        logMaxFileSequenceReached,
         logMissingDlls,
         logNoAccessOutput,
         logPreviousLogs,
@@ -65,6 +66,7 @@ public enum TranslationKeys
         tipDonate,
         tipFAQ,
         tipInstallVirtualCableDriver,
+        tipNumModifierHold,
         tipPath,
         tipRelease,
         tipUninstallVirtualCableDriver,

diff --git a/EspionSpotify/FileManager.cs b/EspionSpotify/FileManager.cs
@@ -154,7 +154,7 @@ private static string GenerateFileName(Track track, UserSettings userSettings)
                 fileName = Regex.Replace(fileName, _windowsExlcudedChars, string.Empty);
             }
 
-            var trackNumber = userSettings.OrderNumber?.ToString("000 ") ?? null;
+            var trackNumber = userSettings.OrderNumberInfrontOfFileEnabled ? (userSettings.OrderNumberAsFile ?? 0).ToString($"{userSettings.OrderNumberMask} ") : null;
             return Regex.Replace($"{trackNumber}{fileName}", @"\s", userSettings.TrackTitleSeparator); ;
         }
 

diff --git a/EspionSpotify/Models/UserSettings.cs b/EspionSpotify/Models/UserSettings.cs
@@ -25,6 +25,14 @@ public class UserSettings
         public string RecordingTimer { get; set; }
         public string SpotifyAPIClientId { get; set; }
         public string SpotifyAPISecretId { get; set; }
+        public string OrderNumberMask { get; set; } = "000";
+        public int OrderNumberMax
+        {
+            get
+            {
+                return Convert.ToInt32(OrderNumberMask.Replace('0', '9').ToString());
+            }
+        }
 
         public IMainAudioSession AudioSession { get => _audioSession; }
 
@@ -48,9 +56,19 @@ public double RecordingTimerMilliseconds
                 : 0.0;
         }
 
-        public int? OrderNumber
+        public bool HasOrderNumberEnabled
+        {
+            get => OrderNumberInfrontOfFileEnabled || OrderNumberInMediaTagEnabled;
+        }
+
+        public int? OrderNumberAsTag
+        {
+            get => OrderNumberInMediaTagEnabled ? (int?)InternalOrderNumber : null;
+        }
+
+        public int? OrderNumberAsFile
         {
-            get => OrderNumberInfrontOfFileEnabled || OrderNumberInMediaTagEnabled ? (int?)InternalOrderNumber : null;
+            get => OrderNumberInfrontOfFileEnabled ? (int?)Math.Min(InternalOrderNumber, OrderNumberMax) : null;
         }
 
         public bool IsSpotifyAPISet

diff --git a/EspionSpotify/Properties/Settings.Designer.cs b/EspionSpotify/Properties/Settings.Designer.cs
diff --git a/EspionSpotify/Properties/Settings.settings b/EspionSpotify/Properties/Settings.settings
@@ -70,5 +70,8 @@
       <Value Profile="(Default)">
         </Value>
     </Setting>
+    <Setting Name="OrderNumberMask" Type="System.String" Scope="User">
+      <Value Profile="(Default)">000</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/EspionSpotify/Recorder.cs b/EspionSpotify/Recorder.cs
@@ -155,7 +155,7 @@ private async Task UpdateOutputFileBasedOnMediaFormat()
                     {
                         Track = _track,
                         OrderNumberInMediaTagEnabled = _userSettings.OrderNumberInMediaTagEnabled,
-                        Count = _userSettings.OrderNumber,
+                        Count = _userSettings.OrderNumberAsTag,
                         CurrentFile = _currentOutputFile.ToString()
                     };
                     await mp3TagsInfo.SaveMediaTags();

diff --git a/EspionSpotify/Translations/I18nKeys.cs b/EspionSpotify/Translations/I18nKeys.cs
@@ -35,6 +35,7 @@ public static class I18nKeys
         public static TranslationKeys LogAd { get => TranslationKeys.logAd; }
         public static TranslationKeys LogDeleting { get => TranslationKeys.logDeleting; }
         public static TranslationKeys LogInvalidOutput { get => TranslationKeys.logInvalidOutput; }
+        public static TranslationKeys LogMaxFileSequenceReached { get => TranslationKeys.logMaxFileSequenceReached; }
         public static TranslationKeys LogMissingDlls { get => TranslationKeys.logMissingDlls; }
         public static TranslationKeys LogNoAccessOutput { get => TranslationKeys.logNoAccessOutput; }
         public static TranslationKeys LogPreviousLogs { get => TranslationKeys.logPreviousLogs; }
@@ -72,6 +73,7 @@ public static class I18nKeys
         public static TranslationKeys TipFAQ { get => TranslationKeys.tipFAQ; }
         public static TranslationKeys TipDirectory { get => TranslationKeys.tipDirectory; }
         public static TranslationKeys TipInstallVirtualCableDriver { get => TranslationKeys.tipInstallVirtualCableDriver; }
+        public static TranslationKeys TipNumModifierHold { get => TranslationKeys.tipNumModifierHold; }
         public static TranslationKeys TipPath { get => TranslationKeys.tipPath; }
         public static TranslationKeys TipRelease { get => TranslationKeys.tipRelease; }
         public static TranslationKeys TipUninstallVirtualCableDriver { get => TranslationKeys.tipUninstallVirtualCableDriver; }

diff --git a/EspionSpotify/Translations/de.Designer.cs b/EspionSpotify/Translations/de.Designer.cs
diff --git a/EspionSpotify/Translations/de.resx b/EspionSpotify/Translations/de.resx
@@ -177,14 +177,6 @@
     <value>Werbung stummschalten</value>
     <comment>interface</comment>
   </data>
-  <data name="lblNumFiles" xml:space="preserve">
-    <value>Füge Aufnahmereihenfolgenummer am Anfang aller Dateinamen hinzu</value>
-    <comment>interface</comment>
-  </data>
-  <data name="lblNumTracks" xml:space="preserve">
-    <value>Ersetze die Titelnummer durch die Aufnahmereihenfolgenummer</value>
-    <comment>interface</comment>
-  </data>
   <data name="lblPath" xml:space="preserve">
     <value>Ausgabepfad:</value>
     <comment>interface</comment>
@@ -193,10 +185,6 @@
     <value>Aufnahmegerät:</value>
     <comment>interface</comment>
   </data>
-  <data name="lblRecordingNum" xml:space="preserve">
-    <value>Wähle die Startnummer der Aufnahmereihenfolgenummer</value>
-    <comment>interface</comment>
-  </data>
   <data name="lblRecordUnknownTrackType" xml:space="preserve">
     <value>Aufnehmen nicht erkannte Stücke als Werbung</value>
     <comment>interface</comment>
@@ -389,4 +377,24 @@
     <value>Speichere</value>
     <comment>interface</comment>
   </data>
+  <data name="tipNumModifierHold" xml:space="preserve">
+    <value>STRG wirkt sich auf den Maskenwert aus</value>
+    <comment>interface</comment>
+  </data>
+  <data name="lblNumFiles" xml:space="preserve">
+    <value>Fügen Sie die Zählernummer vor allen Dateinamen hinzu</value>
+    <comment>interface</comment>
+  </data>
+  <data name="lblNumTracks" xml:space="preserve">
+    <value>Ersetzen Sie die Titelnummer durch den Zählerwert</value>
+    <comment>interface</comment>
+  </data>
+  <data name="lblRecordingNum" xml:space="preserve">
+    <value>Wählen Sie die Startposition des Zählers</value>
+    <comment>interface</comment>
+  </data>
+  <data name="logMaxFileSequenceReached" xml:space="preserve">
+    <value>// Zähler: Maximales Dateisequenzpräfix von {0} erreicht</value>
+    <comment>console</comment>
+  </data>
 </root>
diff --git a/EspionSpotify/Translations/en.Designer.cs b/EspionSpotify/Translations/en.Designer.cs
diff --git a/EspionSpotify/Translations/en.resx b/EspionSpotify/Translations/en.resx
@@ -178,11 +178,11 @@
     <comment>interface</comment>
   </data>
   <data name="lblNumFiles" xml:space="preserve">
-    <value>Add the recording order number infront of all files name</value>
+    <value>Add the counter number in front of all files name</value>
     <comment>interface</comment>
   </data>
   <data name="lblNumTracks" xml:space="preserve">
-    <value>Replace track numbers by the recording order number</value>
+    <value>Replace track number by the counter value</value>
     <comment>interface</comment>
   </data>
   <data name="lblPath" xml:space="preserve">
@@ -194,7 +194,7 @@
     <comment>interface</comment>
   </data>
   <data name="lblRecordingNum" xml:space="preserve">
-    <value>Choose the starting position of the recording order number</value>
+    <value>Choose the starting position of the counter</value>
     <comment>interface</comment>
   </data>
   <data name="lblRecordUnknownTrackType" xml:space="preserve">
@@ -389,4 +389,12 @@
     <value>Duplicate</value>
     <comment>interface</comment>
   </data>
+  <data name="logMaxFileSequenceReached" xml:space="preserve">
+    <value>// Counter: Max file sequence prefix of {0} reached</value>
+    <comment>console</comment>
+  </data>
+  <data name="tipNumModifierHold" xml:space="preserve">
+    <value>CTRL affects the mask value</value>
+    <comment>interface</comment>
+  </data>
 </root>