Merge #3061 Netkan warning for archived repos, set bugtracker for GitHub

KSP-CKAN · May 25, 2020 · 5b08975 · 5b08975
2 parents 6273ca5 + 2117521
commit 5b08975
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Purge stale cache entries for SpaceDock (#2859 by: HebaruSan; reviewed: DasSkelett)
 - [Netkan] NetKAN warnings (#3045 by: HebaruSan; reviewed: DasSkelett)
 - [Netkan] Support fallback URLs for netkan validate-ckan (#3060 by: HebaruSan; reviewed: DasSkelett)
+- [Netkan] Netkan warning for archived repos, set bugtracker for GitHub (#3061 by: HebaruSan; reviewed: DasSkelett)
 
 ## v1.27.2 (Chandrasekhar)
 

diff --git a/Netkan/Services/CachingHttpService.cs b/Netkan/Services/CachingHttpService.cs
@@ -12,8 +12,8 @@ internal sealed class CachingHttpService : IHttpService
         private          bool         _overwriteCache = false;
         private Dictionary<Uri, StringCacheEntry> _stringCache = new Dictionary<Uri, StringCacheEntry>();
 
-        // Re-use string value URLs within 2 minutes
-        private static readonly TimeSpan stringCacheLifetime = new TimeSpan(0, 2, 0);
+        // Re-use string value URLs within 15 minutes
+        private static readonly TimeSpan stringCacheLifetime = new TimeSpan(0, 15, 0);
 
         public CachingHttpService(NetFileCache cache, bool overwrite = false)
         {

diff --git a/Netkan/Sources/Github/GithubRepo.cs b/Netkan/Sources/Github/GithubRepo.cs
@@ -21,28 +21,34 @@ public sealed class GithubRepo
 
         [JsonProperty("license")]
         public GithubLicense License { get; set; }
-        
+
         [JsonProperty("parent")]
         public GithubRepo ParentRepo { get; set; }
-        
+
         [JsonProperty("source")]
         public GithubRepo SourceRepo { get; set; }
-        
+
         [JsonProperty("owner")]
         public GithubUser Owner { get; set; }
+
+        [JsonProperty("has_issues")]
+        public bool HasIssues { get; set; }
+
+        [JsonProperty("archived")]
+        public bool Archived { get; set; }
     }
 
     public class GithubLicense
     {
         [JsonProperty("spdx_id")]
         public string Id;
     }
-    
+
     public class GithubUser
     {
         [JsonProperty("login")]
         public string Login { get; set; }
-        
+
         [JsonProperty("type")]
         public string Type { get; set; }
     }

diff --git a/Netkan/Transformers/GithubTransformer.cs b/Netkan/Transformers/GithubTransformer.cs
@@ -56,6 +56,10 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
 
                 // Get the GitHub repository
                 var ghRepo = _api.GetRepo(ghRef);
+                if (ghRepo.Archived)
+                {
+                    Log.Warn("Repo is archived, consider freezing");
+                }
                 var versions = _api.GetAllReleases(ghRef);
                 if (opts.SkipReleases.HasValue)
                 {
@@ -103,6 +107,10 @@ private Metadata TransformOne(Metadata metadata, JObject json, GithubRef ghRef,
                 resourcesJson.SafeAdd("homepage", ghRepo.Homepage);
 
             resourcesJson.SafeAdd("repository", ghRepo.HtmlUrl);
+            if (ghRepo.HasIssues)
+            {
+                resourcesJson.SafeAdd("bugtracker", $"{ghRepo.HtmlUrl}/issues");
+            }
 
             if (ghRelease != null)
             {

diff --git a/Netkan/Validators/ModuleManagerDependsValidator.cs b/Netkan/Validators/ModuleManagerDependsValidator.cs
@@ -6,6 +6,7 @@
 using log4net;
 using CKAN.NetKAN.Services;
 using CKAN.NetKAN.Model;
+using CKAN.Extensions;
 
 namespace CKAN.NetKAN.Validators
 {
@@ -30,17 +31,21 @@ public void Validate(Metadata metadata)
                 {
                     ZipFile zip  = new ZipFile(package);
 
-                    bool hasMMsyntax = _moduleService.GetConfigFiles(mod, zip)
-                        .Select(cfg => new StreamReader(zip.GetInputStream(cfg.source)).ReadToEnd())
-                        .Any(contents => moduleManagerRegex.IsMatch(contents));
+                    var mmConfigs = _moduleService.GetConfigFiles(mod, zip)
+                        .Where(cfg => moduleManagerRegex.IsMatch(
+                            new StreamReader(zip.GetInputStream(cfg.source)).ReadToEnd()))
+                        .Memoize();
 
                     bool dependsOnMM = mod?.depends?.Any(r => r.ContainsAny(identifiers)) ?? false;
 
-                    if (hasMMsyntax && !dependsOnMM)
+                    if (!dependsOnMM && mmConfigs.Any())
                     {
-                        Log.Warn("ModuleManager syntax used without ModuleManager dependency");
+                        Log.WarnFormat(
+                            "ModuleManager syntax used without ModuleManager dependency: {0}",
+                            string.Join(", ", mmConfigs.Select(cfg => cfg.source))
+                        );
                     }
-                    else if (!hasMMsyntax && dependsOnMM)
+                    else if (dependsOnMM && !mmConfigs.Any())
                     {
                         Log.Warn("ModuleManager dependency may not be needed, no ModuleManager syntax found");
                     }
@@ -51,7 +56,7 @@ public void Validate(Metadata metadata)
         private string[] identifiers = new string[] { "ModuleManager" };
 
         private static readonly Regex moduleManagerRegex = new Regex(
-            @"^\s*[@+$\-!%]",
+            @"^\s*[@+$\-!%]|^\s*[a-zA-Z0-9_]+:",
             RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline
         );