2024.51.1

- PointEntry, SongEntry, SongInterfaces, Pairings namespaces synchronized
simon-techkid · Jun 28, 2024 · f42f3f4 · f42f3f4
1 parent 80a5e71
commit f42f3f4
Show file tree

Hide file tree

Showing 37 changed files with 75 additions and 47 deletions.
diff --git a/SpotifyGPX/Api/ISpotifyApiProportionable.cs b/SpotifyGPX/Api/ISpotifyApiProportionable.cs
@@ -1,5 +1,7 @@
 // SpotifyGPX by Simon Field
 
+using SpotifyGPX.SongInterfaces;
+
 namespace SpotifyGPX.Api;
 
 /// <summary>

diff --git a/SpotifyGPX/ISongEntry.cs b/SpotifyGPX/ISongEntry.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Input;
+using SpotifyGPX.SongInterfaces;
 using System;
 
 namespace SpotifyGPX;

diff --git a/SpotifyGPX/Input/Csv.cs b/SpotifyGPX/Input/Csv.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/SpotifyGPX/Input/GeoJson.cs b/SpotifyGPX/Input/GeoJson.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.PointEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/Gpx.cs b/SpotifyGPX/Input/Gpx.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.PointEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/Json.cs b/SpotifyGPX/Input/Json.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/JsonReport.cs b/SpotifyGPX/Input/JsonReport.cs
@@ -1,6 +1,8 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.PointEntry;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Data;

diff --git a/SpotifyGPX/Input/Kml.cs b/SpotifyGPX/Input/Kml.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.PointEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/PointTest.cs b/SpotifyGPX/Input/PointTest.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.PointEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/SongTest.cs b/SpotifyGPX/Input/SongTest.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Input/Xspf.cs b/SpotifyGPX/Input/Xspf.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Options.cs b/SpotifyGPX/Options.cs
@@ -5,6 +5,8 @@
 using SpotifyGPX.Input;
 using SpotifyGPX.Observation;
 using SpotifyGPX.Output;
+using SpotifyGPX.PointEntry;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -125,33 +127,6 @@ private static string Help
             }
         }
     }
-
-    public partial struct LastFmEntry
-    {
-        private const TimeUsage timeUsage = TimeUsage.Start;
-    }
-
-    public partial struct SpotifyEntry
-    {
-        private static TimeUsage timeUsage => TimeUsage.End;
-    }
-
-    public partial struct XspfEntry
-    {
-        private const TimeUsage timeUsage = TimeUsage.Start;
-    }
-
-    public partial class PairingsHandler
-    {
-        protected override string BroadcasterPrefix => "PAIR";
-        private static double? MaximumAbsAccuracy => null; // Greatest accepted error (in seconds) between song and point time (null = allow all pairings regardless of accuracy)
-    }
-
-    public partial class DupeHandler
-    {
-        protected override string BroadcasterPrefix => "DUPE";
-        private const int MinimumMatchingCoords = 2; // Minimum number of matching coordinates to be considered a duplicate
-    }
 }
 
 namespace SpotifyGPX.Input
@@ -577,4 +552,37 @@ public partial class FileObserver
     {
         protected override Func<LogLevel, bool> MessageMatch => lvl => lvl >= LogLevel.Debug;
     }
+}
+
+namespace SpotifyGPX.Pairings
+{
+    public partial class PairingsHandler
+    {
+        protected override string BroadcasterPrefix => "PAIR";
+        private static double? MaximumAbsAccuracy => null; // Greatest accepted error (in seconds) between song and point time (null = allow all pairings regardless of accuracy)
+    }
+
+    public partial class DupeHandler
+    {
+        protected override string BroadcasterPrefix => "DUPE";
+        private const int MinimumMatchingCoords = 2; // Minimum number of matching coordinates to be considered a duplicate
+    }
+}
+
+namespace SpotifyGPX.SongEntry
+{
+    public partial struct LastFmEntry
+    {
+        private const TimeUsage timeUsage = TimeUsage.Start;
+    }
+
+    public partial struct SpotifyEntry
+    {
+        private static TimeUsage timeUsage => TimeUsage.End;
+    }
+
+    public partial struct XspfEntry
+    {
+        private const TimeUsage timeUsage = TimeUsage.Start;
+    }
 }
