From ef606530a24db0c8d3dc133e9a11dcdc18ca1874 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Wed, 19 Sep 2012 17:30:14 +0200 Subject: [PATCH] Beautifying code --- syncplay/players/mpc.py | 2 +- syncplay/ui/__init__.py | 9 +++++---- syncplay/ui/consoleUI.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/syncplay/players/mpc.py b/syncplay/players/mpc.py index 010cfd7..916a0a0 100644 --- a/syncplay/players/mpc.py +++ b/syncplay/players/mpc.py @@ -153,7 +153,7 @@ class MPCHCAPIPlayer(object): self.askLock.release() def mpc_error(self, err=""): - print "ERROR:", str(err) + ',', "desu" + print "ERROR:", str(err) #TODO: wyrzucić do interface'u if self.__syncplayClient.running: print 'Failed to connect to MPC-HC API!' self.__syncplayClient.stop() diff --git a/syncplay/ui/__init__.py b/syncplay/ui/__init__.py index e67dbf1..62980b2 100644 --- a/syncplay/ui/__init__.py +++ b/syncplay/ui/__init__.py @@ -1,10 +1,11 @@ from syncplay.ui.gui import GraphicalUI from syncplay.ui.consoleUI import ConsoleUI + def getUi(graphical = True): if(False): #graphical): #TODO: Add graphical ui - return GraphicalUI() + ui = GraphicalUI() else: ui = ConsoleUI() - ui.setDaemon(True) - ui.start() - return ui \ No newline at end of file + ui.setDaemon() + ui.start() + return ui \ No newline at end of file diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py index 049044a..4d55863 100644 --- a/syncplay/ui/consoleUI.py +++ b/syncplay/ui/consoleUI.py @@ -7,7 +7,7 @@ from __future__ import print_function import threading import re import time -import syncplay + class ConsoleUI(threading.Thread): def __init__(self): self.promptMode = threading.Event() @@ -48,7 +48,7 @@ class ConsoleUI(threading.Thread): print(message) def showErrorMessage(self, message): - print("ERROR desu!:\t" + message) + print("ERROR:\t" + message) def __exectueSeekCmd(self, seek_type, minutes, seconds): self._syncplayClient.player_position_before_last_seek = self._syncplayClient.player_position