[modgen] ajustements encore si pas d'internet

klee-contrib · Sep 16, 2024 · f0cfe6d · f0cfe6d
1 parent dc00ef6
commit f0cfe6d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/TopModel.Generator/Program.cs b/TopModel.Generator/Program.cs
@@ -339,7 +339,7 @@ void HandleFile(FileInfo file)
 
         if (!topModelLock.Modules.TryGetValue(configKey, out var moduleVersion))
         {
-            moduleVersion = await NugetUtils.GetLatestVersionAsync(fullModuleName);
+            moduleVersion = await NugetUtils.GetLatestVersionAsync(fullModuleName, forceCheck: true);
 
             if (moduleVersion == null)
             {

diff --git a/TopModel.Utils/NugetUtils.cs b/TopModel.Utils/NugetUtils.cs
@@ -45,13 +45,8 @@ public static async Task<PackageArchiveReader> DownloadPackageAsync(string id, s
         return new PackageArchiveReader(packageStream);
     }
 
-    public static async Task<TopModelLockModule?> GetLatestVersionAsync(string id)
+    public static async Task<TopModelLockModule?> GetLatestVersionAsync(string id, bool forceCheck = false)
     {
-        if (cantCheckVersion)
-        {
-            return null;
-        }
-
         if (Versions.TryGetValue(id, out var cachedVersion))
         {
             if (cachedVersion.CheckDate.AddHours(6) < DateTime.UtcNow)
@@ -62,13 +57,20 @@ public static async Task<PackageArchiveReader> DownloadPackageAsync(string id, s
             {
                 if (cachedVersion.Version == null)
                 {
-                    return null;
+                    cantCheckVersion = true;
+                }
+                else
+                {
+                    return new TopModelLockModule { Version = cachedVersion.Version };
                 }
-
-                return new TopModelLockModule { Version = cachedVersion.Version };
             }
         }
 
+        if (cantCheckVersion && !forceCheck)
+        {
+            return null;
+        }
+
         try
         {
             var nugetResource = await GetNugetResourceAsync();