That seems to have improved the matching, though there are still a few files that don't match any of the names (Public, Legal, members.txt)
I hope to commit some checking code soon On 26 June 2018 at 17:10, <s...@apache.org> wrote: > 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 43914f5 Use new MemApps code instead > 43914f5 is described below > > commit 43914f5b5055ee8a30dfb2d4deed960412beccdf > Author: Sebb <s...@apache.org> > AuthorDate: Tue Jun 26 17:10:39 2018 +0100 > > Use new MemApps code instead > --- > www/roster/models/committer.rb | 21 ++++----------------- > 1 file changed, 4 insertions(+), 17 deletions(-) > > diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb > index 52d0c68..453bbfc 100644 > --- a/www/roster/models/committer.rb > +++ b/www/roster/models/committer.rb > @@ -1,3 +1,5 @@ > +require 'whimsy/asf/memapps' > + > class Committer > > def self.serialize(id, env) > @@ -127,23 +129,8 @@ class Committer > member[:info] = person.members_txt > > if person.icla # not all members have iclas > - apps = ASF::SVN['member_apps'] > - [ > - person.icla.legal_name, > - person.icla.name, > - # allow for member in LDAP to not be in members.txt (e.g. infra > staff) > - (member[:info] or "?\n").split("\n").first.strip > - ].uniq.each do |name| > - next unless name > - memapp = name.downcase.gsub(/\s/, '-').untaint > - if apps > - # find either matching dir or name with extension > - file = Dir[File.join(apps, memapp), File.join(apps, > "#{memapp}.*")].first > - if file > - response[:forms][:member] = File.basename(file) > - end > - end > - end > + file = ASF::MemApps.find1st(person) > + response[:forms][:member] = file if file > end > else > if person.member_nomination >
