Merge pull request #72 from CrimsonVoid/1.2

Fixes #70
R-a-dio · Mar 6, 2013 · 784184b · 784184b
2 parents a443532 + 362e063
commit 784184b
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/hanyuu_commands.py b/hanyuu_commands.py
@@ -117,24 +117,26 @@ def lp(server, nick, channel, text, hostmask):
 lp.handler = ("on_text", r'[.!@]lp$', irc.ALL_NICKS, irc.ALL_CHANNELS)
 
 def queue(server, nick, channel, text, hostmask):
-    p = tokenize(text)
-    if len(p) > 1:
-        if p[1] == u"length" or p[1] == u"l":
-            request_queue = regular_queue = requests_ = regulars = 0
-            for song in manager.Queue().iter(None):
-                if (song.type == manager.REQUEST):
-                    request_queue += song.length
-                    requests_ += 1
-                elif (song.type == manager.REGULAR):
-                    regular_queue += song.length
-                    regulars += 1
-            message = u"There are {req} requests ({req_time}), {norm} randoms ({norm_time}), total of {total} songs ({total_time})".\
-                    format(**{'req_time': timedelta(seconds=request_queue),
-                    'norm_time': timedelta(seconds=regular_queue),
-                    'total_time': timedelta(seconds=request_queue+regular_queue),
-                    'req': requests_,
-                    'norm': regulars,
-                    'total': requests_+regulars})
+    match = re.match(r"^[.@!]q(ueue)?\b(?P<command>l(ength)?)?", text, re.I|re.U)
+
+    # We can be lazy here and not check if re.match() found anything because
+    # the function handler ensures [.!@]q(ueue)? match
+    if match.group("command"):
+        request_queue = regular_queue = requests_ = regulars = 0
+        for song in manager.Queue().iter(None):
+            if (song.type == manager.REQUEST):
+                request_queue += song.length
+                requests_ += 1
+            elif (song.type == manager.REGULAR):
+                regular_queue += song.length
+                regulars += 1
+        message = u"There are {req} requests ({req_time}), {norm} randoms ({norm_time}), total of {total} songs ({total_time})".\
+                format(**{'req_time': timedelta(seconds=request_queue),
+                'norm_time': timedelta(seconds=regular_queue),
+                'total_time': timedelta(seconds=request_queue+regular_queue),
+                'req': requests_,
+                'norm': regulars,
+                'total': requests_+regulars})
     else:
         queue = list(manager.Queue())
         if (len(queue) > 0):
@@ -143,10 +145,12 @@ def queue(server, nick, channel, text, hostmask):
                 if (song.type == manager.REQUEST):
                     request_time += song.length
 
-            message = u"{c3}Queue {time}:{c} ".format(time = "" if request_time == 0\
-                else "(/r/ time: {t})".format(t=timedelta(seconds=request_time)), **irc_colours) + \
-                " {c3}|{c} ".format(**irc_colours)\
-                .join([song.metadata for song in queue])
+            time_str = ""
+            if request_time != 0:
+                time_str = "(/r/ time: {t})".format(t=timedelta(seconds=request_time))
+
+            message = u"{c3}Queue {time}:{c} ".format(time = time_str, **irc_colours) + \
+                " {c3}|{c} ".format(**irc_colours).join([song.metadata for song in queue])
         else:
             message = u"No queue at the moment"
     server.privmsg(channel, message)