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

Wait for interaction on unclean exit

Browse Source
This commit is contained in:
Uriziel 2012-09-22 14:44:05 +02:00
parent 42fbc310fa
commit 68a9d5be65
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/SyncplayMPC.py
View File

@ -27,6 +27,6 @@ class SyncplayMPC(SyncplayClient):
def _promptForMissingArguments(self):
SyncplayClient._promptForMissingArguments(self)
if (self.args.mpc_path == None):
self.args.mpc_path = self.interface.promptFor(promptName = "Path to mpc-hc.exe", message = "You must supply path to mpc on the first run, it's easier through command line arguments.")
self.args.mpc_path = self.interface.promptFor(prompt = "Path to mpc-hc.exe: ", message = "You must supply path to mpc on the first run, it's easier through command line arguments.")

8
syncplay/client.py
View File

@ -263,6 +263,7 @@ class SyncplayClientManager(object):
if self.player:
self.player.drop()
reactor.callLater(0.1, reactor.stop)
self.ui.promptFor("Press enter to exit")
def checkIfFileMatchesOthers(self):
notMatchingList = self.users.getUsersWithNotMatchingFilenames()
@ -480,6 +481,9 @@ class SyncplayClientManager(object):
def showErrorMessage(self, message):
self.__ui.showErrorMessage(message)
def promptFor(self, prompt):
return self.__ui.promptFor(prompt)
class SyncplayUser(object):
def __init__(self, name = None, filename = None, room = None, fileduration = None, filesize = None):
self.name = name
@ -561,8 +565,8 @@ class SyncplayClient(object):
def _promptForMissingArguments(self):
if(self.args.no_gui):
if (self.args.host == None):
self.args.host = self.interface.promptFor(promptName = "Hostname", message = "You must supply hostname on the first run, it's easier through command line arguments.")
self.args.host = self.interface.promptFor(prompt = "Hostname: ", message = "You must supply hostname on the first run, it's easier through command line arguments.")
if (self.args.name == None):
self.args.name = self.interface.promptFor(promptName = "Username", message = "You must supply username on the first run, it's easier through command line arguments.")
self.args.name = self.interface.promptFor(prompt = "Username: ", message = "You must supply username on the first run, it's easier through command line arguments.")
else:
self._guiPromptForMissingArguments()

4
syncplay/ui/consoleUI.py
View File

@ -34,10 +34,10 @@ class ConsoleUI(threading.Thread):
self._syncplayClient.protocol_factory.stop_retrying()
pass
def promptFor(self, promptName = ">", message = ""):
def promptFor(self, prompt = ">", message = ""):
print(message)
self.promptMode.clear()
print(promptName+": ", end='')
print(prompt, end='')
self.promptMode.wait()
return self.PromptResult