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

poprawiony regexp do seekowania, naprawiony bug ze specjalymi znakami

Browse Source 
utf8, komenda s bez argumentow seekuje do 0
This commit is contained in:
Uriziel 2012-06-21 01:49:25 +02:00
parent 4d48787d6c
commit 3a25110adf
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
syncplay/client.py
View File

@ -281,11 +281,14 @@ class Manager(object):
self.protocol.send_playing(self.player_filename) self.protocol.send_playing(self.player_filename)
def execute_command(self, data): def execute_command(self, data):
RE_SEEK = re.compile("^s ?(\d+)(:(\d{1,2}))?$") RE_SEEK = re.compile("^s ?(\d+)?(:(\d{1,2}))?$")
m = RE_SEEK.match(data) m = RE_SEEK.match(data)
if m : if m :
minutes, seconds = m.group(1), m.group(3) minutes, seconds = m.group(1), m.group(3)
minutes = int(minutes) * 60 if minutes <> None:
minutes = int(minutes) * 60
else:
minutes = 0
if seconds <> None: if seconds <> None:
seconds = int(seconds) seconds = int(seconds)
else: else:
@ -295,7 +298,9 @@ class Manager(object):
self.protocol.send_seek(self.counter, time.time(), minutes+seconds) self.protocol.send_seek(self.counter, time.time(), minutes+seconds)
elif data == "r": elif data == "r":
self.counter += 1 self.counter += 1
tmp_pos = self.player_position
self.protocol.send_seek(self.counter, time.time(), self.player_position_before_last_seek) self.protocol.send_seek(self.counter, time.time(), self.player_position_before_last_seek)
self.player_position_before_last_seek = tmp_pos
def update_player_status(self, paused, position): def update_player_status(self, paused, position):
self.status_ask_received += 1 self.status_ask_received += 1
@ -334,7 +339,9 @@ class Manager(object):
self.ask_player() self.ask_player()
def update_filename(self, filename): def update_filename(self, filename):
self.player_filename = filename filename = unicode(filename, errors='replace')
self.player_filename = filename.encode('ascii','replace')
self.send_filename() self.send_filename()
def update_global_state(self, counter, ctime, paused, position, name): def update_global_state(self, counter, ctime, paused, position, name):