boyska/larigira
1
0
Fork 0
Code Issues 13 Pull requests Releases Activity

mpd library used with unicode

Browse source
This commit is contained in:
boyska 2016-08-29 17:46:16 +02:00
parent bb48f47a51
commit 0b02c5d05b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
larigira/audiogen_mpdrandom.py
View file

@ -12,7 +12,7 @@ def generate_by_artist(spec):
spec.setdefault('howmany', 1) spec.setdefault('howmany', 1)
log.info('generating') log.info('generating')
conf = get_conf() conf = get_conf()
c = MPDClient() c = MPDClient(use_unicode=True)
c.connect(conf['MPD_HOST'], conf['MPD_PORT']) c.connect(conf['MPD_HOST'], conf['MPD_PORT'])
artists = c.list('artist') artists = c.list('artist')

14
larigira/mpc.py
View file

@ -10,7 +10,7 @@ from audiogen import audiogenerate
def get_mpd_client(conf): def get_mpd_client(conf):
client = MPDClient() client = MPDClient(use_unicode=True)
client.connect(conf['MPD_HOST'], conf['MPD_PORT']) client.connect(conf['MPD_HOST'], conf['MPD_PORT'])
return client return client
@ -51,7 +51,7 @@ class Player(gevent.Greenlet):
self.conf = conf self.conf = conf
def _get_mpd(self): def _get_mpd(self):
mpd_client = MPDClient() mpd_client = MPDClient(use_unicode=True)
mpd_client.connect(self.conf['MPD_HOST'], self.conf['MPD_PORT']) mpd_client.connect(self.conf['MPD_HOST'], self.conf['MPD_PORT'])
return mpd_client return mpd_client
@ -65,7 +65,13 @@ class Player(gevent.Greenlet):
self.log.info('need to add new songs') self.log.info('need to add new songs')
picker = gevent.Greenlet(audiogenerate, picker = gevent.Greenlet(audiogenerate,
self.conf['CONTINOUS_AUDIODESC']) self.conf['CONTINOUS_AUDIODESC'])
picker.link_value(lambda g: mpd_client.add(g.value[0].strip()))
def add(greenlet):
uris = greenlet.value
for uri in uris:
assert type(uri) is unicode, type(uri)
mpd_client.add(uri.strip())
picker.link_value(add)
picker.start() picker.start()
def enqueue(self, songs): def enqueue(self, songs):
@ -74,7 +80,7 @@ class Player(gevent.Greenlet):
assert 'uris' in songs assert 'uris' in songs
spec = songs['audiospec'] spec = songs['audiospec']
for uri in songs['uris']: for uri in songs['uris']:
assert type(uri) is str assert type(uri) is unicode
self.log.info('Adding {} to playlist (from {}={})'. self.log.info('Adding {} to playlist (from {}={})'.
format(uri, songs['aid'], spec)) format(uri, songs['aid'], spec))
insert_pos = 0 if len(mpd_client.playlistid()) == 0 else \ insert_pos = 0 if len(mpd_client.playlistid()) == 0 else \