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

Add filesystem encoding handling

Browse source
This commit is contained in:
jaseg 2016-08-07 18:56:07 +02:00
parent 7c1343f03d
commit 2bff338c83
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mpv.py
View file

@ -3,11 +3,12 @@ from ctypes import *
import ctypes.util import ctypes.util
import threading import threading
import os import os
import sys
from warnings import warn from warnings import warn
from functools import partial from functools import partial
# vim: ts=4 sw=4 # vim: ts=4 sw=4
fs_enc = sys.getfilesystemencoding()
if os.name == 'nt': if os.name == 'nt':
backend = CDLL(ctypes.util.find_library('mpv-1.dll')) backend = CDLL(ctypes.util.find_library('mpv-1.dll'))
@ -377,7 +378,8 @@ class MPV(object):
def command(self, name, *args): def command(self, name, *args):
""" Execute a raw command """ """ Execute a raw command """
args = [name.encode()] + [ str(arg).encode() for arg in args if arg is not None ] + [None] args = [name.encode()] + [ (arg if type(arg) is bytes else str(arg).encode())
for arg in args if arg is not None ] + [None]
_mpv_command(self.handle, (c_char_p*len(args))(*args)) _mpv_command(self.handle, (c_char_p*len(args))(*args))
def seek(self, amount, reference="relative", precision="default-precise"): def seek(self, amount, reference="relative", precision="default-precise"):
@ -408,7 +410,7 @@ class MPV(object):
self.command('screenshot', includes, mode) self.command('screenshot', includes, mode)
def screenshot_to_file(self, filename, includes='subtitles'): def screenshot_to_file(self, filename, includes='subtitles'):
self.command('screenshot_to_file', filename, includes) self.command('screenshot_to_file', filename.encode(fs_enc), includes)
def playlist_next(self, mode='weak'): def playlist_next(self, mode='weak'):
self.command('playlist_next', mode) self.command('playlist_next', mode)
@ -417,10 +419,10 @@ class MPV(object):
self.command('playlist_prev', mode) self.command('playlist_prev', mode)
def loadfile(self, filename, mode='replace'): def loadfile(self, filename, mode='replace'):
self.command('loadfile', filename, mode) self.command('loadfile', filename.encode(fs_enc), mode)
def loadlist(self, playlist, mode='replace'): def loadlist(self, playlist, mode='replace'):
self.command('loadlist', playlist, mode) self.command('loadlist', playlist.encode(fs_enc), mode)
def playlist_clear(self): def playlist_clear(self):
self.command('playlist_clear') self.command('playlist_clear')
@ -441,7 +443,7 @@ class MPV(object):
self.command('quit_watch_later', code) self.command('quit_watch_later', code)
def sub_add(self, filename): def sub_add(self, filename):
self.command('sub_add', filename) self.command('sub_add', filename.encode(fs_enc))
def sub_remove(self, sub_id=None): def sub_remove(self, sub_id=None):
self.command('sub_remove', sub_id) self.command('sub_remove', sub_id)