diff -Nru python3-mythtvservices-0.2.3/debian/bzr-builder.manifest python3-mythtvservices-0.2.4/debian/bzr-builder.manifest --- python3-mythtvservices-0.2.3/debian/bzr-builder.manifest 2013-03-09 04:27:46.000000000 +0000 +++ python3-mythtvservices-0.2.4/debian/bzr-builder.manifest 2013-03-21 04:58:34.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~13 -lp:~mythbuntu/mythbuntu/mythtvservices revid:thomas@mashos.com-20130309025642-onx3b5e58v2um7ky +# bzr-builder format 0.3 deb-version {debupstream}-0~14 +lp:~mythbuntu/mythbuntu/mythtvservices revid:thomas@mashos.com-20130321034249-b66vw5k7ckigk0tb diff -Nru python3-mythtvservices-0.2.3/debian/changelog python3-mythtvservices-0.2.4/debian/changelog --- python3-mythtvservices-0.2.3/debian/changelog 2013-03-09 04:27:46.000000000 +0000 +++ python3-mythtvservices-0.2.4/debian/changelog 2013-03-21 04:58:34.000000000 +0000 @@ -1,8 +1,15 @@ -python3-mythtvservices (0.2.3-0~13~precise1) precise; urgency=low +python3-mythtvservices (0.2.4-0~14~precise1) precise; urgency=low * Auto build. - -- Launchpad Package Builder Sat, 09 Mar 2013 04:27:46 +0000 + -- Thomas Mashos Thu, 21 Mar 2013 04:58:34 +0000 + +python3-mythtvservices (0.2.4) raring; urgency=low + + [ Thomas Mashos ] + * Add mythtv frontend playback + + -- Thomas Mashos Sun, 17 Mar 2013 16:01:37 -0700 python3-mythtvservices (0.2.3) quantal; urgency=low diff -Nru python3-mythtvservices-0.2.3/debian/control python3-mythtvservices-0.2.4/debian/control --- python3-mythtvservices-0.2.3/debian/control 2013-03-09 04:27:46.000000000 +0000 +++ python3-mythtvservices-0.2.4/debian/control 2013-03-21 04:58:34.000000000 +0000 @@ -3,7 +3,8 @@ Priority: extra Build-Depends: debhelper (>= 8), python3 (>= 3.2), - python3-distutils-extra + python3-distutils-extra, + python-distutils-extra Maintainer: Thomas Mashos Standards-Version: 3.9.4 X-Python3-Version: >= 3.2 diff -Nru python3-mythtvservices-0.2.3/src/mythtvservices.py python3-mythtvservices-0.2.4/src/mythtvservices.py --- python3-mythtvservices-0.2.3/src/mythtvservices.py 2013-03-09 04:27:46.000000000 +0000 +++ python3-mythtvservices-0.2.4/src/mythtvservices.py 2013-03-21 04:58:34.000000000 +0000 @@ -116,23 +116,45 @@ '''POST''' class Frontend: - def GetStatus(self): + def GetStatus(self, FRONTEND): print("Not implemented yet") - def SendMessage(self, MESSAGE): + def SendMessage(self, FRONTEND, MESSAGE): print("Not implemented yet") - def SendAction(self, ACTION, FILE, WIDTH, HEIGHT): + def SendAction(self, FRONTEND, ACTION, FILE, WIDTH, HEIGHT): print("Not implemented yet") - def GetActionList(self): + def GetActionList(self, FRONTEND): print("Not implemented yet") - def PlayRecording(self, CHANID, STARTTIME): - print("Not implemented yet") + def PlayRecording(self, FRONTEND, CHANID, STARTTIME): + print("Playing recording on frontend") + #BACKENDLOCATION = Connection().getBE() + FORMFIELDS={ + 'ChanId' : CHANID, + 'StartTime' : STARTTIME + } + QUERY = urllib.parse.urlencode(FORMFIELDS) + print(QUERY) + #FRONTENDLOCATION = 'http://%s:6547' % FRONTEND + VIDEODATA = Connection().getRequest('JSON', FRONTEND, 'Frontend', 'PlayRecording', QUERY) + return VIDEODATA + + def PlayVideo(self, FRONTEND, ID, USEBOOKMARK=None): + print("Playing video on frontend") + #BACKENDLOCATION = Connection().getBE() + FORMFIELDS={ + 'Id' : ID, + } + if not USEBOOKMARK == None: + FORMFIELDS['UseBookmark'] = USEBOOKMARK + QUERY = urllib.parse.urlencode(FORMFIELDS) + + #FRONTENDLOCATION = 'http://%s:6547' % FRONTEND + VIDEODATA = Connection().getRequest('JSON', FRONTEND, 'Frontend', 'PlayVideo', QUERY) + return VIDEODATA - def PlayVideo(self, ID, USEBOOKMARK=None): - print("Not implemented yet") class Myth: def AddStorageGroupDir(self, GROUPNAME, DIRNAME, HOSTNAME): @@ -269,7 +291,7 @@ print("Locating Frontends") MS = MSearch() FE = MS.searchMythFE() - FELIST={} + FELIST=[] for l in FE: FRONTEND = urlparse(l['location']) FRONTENDLOCATION = FRONTEND.scheme+"://"+FRONTEND.netloc @@ -280,7 +302,7 @@ uri = root.tag[:-4] device = root.find('%sdevice' % uri).findtext('%sfriendlyName' % uri) devicename = device.split(":")[0] - FELIST[devicename]=FRONTENDLOCATION + FELIST.append((devicename,FRONTENDLOCATION)) return FELIST def checkURL(self, url): @@ -761,7 +783,7 @@ if __name__ == '__main__': '''blah''' mc = Connection() - mc.locateFE() + print(mc.locateFE()) #print(Video().GetVideoList(COUNT=2)) #print(Video().GetVideo(4125))