Changeset 260 for fuktommy.com/trunk/niconico

Timestamp:

2009-10-01 23:44:16 (5 months ago)

Author:

fuktommy

Message:

例外のときイベントを作る。

Files:

• fuktommy.com/trunk/niconico/nicolivealert.py (modified) (5 diffs)

fuktommy.com/trunk/niconico/nicolivealert.py

@@ -55 +55 @@
 
 __version__ = "$Revision$"
-__all__ = ['MessageEvent', 'StreamEvent', 'connect']
+__all__ = ['Event', 'connect']
 
 GET_ALERT_INFO = 'http://live.nicovideo.jp/api/getalertinfo'
@@ -115 +115 @@
     is_new_stream = False
     is_message = False
+    is_error = False
     message = ''
 
@@ -131 +132 @@
     def __str__(self):
         return self.message
+
+
+class ErrorEvent(Event):
+    """Event for exception.
+    """
+
+    is_error = True
+    error = None
+
+    def __init__(self, error):
+        self.error = error
+
+    def __str__(self):
+        return '[error]'
 
 
@@ -280 +295 @@
         self.to_reconnect = False
 
+    def close_server(self):
+        if self.comment_server:
+            self.comment_server.close()
+            self.comment_server = None
+
     def close(self):
         self.processing = False
         self.to_reconnect = False
-        if self.comment_server:
-            self.comment_server.close()
-            self.comment_server = None
+        self.close_server()
 
     def connect(self):
@@ -300 +318 @@
         self.processing = True
         while self.processing:
-            time.sleep(1)
-            self.close()
-            self.connect()
-            yield MessageEvent('[connect]')
-            for comment in self.comment_server:
-                if self.to_reconnect or self.agent.is_busy():
-                    break
-                yield StreamEvent(comment, self.stream_info)
-            yield MessageEvent('[close]')
+            try:
+                time.sleep(1)
+                self.close_server()
+                self.connect()
+                yield MessageEvent('[connect]')
+                for comment in self.comment_server:
+                    if self.to_reconnect or self.agent.is_busy():
+                        break
+                    yield StreamEvent(comment, self.stream_info)
+                yield MessageEvent('[close]')
+            except Exception, err:
+                time.sleep(10)
+                yield ErrorEvent(err)