Changeset 5f9d3a09ef35ffe149aa080e6377d811a1994291

Timestamp:

03/07/10 21:17:47 (5 months ago)

Author:

Giuseppe Bilotta <giuseppe.bilotta@…>

Children:

8893bf66c0aa6f2bbf2e2941f7be82486fecdb46

Parents:

38c076622c020e509c8f1dca4e3168ea38f5999e

git-committer:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1267985867 +0100

Message:

Time parsing: also parse months and years

Files:

• lib/rbot/core/utils/parse_time.rb (modified) (4 diffs)

lib/rbot/core/utils/parse_time.rb

@@ -78 +78 @@
       FRACTION_RX = Regexp.new FRACTIONS.keys.join('|')
 
-      UNITSPEC_RX = /(s(?:ec(?:ond)?s?)?|m(?:in(?:ute)?s?)?|h(?:(?:ou)?rs?)?|d(?:ays?)?|weeks?)/
+      UNITSPEC_RX = /(years?|months?|s(?:ec(?:ond)?s?)?|m(?:in(?:ute)?s?)?|h(?:(?:ou)?rs?)?|d(?:ays?)?|weeks?)/
 
       # str must much UNITSPEC_RX
@@ -86 +86 @@
           1
         when :m
-          60
+          if str[1,1] == 'o'
+            # months
+            3600*24*30
+          else
+            #minutes
+            60
+          end
         when :h
           3600
@@ -93 +99 @@
         when :w
           3600*24*7
+        when :y
+          3600*24*365
         end
       end
@@ -129 +137 @@
               end
             end
-          frac = $5
-          unit = ParseTime.time_unit($6)
-          clean.strip!
-          if frac.nil? and clean.sub!(/^and\s+(#{FRACTION_RX})/, '')
-            frac = $1
-          end
-          if frac
-            num += FRACTIONS[frac.intern]
-          end
+            frac = $5
+            unit = ParseTime.time_unit($6)
+            clean.strip!
+            if frac.nil? and clean.sub!(/^and\s+(#{FRACTION_RX})/, '')
+              frac = $1
+            end
+            if frac
+              num += FRACTIONS[frac.intern]
+            end
           else
             raise "invalid time string: #{clean} (parsed #{sofar} so far)"