whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: some cleanup
Date Tue, 12 Jun 2018 17:18:47 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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 c5d8702  some cleanup
c5d8702 is described below

commit c5d8702c5fca87bad3265c2f4271db67d91782b0
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Tue Jun 12 13:18:34 2018 -0400

    some cleanup
---
 www/board/agenda/daemon/channel.rb | 4 ++++
 www/board/agenda/routes.rb         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/board/agenda/daemon/channel.rb b/www/board/agenda/daemon/channel.rb
index cf0ea15..838238f 100644
--- a/www/board/agenda/daemon/channel.rb
+++ b/www/board/agenda/daemon/channel.rb
@@ -121,6 +121,10 @@ class Channel
           value: YAML.load_file(path)
       elsif path =~ /\/events\/\w+$/
         Events.process()
+      elsif file =~ /^(\w+)\.bak$/
+        nil
+      elsif path =~ /^\/sessions\/\w+$/
+        nil
       elsif file =~ /^board_agenda_\d{4}_\d\d_\d\d\-chat.yml$/
         nil
       else
diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index f0c8195..9cacf40 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -177,7 +177,8 @@ get %r{/(\d\d\d\d-\d\d-\d\d)/(.*)} do |date, path|
   file = File.join(AGENDA_WORK, 'sessions', 'present.yml')
   if File.exist?(file) and File.mtime(file) != @present_mtime
     @present_mtime = File.mtime(file)
-    @present = YAML.load_file(file)
+    @present = YAML.load_file(file).
+      reject! {|name| name =~ /^board_agenda_[_\d]+$/}
   end
 
   if env['SERVER_NAME'] == 'localhost'

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.

Mime
View raw message