Skip to content

Commit

Permalink
- Fix PHT music playlist
Browse files Browse the repository at this point in the history
  • Loading branch information
KOL committed Dec 21, 2014
1 parent 8e0486b commit 693cff7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 39 deletions.
43 changes: 5 additions & 38 deletions Contents/Code/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,20 +368,6 @@ def MusicList(uid, title, album_id=0, offset=0):
return oc


@route(PREFIX_M + '/play')
def MusicPlay(info):

item = JSON.ObjectFromString(info)

if not item:
raise Ex.MediaNotAvailable

return ObjectContainer(
objects=[GetTrackObject(item)],
content=ContainerContent.Tracks
)


def AddMusicAlbums(oc, uid, offset=0):

albums = ApiRequest('audio.getAlbums', {
Expand Down Expand Up @@ -435,19 +421,14 @@ def AddMusicAlbums(oc, uid, offset=0):

def GetTrackObject(item):
return TrackObject(
key=Callback(MusicPlay, info=JSON.StringFromObject(item)),
rating_key='%s.%s' % (Plugin.Identifier, item['id']),
key=item['url'],
# rating_key='%s.%s' % (Plugin.Identifier, item['id']),
# Rating key must be integer because PHT and PlexConnect
# does not support playing queue with string rating key
rating_key=item['id'],
title=u'%s' % item['title'],
artist=u'%s' % item['artist'],
duration=int(item['duration'])*1000,
items=[
MediaObject(
parts=[PartObject(key=item['url'])],
container=Container.MP3,
audio_codec=AudioCodec.MP3
)
]

)


Expand Down Expand Up @@ -529,20 +510,6 @@ def PhotoList(uid, title, album_id, offset=0):
return oc


@route(PREFIX_P + '/show')
def PhotoShow(info):

item = JSON.ObjectFromString(info)

if not item:
raise Ex.MediaNotAvailable

return ObjectContainer(
objects=[GetTrackObject(item)],
content='photo'
)


def AddPhotoAlbums(oc, uid, offset=0):

albums = ApiRequest('photos.getAlbums', {
Expand Down
2 changes: 1 addition & 1 deletion Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<key>CFBundleSignature</key>
<string>hook</string>
<key>CFBundleVersion</key>
<string>2.0</string>
<string>2.1</string>

<key>PlexClientPlatforms</key>
<string>*</string>
Expand Down

0 comments on commit 693cff7

Please sign in to comment.