jaseg/python-mpv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish rewriting event infrastructure

Browse source
This commit is contained in:
jaseg 2022-04-22 23:18:48 +02:00
parent c90a5f692f
commit 85ad2a6aa6
2 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mpv.py
View file

@ -415,7 +415,7 @@ class MpvEventProperty(Structure):
@property @property
def value(self): def value(self):
return MpvNode.node_cast_value(self.data, self.format.value) return MpvNode.node_cast_value(self.data, self.format.value, decoder=lazy_decoder)
class MpvEventLogMessage(Structure): class MpvEventLogMessage(Structure):
_fields_ = [('_prefix', c_char_p), _fields_ = [('_prefix', c_char_p),
@ -432,7 +432,7 @@ class MpvEventLogMessage(Structure):
@property @property
def text(self): def text(self):
return self._text return lazy_decoder(self._text)
class MpvEventEndFile(Structure): class MpvEventEndFile(Structure):
_fields_ = [('reason', c_int), _fields_ = [('reason', c_int),
@ -459,9 +459,14 @@ class MpvEventClientMessage(Structure):
class MpvEventCommand(Structure): class MpvEventCommand(Structure):
_fields_ = [('_result', MpvNode)] _fields_ = [('_result', MpvNode)]
def result(self): @property
def result_raw(self):
return self._result.node_value() return self._result.node_value()
@property
def result(self):
return self._result.node_value(decoder=lazy_decoder)
class MpvEventHook(Structure): class MpvEventHook(Structure):
_fields_ = [('_name', c_char_p), _fields_ = [('_name', c_char_p),
('id', c_ulonglong),] ('id', c_ulonglong),]

38
tests/test_mpv.py
View file

@ -243,7 +243,7 @@ class ObservePropertyTest(MpvTestCase):
time.sleep(0.1) #couple frames time.sleep(0.1) #couple frames
m.terminate() # needed for synchronization of event thread m.terminate() # needed for synchronization of event thread
handler.assert_has_calls([mock.call('vid', b'auto')]) handler.assert_has_calls([mock.call('vid', 'auto')])
def test_property_observer_decorator(self): def test_property_observer_decorator(self):
handler = mock.Mock() handler = mock.Mock()
@ -448,7 +448,9 @@ class TestStreams(unittest.TestCase):
disp = Xvfb() disp = Xvfb()
disp.start() disp.start()
m = mpv.MPV(vo=testvo) m = mpv.MPV(vo=testvo)
m.register_event_callback(handler) def cb(evt):
handler(evt.as_dict(decoder=mpv.lazy_decoder))
m.register_event_callback(cb)
@m.python_stream('foo') @m.python_stream('foo')
def foo_gen(): def foo_gen():
@ -461,34 +463,34 @@ class TestStreams(unittest.TestCase):
m.play('python://foo') m.play('python://foo')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.EOF, 'error': mpv.ErrorCode.SUCCESS}}) handler.assert_any_call({'event': 'end-file', 'reason': 'eof', 'playlist_entry_id': 1})
handler.reset_mock() handler.reset_mock()
m.play('python://bar') m.play('python://bar')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.UNKNOWN_FORMAT}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 2, 'file_error': 'unrecognized file format'})
handler.reset_mock() handler.reset_mock()
m.play('python://baz') m.play('python://baz')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.LOADING_FAILED}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 3, 'file_error': 'loading failed'})
handler.reset_mock() handler.reset_mock()
m.play('foo://foo') m.play('foo://foo')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.LOADING_FAILED}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 4, 'file_error': 'loading failed'})
handler.reset_mock() handler.reset_mock()
foo_gen.unregister() foo_gen.unregister()
m.play('python://foo') m.play('python://foo')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.LOADING_FAILED}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 5, 'file_error': 'loading failed'})
handler.reset_mock() handler.reset_mock()
m.play('python://bar') m.play('python://bar')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.UNKNOWN_FORMAT}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 6, 'file_error': 'unrecognized file format'})
handler.reset_mock() handler.reset_mock()
m.terminate() m.terminate()
@ -504,7 +506,9 @@ class TestStreams(unittest.TestCase):
disp = Xvfb() disp = Xvfb()
disp.start() disp.start()
m = mpv.MPV(vo=testvo, video=False) m = mpv.MPV(vo=testvo, video=False)
m.register_event_callback(handler) def cb(evt):
handler(evt.as_dict(decoder=mpv.lazy_decoder))
m.register_event_callback(cb)
m.register_stream_protocol('pythonfail', fail_mock) m.register_stream_protocol('pythonfail', fail_mock)
@ -515,19 +519,19 @@ class TestStreams(unittest.TestCase):
m.play('pythondoesnotexist://foo') m.play('pythondoesnotexist://foo')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.LOADING_FAILED}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 1, 'file_error': 'loading failed'})
handler.reset_mock() handler.reset_mock()
m.play('pythonfail://foo') m.play('pythonfail://foo')
m.wait_for_playback() m.wait_for_playback()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.LOADING_FAILED}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 2, 'file_error': 'loading failed'})
handler.reset_mock() handler.reset_mock()
m.play('pythonsuccess://foo') m.play('pythonsuccess://foo')
m.wait_for_playback() m.wait_for_playback()
stream_mock.seek.assert_any_call(0) stream_mock.seek.assert_any_call(0)
stream_mock.read.assert_called() stream_mock.read.assert_called()
handler.assert_any_call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.UNKNOWN_FORMAT}}) handler.assert_any_call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 3, 'file_error': 'unrecognized file format'})
m.terminate() m.terminate()
disp.stop() disp.stop()
@ -562,14 +566,16 @@ class TestLifecycle(unittest.TestCase):
def test_event_callback(self): def test_event_callback(self):
handler = mock.Mock() handler = mock.Mock()
m = mpv.MPV(video=False) m = mpv.MPV(video=False)
m.register_event_callback(handler) def cb(evt):
handler(evt.as_dict(decoder=mpv.lazy_decoder))
m.register_event_callback(cb)
m.play(TESTVID) m.play(TESTVID)
m.wait_for_playback() m.wait_for_playback()
m.unregister_event_callback(handler) m.unregister_event_callback(cb)
handler.assert_has_calls([ handler.assert_has_calls([
mock.call({'reply_userdata': 0, 'error': 0, 'event_id': 6, 'event': None}), mock.call({'event': 'start-file', 'playlist_entry_id': 1}),
mock.call({'reply_userdata': 0, 'error': 0, 'event_id': mpv.MpvEventID.END_FILE, 'event': {'reason': mpv.MpvEventEndFile.ERROR, 'error': mpv.ErrorCode.NOTHING_TO_PLAY}}) mock.call({'event': 'end-file', 'reason': 'error', 'playlist_entry_id': 1, 'file_error': 'no audio or video data played'})
], any_order=True) ], any_order=True)
handler.reset_mock() handler.reset_mock()