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

Refactoring

Browse Source
This commit is contained in:
Uriziel 2012-08-16 17:54:26 +02:00
parent 87619ec88c
commit c872ec6ad0
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
syncplay/players/mplayer.py
View File

@ -43,7 +43,7 @@ class MplayerProtocol(LineProcessProtocol):
speed_supported = True speed_supported = True
def __init__(self, manager): def __init__(self, manager):
self._syncplayClient = manager self.__syncplayClient = manager
self.ignore_end = False self.ignore_end = False
self.error_lines = deque(maxlen=50) self.error_lines = deque(maxlen=50)
self.tmp_paused = None self.tmp_paused = None
@ -52,7 +52,7 @@ class MplayerProtocol(LineProcessProtocol):
reactor.callLater(0.1, self.prepare_player) reactor.callLater(0.1, self.prepare_player)
def processEnded(self, reason): def processEnded(self, reason):
self._syncplayClient.player = None self.__syncplayClient.player = None
if not self.ignore_end: if not self.ignore_end:
if reason.value.signal is not None: if reason.value.signal is not None:
print 'Mplayer interrupted by signal %d.' % reason.value.signal print 'Mplayer interrupted by signal %d.' % reason.value.signal
@ -64,7 +64,7 @@ class MplayerProtocol(LineProcessProtocol):
print 'Up to 50 last lines from its error output below:' print 'Up to 50 last lines from its error output below:'
for line in self.error_lines: for line in self.error_lines:
print line print line
self._syncplayClient.stop() self.__syncplayClient.stop()
def errLineReceived(self, line): def errLineReceived(self, line):
if line: if line:
@ -106,8 +106,8 @@ class MplayerProtocol(LineProcessProtocol):
self.send_get_property('filename') self.send_get_property('filename')
def mplayer_answer_filename(self, value): def mplayer_answer_filename(self, value):
self._syncplayClient.initPlayer(self) self.__syncplayClient.initPlayer(self)
self._syncplayClient.updateFilename(value) self.__syncplayClient.updateFilename(value)
def set_paused(self, value): def set_paused(self, value):
@ -130,7 +130,7 @@ class MplayerProtocol(LineProcessProtocol):
def mplayer_answer_time_pos(self, value): def mplayer_answer_time_pos(self, value):
value = float(value) value = float(value)
self._syncplayClient.updatePlayerStatus(self.tmp_paused, value) self.__syncplayClient.updatePlayerStatus(self.tmp_paused, value)
def set_speed(self, value): def set_speed(self, value):
@ -141,7 +141,7 @@ class MplayerProtocol(LineProcessProtocol):
#def mplayer_answer_speed(self, value): #def mplayer_answer_speed(self, value):
# value = float(value) # value = float(value)
# self._syncplayClient.update_player_speed(value) # self.__syncplayClient.update_player_speed(value)
def drop(self): def drop(self):

48
syncplay/server.py
View File

@ -1,6 +1,5 @@
#coding:utf8 #coding:utf8
from collections import deque
import re import re
import time import time
import random import random
@ -8,11 +7,7 @@ import random
from twisted.internet import reactor from twisted.internet import reactor
from twisted.internet.protocol import Factory from twisted.internet.protocol import Factory
from .network_utils import ( from .network_utils import argumentCount, CommandProtocol
arg_count,
CommandProtocol,
)
from .utils import parse_state
random.seed() random.seed()
@ -41,7 +36,7 @@ class SyncServerProtocol(CommandProtocol):
self.factory.add_watcher(self, name) self.factory.add_watcher(self, name)
self.change_state('connected') self.change_state('connected')
@arg_count(1) @argumentCount(1)
def handle_connected_room(self, args): def handle_connected_room(self, args):
watcher = self.factory.watchers.get(self) watcher = self.factory.watchers.get(self)
old_room = watcher.room old_room = watcher.room
@ -52,16 +47,16 @@ class SyncServerProtocol(CommandProtocol):
self.factory.remove_room_if_empty(old_room) self.factory.remove_room_if_empty(old_room)
watcher = self.factory.watchers.get(self) watcher = self.factory.watchers.get(self)
@arg_count(4) @argumentCount(4)
def handle_connected_state(self, args): def handle_connected_state(self, args):
args = parse_state(args) args = self.__parse_state(args)
if not args: if not args:
self.drop_with_error('Malformed state attributes') self.drop_with_error('Malformed state attributes')
return return
counter, ctime, paused, position, _ = args counter, ctime, paused, position, _ = args
self.factory.update_state(self, counter, ctime, paused, position) self.factory.update_state(self, counter, ctime, paused, position)
@arg_count(0) @argumentCount(0)
def handle_connected_list(self, args): def handle_connected_list(self, args):
watcher = self.factory.watchers.get(self) watcher = self.factory.watchers.get(self)
for w in self.factory.watchers.itervalues(): for w in self.factory.watchers.itervalues():
@ -69,7 +64,7 @@ class SyncServerProtocol(CommandProtocol):
continue continue
self.send_present(w.name, w.room, w.filename) self.send_present(w.name, w.room, w.filename)
@arg_count(3) @argumentCount(3)
def handle_connected_seek(self, args): def handle_connected_seek(self, args):
counter, ctime, position = args counter, ctime, position = args
try: try:
@ -84,7 +79,7 @@ class SyncServerProtocol(CommandProtocol):
self.factory.seek(self, counter, ctime, position) self.factory.seek(self, counter, ctime, position)
@arg_count(2) @argumentCount(2)
def handle_connected_pong(self, args): def handle_connected_pong(self, args):
value, ctime = args value, ctime = args
try: try:
@ -96,7 +91,7 @@ class SyncServerProtocol(CommandProtocol):
self.factory.pong_received(self, value, ctime) self.factory.pong_received(self, value, ctime)
@arg_count(1) @argumentCount(1)
def handle_connected_playing(self, args): def handle_connected_playing(self, args):
self.factory.playing_received(self, args[0]) self.factory.playing_received(self, args[0])
@ -159,6 +154,31 @@ class SyncServerProtocol(CommandProtocol):
) )
initial_state = 'init' initial_state = 'init'
def __parseState(self, args):
if len(args) == 4:
counter, ctime, state, position = args
who_changed_state = None
elif len(args) == 5:
counter, ctime, state, position, who_changed_state = args
else:
return
if not state in ('paused', 'playing'):
return
paused = state == 'paused'
try:
counter = int(counter)
ctime = int(ctime)
position = int(position)
except ValueError:
return
ctime /= 1000.0
position /= 1000.0
return counter, ctime, paused, position, who_changed_state
class WatcherInfo(object): class WatcherInfo(object):
def __init__(self, watcher_proto, name): def __init__(self, watcher_proto, name):
@ -357,7 +377,7 @@ class SyncFactory(Factory):
chars = random_chars() chars = random_chars()
curtime = time.time() curtime = time.time()
if curtime - watcher.last_ping_received > 60: if curtime - watcher.last_ping_received > 8:
watcher.watcher_proto.drop() watcher.watcher_proto.drop()
return return