Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Retries only a certain amount of times

Browse Source
This commit is contained in:
Uriziel 2012-09-20 18:40:32 +02:00
parent 1aafea2045
commit 7ded845cc1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -30,7 +30,7 @@ class SyncClientProtocol(CommandProtocol):
def dropWithError(self, error): def dropWithError(self, error):
self.syncplayClient.ui.showErrorMessage(error) self.syncplayClient.ui.showErrorMessage(error)
self.syncplayClient.protocol_factory.retry = False self.syncplayClient.protocol_factory.stop_retrying()
CommandProtocol.dropWithError(self, error) CommandProtocol.dropWithError(self, error)
def lineReceived(self, line): def lineReceived(self, line):
@ -177,9 +177,9 @@ class SyncClientProtocol(CommandProtocol):
self._protocol.sendMessage('playing', filename) self._protocol.sendMessage('playing', filename)
class SyncClientFactory(ClientFactory): class SyncClientFactory(ClientFactory):
def __init__(self, manager): def __init__(self, manager, retry = 10):
self.__syncplayClient = manager self.__syncplayClient = manager
self.retry = True self.retry = retry
def buildProtocol(self, addr): def buildProtocol(self, addr):
return SyncClientProtocol(self.__syncplayClient) return SyncClientProtocol(self.__syncplayClient)
@ -190,6 +190,7 @@ class SyncClientFactory(ClientFactory):
def clientConnectionLost(self, connector, reason): def clientConnectionLost(self, connector, reason):
if self.retry: if self.retry:
self.retry -= 1
message = 'Connection lost, reconnecting' message = 'Connection lost, reconnecting'
self.__syncplayClient.ui.showMessage(message) self.__syncplayClient.ui.showMessage(message)
self.__syncplayClient.counter = 0 self.__syncplayClient.counter = 0
@ -204,7 +205,7 @@ class SyncClientFactory(ClientFactory):
self.__syncplayClient.stop() self.__syncplayClient.stop()
def stop_retrying(self): def stop_retrying(self):
self.retry = False self.retry = 0
class SyncplayClientManager(object): class SyncplayClientManager(object):
def __init__(self, name, make_player, ui, debug, room, password = None): def __init__(self, name, make_player, ui, debug, room, password = None):

2
syncplay/ui/consoleUI.py
View File

@ -31,7 +31,7 @@ class ConsoleUI(threading.Thread):
elif(self._syncplayClient): elif(self._syncplayClient):
self._executeCommand(data) self._executeCommand(data)
except: except:
self._syncplayClient.protocol_factory.retry = False self._syncplayClient.protocol_factory.stop_retrying()
pass pass
def promptFor(self, promptName = ">", message = ""): def promptFor(self, promptName = ">", message = ""):