Improve package filtering (#97)

nanoframework · Nov 29, 2021 · 7f0975f · 7f0975f
1 parent 351240a
commit 7f0975f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git a/nanoFirmwareFlasher/FirmwarePackage.cs b/nanoFirmwareFlasher/FirmwarePackage.cs
@@ -77,43 +77,8 @@ public static List<CloudSmithPackageDetail> GetTargetList(
             SupportedPlatform? platform,
             VerbosityLevel verbosity)
         {
-            string queryFilter = string.Empty;
-
-            // build query filter according to platform using package name
-            if (platform != null)
-            {
-                List<string> query = new(); 
-
-                switch(platform)
-                {
-                    case SupportedPlatform.esp32:
-                        query.Add("ESP");
-                        query.Add("M5");
-                        query.Add("FEATHER");
-                        query.Add("KALUGA");
-                        break;
-
-                    case SupportedPlatform.stm32:
-                        query.Add("ST");
-                        query.Add("ORGPAL");
-                        query.Add("NETDUINO3");
-                        query.Add("QUAIL");
-                        query.Add("GHI");
-                        query.Add("IngenuityMicro");
-                        query.Add("WeAct");
-                        query.Add("Pyb");
-                        break;
-
-                    case SupportedPlatform.cc13x2:
-                        query.Add("TI");
-                        break;
-                }
-
-                queryFilter = string.Join(" OR ", query.Select(t => $"name:{t}"));
-            }
-
             string repoName = communityTargets ? _communityTargetsRepo : preview ? _refTargetsDevRepo : _refTargetsStableRepo;
-            string requestUri = $"{_cloudsmithPackages}/{repoName}/?query={queryFilter}";
+            string requestUri = $"{_cloudsmithPackages}/{repoName}/?tag={platform}";
             List<CloudSmithPackageDetail> targetPackages = new();
 
             if (verbosity > VerbosityLevel.Normal)

diff --git a/nanoFirmwareFlasher/Options.cs b/nanoFirmwareFlasher/Options.cs
@@ -324,6 +324,6 @@ public enum SupportedPlatform
     {
         esp32 = 0,
         stm32 = 1,
-        cc13x2 = 2
+        ti_simplelink = 2
     }
 }
diff --git a/nanoFirmwareFlasher/Program.cs b/nanoFirmwareFlasher/Program.cs
@@ -256,7 +256,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                 )
                 {
                     // candidates for TI CC13x2
-                    o.Platform = SupportedPlatform.cc13x2;
+                    o.Platform = SupportedPlatform.ti_simplelink;
                 }
                 else
                 {
@@ -302,7 +302,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                 // drivers install
                 else if (o.TIInstallXdsDrivers)
                 {
-                    o.Platform = SupportedPlatform.cc13x2;
+                    o.Platform = SupportedPlatform.ti_simplelink;
                 }
                 else if (
                     o.InstallDfuDrivers
@@ -905,7 +905,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
 
             #region TI CC13x2 platform options
 
-            if (o.Platform == SupportedPlatform.cc13x2)
+            if (o.Platform == SupportedPlatform.ti_simplelink)
             {
                 if (o.TIInstallXdsDrivers)
                 {