ohac-ricalv 0.1.4 → 0.1.5

data/lib/ricalv.rb

@@ -31,6 +31,10 @@ class Date
 end
 end
 
+def escseq(str = '')
+  "\x1b[#{str}m"
+end
+
 WEEKTABLE = { 'SU' => 7, 'MO' => 1, 'TU' => 2,
               'WE' => 3, 'TH' => 4, 'FR' => 5, 'SA' => 6 }
 KEYS = [ 'FREQ', 'BYDAY', 'BYMONTH', 'WKST', 'UNTIL', 'INTERVAL' ]
@@ -58,7 +62,8 @@ icss = icss.map { |fn|
   when /http:\/\//
     FileUtils.mkdir_p(CACHEDIR)
     d = CACHEDIR + '/' + Digest::MD5.hexdigest(fn)
-    `wget -q -O #{d} #{fn}`
+    expire = File.exist?(d) && (File.mtime(d).to_i + 10 * 60) # 10 min
+    `wget -q -O #{d} #{fn}` if !expire || Time.now.to_i > expire
     d
   else
     HOME + '/' + fn
@@ -69,12 +74,14 @@ calss = icss.map { |fn|
   File.open(fn) { |f| Icalendar.parse(f) }
 }
 
+colors = [ '31', '32', '33', '35', '36', '37' ] * 10 # TODO
 items = calss.map { |cals|
+  color = colors.shift
   cals.map { |cal|
     cal.events.map { |event|
       lines = []
       d = Date.parse(event.dtstart.to_s)
-      lines << { :d => d, :e => event }
+      lines << { :d => d, :e => event, :color => color }
       rrule = event.properties["rrule"]
       if rrule
         rulehash = {}
@@ -120,7 +127,7 @@ items = calss.map { |cals|
               d += 1 while d.cwday != week
               d += (day - 1) * 7
             end
-            lines << { :d => d, :e => event }
+            lines << { :d => d, :e => event, :color => color }
             d = d.next_year
             d = Date.new(d.year, mon, 1) if mon
           end
@@ -131,11 +138,27 @@ items = calss.map { |cals|
   }
 }.flatten
 
-items << {:d => today, :t => '*** TODAY ***'}
+items << {:d => today, :t => '*** TODAY ***', :color => '32' }
 
 items = items.select{|v|
   d = v[:d]
   d.year == today.year && d.month == today.month
 }
-items = items.map{|v| "#{v[:d].to_s}(#{WEEKTOSTR[v[:d].wday]}) #{v[:t] || v[:e].summary}"}
+keys = items.map{|v| v[:d]}.uniq
+items = keys.inject({}){|h,v| h[v] = items.select{|x| x[:d] == v}; h}
+items = items.map{|k,v|
+  s = v.map{|x|
+    escseq(x[:color]) + (x[:t] || x[:e].summary) + escseq()
+  }.join(', ')
+  w = WEEKTOSTR[k.wday]
+  wc = case k.wday
+  when 0; '31'
+  when 6; '36'
+  end
+  w = escseq(wc) + w + escseq() if wc
+  "#{k}(#{w}) #{s}"
+}
+
+print escseq()
 items.sort.each{|v| puts v}
+print escseq()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohac-ricalv
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - OHASHI Hideya