[whimsy] branch master updated: Fix up lists for cclas and grants

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 488ccf5  Fix up lists for cclas and grants
488ccf5 is described below

commit 488ccf57d90ac496c40496e8a4d641f301ddb2c5
Author: Sebb <s...@apache.org>
AuthorDate: Thu Dec 16 20:59:03 2021 +0000

    Fix up lists for cclas and grants
---
 lib/whimsy/asf/documents.rb | 48 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/lib/whimsy/asf/documents.rb b/lib/whimsy/asf/documents.rb
index c95a797..4ee9a27 100644
--- a/lib/whimsy/asf/documents.rb
+++ b/lib/whimsy/asf/documents.rb
@@ -4,13 +4,40 @@ require 'json'
 
 module ASF
 
+  module DocumentUtils
+    # create/update cache file
+    def self.update_cache(type, cache_dir)
+      file, _ = ASF::SVN.listingNames(type, cache_dir)
+      mtime = begin
+        File.mtime(file)
+      rescue Errno::ENOENT
+        0
+      end
+      age = (Time.now - mtime).to_i
+      if age > 600 # 5 minutes
+        Wunderbar.warn "Updating listing #{file} #{age}"
+        require 'whimsy/asf/rack'
+        ASF::Auth.decode(env = {})
+        filerev, svnrev = ASF::SVN.updatelisting(type, env.user, env.password, 
false, cache_dir)
+        if filerev && svnrev # it worked
+          FileUtils.touch file # last time it was checked
+        else
+          # raise IOError.new("Failed to fetch iclas.txt: #{svnrev}")
+          Wunderbar.warn("User #{env.user}: failed to update #{type}: 
#{svnrev}")
+        end
+      end
+    end
+  end
+
   # Common class for access to documents/cclas/
   class CCLAFiles
 
     # listing of top-level icla file/directory names
     # Directories are listed without trailing "/"
     def self.listnames
-      _, list = ASF::SVN.getlisting('cclas') # do we need to cache the listing?
+      cache_dir = ASF::Config.get(:cache)
+      DocumentUtils.update_cache('cclas', cache_dir)
+      _, list = ASF::SVN.getlisting('cclas', nil, true, false, cache_dir)
       list
     end
 
@@ -27,7 +54,9 @@ module ASF
     # listing of top-level grants file/directory names
     # Directories are listed without trailing "/"
     def self.listnames
-      _, list = ASF::SVN.getlisting('grants') # do we need to cache the 
listing?
+      cache_dir = ASF::Config.get(:cache)
+      DocumentUtils.update_cache('grants', cache_dir)
+      _, list = ASF::SVN.getlisting('grants', nil, true, false, cache_dir) # 
do we need to cache the listing?
       list
     end
 
@@ -94,20 +123,7 @@ module ASF
       iclas = 'iclas'
       cache_dir = ASF::Config.get(:cache)
       # iclas.txt no longer updated by cronjob
-      file, _ = ASF::SVN.listingNames(iclas, cache_dir)
-      age = (Time.now - begin File.mtime(file) rescue 0 end).to_i
-      if age > 600 # 5 minutes
-        Wunderbar.warn "Updating listing #{file} #{age}"
-        require 'whimsy/asf/rack'
-        ASF::Auth.decode(env = {})
-        filerev, svnrev = ASF::SVN.updatelisting(iclas, env.user, 
env.password, false, cache_dir)
-        if filerev && svnrev # it worked
-          FileUtils.touch file # last time it was checked
-        else
-          # raise IOError.new("Failed to fetch iclas.txt: #{svnrev}")
-          Wunderbar.warn("User #{env.user}: failed to fetch iclas.txt: 
#{svnrev}")
-        end
-      end
+      DocumentUtils.update_cache(iclas, cache_dir)
       @@tag, list = ASF::SVN.getlisting(iclas, @@tag, false, false, cache_dir)
       if list # we have a new list
         # update the list cache