From c5c8695ff8615e4517300d234eedb6824bea4850 Mon Sep 17 00:00:00 2001 From: Antti Ajanki Date: Sun, 29 Jan 2012 15:52:41 +0200 Subject: Removed SubTV --- HISTORY | 1 + README | 5 ++--- src/unittest/testwebvi.py | 27 ----------------------- src/vdr-plugin/timer.c | 1 - templates/www.sub.fi/description.xsl | 32 --------------------------- templates/www.sub.fi/mainmenu.xsl | 21 ------------------ templates/www.sub.fi/navigation.xsl | 42 ------------------------------------ templates/www.sub.fi/service.xml | 7 ------ templates/www.sub.fi/video.xsl | 24 --------------------- templates/www.sub.fi/videopage.xsl | 16 -------------- 10 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 templates/www.sub.fi/description.xsl delete mode 100644 templates/www.sub.fi/mainmenu.xsl delete mode 100644 templates/www.sub.fi/navigation.xsl delete mode 100644 templates/www.sub.fi/service.xml delete mode 100644 templates/www.sub.fi/video.xsl delete mode 100644 templates/www.sub.fi/videopage.xsl diff --git a/HISTORY b/HISTORY index 3187065..ea8a495 100644 --- a/HISTORY +++ b/HISTORY @@ -255,3 +255,4 @@ Video site modules: 2012-01-29: Version 0.4.5 - Fixed Youtube breakage +- Removed SubTV support, SubTV programs are available in Katsomo diff --git a/README b/README index 783f704..eca0626 100644 --- a/README +++ b/README @@ -16,7 +16,6 @@ Supported video sites: * Metacafe * MTV3 Katsomo * ruutu.fi [2] -* Subtv * Vimeo * YLE Areena [2] * YouTube @@ -28,8 +27,8 @@ Supported video sites: Known problems: -* MTV3 Katsomo and Subtv: often the connection is lost before the - video is fully downloaded. +* MTV3 Katsomo: often the connection is lost before the video is fully + downloaded. * Vimeo: Streaming does not work. Because of the modular design it is possible to add support for new diff --git a/src/unittest/testwebvi.py b/src/unittest/testwebvi.py index 1bf1044..2af3c16 100644 --- a/src/unittest/testwebvi.py +++ b/src/unittest/testwebvi.py @@ -392,33 +392,6 @@ class TestServiceModules(unittest.TestCase): # self.assertNotEqual(resultref, None) # self.downloadAndExtractLinks(resultref, 1, 'search result') - def testSubtv(self): - # Category page - ref = self.getServiceReference('../../templates/www.sub.fi') - links = self.downloadAndExtractLinks(ref, 4, 'series') - - # Program page - plinks = [] - for li in links: - plinks = self.downloadAndExtractLinks(li.ref, 0, 'program') - if plinks: - break - if not plinks: - self.assertTrue(False, 'None of the program pages has links') - - # Video link - videolink = plinks[0] - self.assertNotEqual(videolink.stream, None, 'No media object in a video link') - self.assertNotEqual(videolink.ref, None, 'No description page in a video link') - - # Direct video page link - queries, params = self.extractQueryParams(plinks[0].stream) - self.assertTrue('srcurl' in queries and 'pid' in params, 'Required parameter missing in video link') - videopageurl = queries['srcurl'] + '?' + params['pid'] - videopageref = self.urlToWvtref(videopageurl) - self.checkMediaUrl(videopageref) - - if __name__ == '__main__': testnames = sys.argv[1:] diff --git a/src/vdr-plugin/timer.c b/src/vdr-plugin/timer.c index b5a5c2b..6346763 100644 --- a/src/vdr-plugin/timer.c +++ b/src/vdr-plugin/timer.c @@ -323,7 +323,6 @@ char *cWebviTimerManager::UpgradedTemplatePath(char *ref) { {"wvt:///metacafe/", "wvt:///www.metacafe.com/"}, {"wvt:///vimeo/", "wvt:///www.vimeo.com/"}, {"wvt:///katsomo/", "wvt:///www.katsomo.fi/"}, - {"wvt:///subtv/", "wvt:///www.sub.fi/"}, {"wvt:///ruutufi/", "wvt:///www.ruutu.fi/"}, {"wvt:///google/", "wvt:///video.google.com/"}, {"wvt:///yleareena/", "wvt:///areena.yle.fi/"}}; diff --git a/templates/www.sub.fi/description.xsl b/templates/www.sub.fi/description.xsl deleted file mode 100644 index 9aeacf0..0000000 --- a/templates/www.sub.fi/description.xsl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - - - - - - wvt:///www.sub.fi/video.xsl?param=pid,&param=title, - - - - - diff --git a/templates/www.sub.fi/mainmenu.xsl b/templates/www.sub.fi/mainmenu.xsl deleted file mode 100644 index c865ae0..0000000 --- a/templates/www.sub.fi/mainmenu.xsl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - Subin netti-TV - - - - - wvt:///www.sub.fi/navigation.xsl?srcurl= - - - - - - diff --git a/templates/www.sub.fi/navigation.xsl b/templates/www.sub.fi/navigation.xsl deleted file mode 100644 index 274355f..0000000 --- a/templates/www.sub.fi/navigation.xsl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - wvt:///www.sub.fi/video.xsl?srcurl=&param=pid,&param=title, - wvt:///www.sub.fi/description.xsl?param=title,&param=desc,&param=pubdate,&param=pid, - - - - - - - <xsl:value-of select="$programname"/> - - - - - - - - - - - - - - diff --git a/templates/www.sub.fi/service.xml b/templates/www.sub.fi/service.xml deleted file mode 100644 index 432855f..0000000 --- a/templates/www.sub.fi/service.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Subtv - wvt:///www.sub.fi/mainmenu.xsl?srcurl=http%3A//www.sub.fi/katsonetista/ - Sub is the third biggest commercial tv channel in Finland. - diff --git a/templates/www.sub.fi/video.xsl b/templates/www.sub.fi/video.xsl deleted file mode 100644 index 4448905..0000000 --- a/templates/www.sub.fi/video.xsl +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - - - - - - - - - - diff --git a/templates/www.sub.fi/videopage.xsl b/templates/www.sub.fi/videopage.xsl deleted file mode 100644 index 11cd0ef..0000000 --- a/templates/www.sub.fi/videopage.xsl +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - -- cgit v1.2.3