add - doc - Added Radio Mode to the BassBoom addon

--- We've added the radio mode to the BassBoom addon. --- Type: add Breaking: False Doc Required: True Part: 1/1
Aptivi · May 31, 2024 · bd6bf12 · bd6bf12
1 parent 99ffdc3
commit bd6bf12
Show file tree

Hide file tree

Showing 20 changed files with 1,360 additions and 506 deletions.
diff --git a/private/Nitrocid.Analyzers.Test/Nitrocid.Analyzers.Test.csproj b/private/Nitrocid.Analyzers.Test/Nitrocid.Analyzers.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSTest.Sdk/3.4.1">
+<Project Sdk="MSTest.Sdk/3.4.3">
 
   <PropertyGroup>
     <OutputPath>..\KSTest\</OutputPath>

diff --git a/private/Nitrocid.LocaleCheck/Nitrocid.LocaleCheck.csproj b/private/Nitrocid.LocaleCheck/Nitrocid.LocaleCheck.csproj
@@ -18,7 +18,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Terminaux" Version="4.0.0.2" />
+    <PackageReference Include="Terminaux" Version="4.0.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nitrocid.LocaleTools\Nitrocid.LocaleTools.csproj" />

diff --git a/private/Nitrocid.LocaleClean/Nitrocid.LocaleClean.csproj b/private/Nitrocid.LocaleClean/Nitrocid.LocaleClean.csproj
@@ -18,7 +18,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Terminaux" Version="4.0.0.2" />
+    <PackageReference Include="Terminaux" Version="4.0.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nitrocid.LocaleTools\Nitrocid.LocaleTools.csproj" />

diff --git a/private/Nitrocid.LocaleTrim/Nitrocid.LocaleTrim.csproj b/private/Nitrocid.LocaleTrim/Nitrocid.LocaleTrim.csproj
@@ -18,7 +18,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Terminaux" Version="4.0.0.2" />
+    <PackageReference Include="Terminaux" Version="4.0.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nitrocid.LocaleTools\Nitrocid.LocaleTools.csproj" />

diff --git a/private/Nitrocid.Tests/Nitrocid.Tests.csproj b/private/Nitrocid.Tests/Nitrocid.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSTest.Sdk/3.4.1">
+<Project Sdk="MSTest.Sdk/3.4.3">
 
   <PropertyGroup>
     <OutputPath>KSTest\</OutputPath>
@@ -61,7 +61,7 @@
 
   <ItemGroup>
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="Terminaux" Version="4.0.0.2" />
+    <PackageReference Include="Terminaux" Version="4.0.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/BassBoomInit.cs b/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/BassBoomInit.cs
@@ -55,11 +55,17 @@
 using Nitrocid.Files.Paths;
 using Nitrocid.Modifications;
 using System.Linq;
+using Terminaux.Colors;
+using Terminaux.Colors.Data;
+using Nitrocid.Shell.ShellBase.Switches;
 
 namespace Nitrocid.Extras.BassBoom
 {
     internal class BassBoomInit : IAddon
     {
+        internal static Version mpgVer;
+        internal static Version outVer;
+        internal static Color white = new(ConsoleColors.White);
         private readonly ExtensionHandler[] handlers = [
             new(".mp3", "Mp3BassBoom", PlayerHandler.Handle, PlayerHandler.InfoHandle),
             new(".mp2", "Mp3BassBoom", PlayerHandler.Handle, PlayerHandler.InfoHandle),
@@ -80,10 +86,13 @@ internal class BassBoomInit : IAddon
 
             new CommandInfo("musicplayer", /* Localizable */ "Opens an interactive music player",
                 [
-                    new CommandArgumentInfo(new[]
-                    {
+                    new CommandArgumentInfo(
+                    [
                         new CommandArgumentPart(false, "musicFile"),
-                    })
+                    ],
+                    [
+                        new SwitchInfo("r", /* Localizable */ "Opens the radio station player instead")
+                    ])
                 ], new MusicPlayerCommand()),
 
             new CommandInfo("playlyric", /* Localizable */ "Plays a lyric file",
@@ -135,6 +144,10 @@ void IAddon.StartAddon()
             if (!InitBasolia.BasoliaInitialized)
                 InitBasolia.Init(PathsManagement.AddonsPath + "/Extras.BassBoom");
             ExtensionHandlerTools.extensionHandlers.AddRange(handlers);
+
+            // Initialize versions
+            mpgVer = InitBasolia.MpgLibVersion;
+            outVer = InitBasolia.OutLibVersion;
         }
 
         void IAddon.StopAddon()

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/Commands/MusicPlayer.cs b/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/Commands/MusicPlayer.cs
@@ -19,12 +19,12 @@
 
 using Terminaux.Writer.ConsoleWriters;
 using Nitrocid.Extras.BassBoom.Player;
-using Nitrocid.Files;
 using Nitrocid.Files.Operations.Querying;
 using Nitrocid.Kernel.Debugging;
 using Nitrocid.Languages;
 using Nitrocid.Shell.ShellBase.Commands;
 using System;
+using System.Linq;
 
 namespace Nitrocid.Extras.BassBoom.Commands
 {
@@ -42,28 +42,27 @@ public override int Execute(CommandParameters parameters, ref string variableVal
             try
             {
                 // First, prompt for the music path if no arguments are provided.
+                bool isRadio = parameters.SwitchesList.Contains("-r");
                 if (parameters.ArgumentsList.Length != 0)
                 {
-                    string musicPath = FilesystemTools.NeutralizePath(parameters.ArgumentsList[0]);
+                    string musicPath = parameters.ArgumentsList[0];
 
                     // Check for existence.
-                    if (string.IsNullOrEmpty(musicPath))
-                    {
-                        TextWriterColor.Write(Translate.DoTranslation("Music file not specified."));
-                        return 30;
-                    }
-                    if (!Checking.FileExists(musicPath))
+                    if (string.IsNullOrEmpty(musicPath) || (!isRadio && !Checking.FileExists(musicPath)))
                     {
                         TextWriterColor.Write(Translate.DoTranslation("Music file '{0}' doesn't exist."), musicPath);
                         return 31;
                     }
-                    if (!PlayerTui.musicFiles.Contains(musicPath))
-                        PlayerTui.musicFiles.Add(musicPath);
-                    PlayerControls.PopulateMusicFileInfo(musicPath);
+                    if (!isRadio)
+                        PlayerTui.passedMusicPaths.Add(musicPath);
                 }
 
                 // Now, open an interactive TUI
-                PlayerTui.PlayerLoop();
+                Common.exiting = false;
+                if (isRadio)
+                    Radio.RadioLoop();
+                else
+                    PlayerTui.PlayerLoop();
             }
             catch (Exception ex)
             {

diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/Nitrocid.Extras.BassBoom.csproj b/public/Nitrocid.Addons/Nitrocid.Extras.BassBoom/Nitrocid.Extras.BassBoom.csproj
@@ -37,7 +37,7 @@
   <!-- Extras.BassBoom addon Platform Information End -->
 
   <ItemGroup>
-    <PackageReference Include="BassBoom.Basolia" Version="0.0.6.1" />
+    <PackageReference Include="BassBoom.Basolia" Version="0.1.0" />
   </ItemGroup>
 
   <ItemGroup>