diff --git a/SpotifyGPX/Output/Json.cs b/SpotifyGPX/Output/Json.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Output/Txt.cs b/SpotifyGPX/Output/Txt.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongEntry;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/Output/Xlsx.cs b/SpotifyGPX/Output/Xlsx.cs
@@ -5,6 +5,7 @@
 using OfficeOpenXml.Style;
 using OfficeOpenXml.Table;
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongInterfaces;
 using System;
 using System.Collections.Generic;
 using System.Drawing;

diff --git a/SpotifyGPX/Output/Xspf.cs b/SpotifyGPX/Output/Xspf.cs
@@ -1,6 +1,7 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Broadcasting;
+using SpotifyGPX.SongInterfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/SpotifyGPX/DupeHandler.cs → SpotifyGPX/Pairings/DupeHandler.cs b/SpotifyGPX/DupeHandler.cs → SpotifyGPX/Pairings/DupeHandler.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 /// <summary>
 /// Handle duplicate coordinate placements by shifting them to other locations.

diff --git a/SpotifyGPX/DupeHandlerAuto.cs → SpotifyGPX/Pairings/DupeHandlerAuto.cs b/SpotifyGPX/DupeHandlerAuto.cs → SpotifyGPX/Pairings/DupeHandlerAuto.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public class DupeHandlerAuto : DupeHandler
 {

diff --git a/SpotifyGPX/DupeHandlerManual.cs → SpotifyGPX/Pairings/DupeHandlerManual.cs b/SpotifyGPX/DupeHandlerManual.cs → SpotifyGPX/Pairings/DupeHandlerManual.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public class DupeHandlerManual : DupeHandler
 {

diff --git a/SpotifyGPX/PairerVanilla.cs → SpotifyGPX/Pairings/PairerVanilla.cs b/SpotifyGPX/PairerVanilla.cs → SpotifyGPX/Pairings/PairerVanilla.cs
@@ -2,7 +2,7 @@
 
 using SpotifyGPX.Broadcasting;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public class PairerVanilla : PairingsHandler
 {

diff --git a/SpotifyGPX/PairingsFactory.cs → SpotifyGPX/Pairings/PairingsFactory.cs b/SpotifyGPX/PairingsFactory.cs → SpotifyGPX/Pairings/PairingsFactory.cs
@@ -3,7 +3,7 @@
 using SpotifyGPX.Broadcasting;
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public abstract class PairingsFactory : StringBroadcasterBase
 {

diff --git a/SpotifyGPX/PairingsFromPairings.cs → SpotifyGPX/Pairings/PairingsFromPairings.cs b/SpotifyGPX/PairingsFromPairings.cs → SpotifyGPX/Pairings/PairingsFromPairings.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public class PairingsFromPairings : PairingsFactory
 {

diff --git a/SpotifyGPX/PairingsFromSongsAndPoints.cs → ...PX/Pairings/PairingsFromSongsAndPoints.cs b/SpotifyGPX/PairingsFromSongsAndPoints.cs → ...PX/Pairings/PairingsFromSongsAndPoints.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 public class PairingsFromSongsAndPoints : PairingsFactory
 {

diff --git a/SpotifyGPX/PairingsHandler.cs → SpotifyGPX/Pairings/PairingsHandler.cs b/SpotifyGPX/PairingsHandler.cs → SpotifyGPX/Pairings/PairingsHandler.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.Pairings;
 
 /// <summary>
 /// Handle SongPoint pairings, including list calculation, generation, operations, and exporting.

diff --git a/SpotifyGPX/PointEntries/GenericPoint.cs → SpotifyGPX/PointEntry/GenericPoint.cs b/SpotifyGPX/PointEntries/GenericPoint.cs → SpotifyGPX/PointEntry/GenericPoint.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.PointEntry;
 
 public struct GenericPoint : IGpsPoint
 {

diff --git a/SpotifyGPX/PointEntries/GeoJsonPoint.cs → SpotifyGPX/PointEntry/GeoJsonPoint.cs b/SpotifyGPX/PointEntries/GeoJsonPoint.cs → SpotifyGPX/PointEntry/GeoJsonPoint.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.PointEntry;
 
 public struct GeoJsonPoint : IGpsPoint
 {

diff --git a/SpotifyGPX/PointEntries/GpxPoint.cs → SpotifyGPX/PointEntry/GpxPoint.cs b/SpotifyGPX/PointEntries/GpxPoint.cs → SpotifyGPX/PointEntry/GpxPoint.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.PointEntry;
 
 public struct GpxPoint : IGpsPoint
 {

diff --git a/SpotifyGPX/PointEntries/KmlPoint.cs → SpotifyGPX/PointEntry/KmlPoint.cs b/SpotifyGPX/PointEntries/KmlPoint.cs → SpotifyGPX/PointEntry/KmlPoint.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.PointEntry;
 
 public struct KmlPoint : IGpsPoint
 {

diff --git a/SpotifyGPX/Program.cs b/SpotifyGPX/Program.cs
@@ -3,6 +3,7 @@
 using SpotifyGPX.Broadcasting;
 using SpotifyGPX.Observation;
 using SpotifyGPX.Output;
+using SpotifyGPX.Pairings;
 using System;
 using System.Collections.Generic;
 

diff --git a/SpotifyGPX/SongEntries/GenericEntry.cs → SpotifyGPX/SongEntry/GenericEntry.cs b/SpotifyGPX/SongEntries/GenericEntry.cs → SpotifyGPX/SongEntry/GenericEntry.cs
@@ -3,7 +3,7 @@
 using SpotifyGPX.Input;
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongEntry;
 
 public struct GenericEntry : ISongEntry
 {

diff --git a/SpotifyGPX/SongEntries/LastFmEntry.cs → SpotifyGPX/SongEntry/LastFmEntry.cs b/SpotifyGPX/SongEntries/LastFmEntry.cs → SpotifyGPX/SongEntry/LastFmEntry.cs
@@ -3,7 +3,7 @@
 using SpotifyGPX.Input;
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongEntry;
 
 public partial struct LastFmEntry : ISongEntry
 {

diff --git a/SpotifyGPX/SongEntries/SpotifyEntry.cs → SpotifyGPX/SongEntry/SpotifyEntry.cs b/SpotifyGPX/SongEntries/SpotifyEntry.cs → SpotifyGPX/SongEntry/SpotifyEntry.cs
@@ -2,11 +2,12 @@
 
 using SpotifyGPX.Api;
 using SpotifyGPX.Input;
+using SpotifyGPX.SongInterfaces;
 using System;
 using System.Linq;
 using System.Text.Json.Serialization;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongEntry;
 
 public partial struct SpotifyEntry : ISongEntry, IEstimatableSong, ISpotifyApiCompat, ISpotifyApiProportionable, IUrlLinkableSong, IAlbumableSong
 {

diff --git a/SpotifyGPX/SongEntries/XspfEntry.cs → SpotifyGPX/SongEntry/XspfEntry.cs b/SpotifyGPX/SongEntries/XspfEntry.cs → SpotifyGPX/SongEntry/XspfEntry.cs
@@ -1,9 +1,10 @@
 // SpotifyGPX by Simon Field
 
 using SpotifyGPX.Input;
+using SpotifyGPX.SongInterfaces;
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongEntry;
 
 public partial struct XspfEntry : ISongEntry, IEstimatableSong
 {

diff --git a/SpotifyGPX/SongInterfaces/IAlbumableSong.cs b/SpotifyGPX/SongInterfaces/IAlbumableSong.cs
@@ -1,6 +1,6 @@
 // SpotifyGPX by Simon Field
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongInterfaces;
 
 /// <summary>
 /// Provides access to song album names.

diff --git a/SpotifyGPX/SongInterfaces/IDuratableSong.cs b/SpotifyGPX/SongInterfaces/IDuratableSong.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongInterfaces;
 
 /// <summary>
 /// Provides access to song playback durations.

diff --git a/SpotifyGPX/SongInterfaces/IEstimatableSong.cs b/SpotifyGPX/SongInterfaces/IEstimatableSong.cs
@@ -3,7 +3,7 @@
 using SpotifyGPX.Input;
 using System;
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongInterfaces;
 
 /// <summary>
 /// Provides access to estimated start/end times for a song.

diff --git a/SpotifyGPX/SongInterfaces/IUrlLinkableSong.cs b/SpotifyGPX/SongInterfaces/IUrlLinkableSong.cs
@@ -1,6 +1,6 @@
 // SpotifyGPX by Simon Field
 
-namespace SpotifyGPX;
+namespace SpotifyGPX.SongInterfaces;
 
 /// <summary>
 /// Provides access to URLs of songs.