Format and time parameter prepared

diff --git a/youtubeplayer/src/YouTubeInterface.py b/youtubeplayer/src/YouTubeInterface.py
index 7d70711..8e9f1c9 100644 (file)
--- a/youtubeplayer/src/YouTubeInterface.py
+++ b/youtubeplayer/src/YouTubeInterface.py
@@ -251,7 +251,7 @@ class YouTubeEntry():
                                        break
                        response.close
                        if m:
-                               mrl = "http://www.youtube.com/get_video?video_id=" + quote(self.getYouTubeId()) + "&t=" + quote(re.match (".*[?&]t=([^&]+)", m.group('vid_query')).groups()[0]) + fmt
+                               mrl = "http://www.youtube.com/get_video?video_id=" + quote(self.getYouTubeId()) + "&t=" + quote(re.match (".*[?&]t=([^&]+)", m.group('vid_query')).groups()[0]) + "&fmt=" + fmt
 #"&sk=" + quote(re.match (".*[?&]sk=([^&]+)", m.group('vid_query')).groups()[0]) + fmt
                                print "[YTB] Playing ", mrl
                        else:
@@ -479,7 +479,7 @@ class YouTubeInterface():
 
        def search(self, searchTerms, startIndex = 1, maxResults = 25,
                                        orderby = "relevance", time = "all_time", racy = "include", 
-                                       author = "", lr = "", categories = "", sortOrder = "ascending"):
+                                       author = "", lr = "", categories = "", sortOrder = "ascending", format = "6"):
                print "[YTB] YouTubeInterface::search()"
                query = gdata.youtube.service.YouTubeVideoQuery()
                query.vq = searchTerms
@@ -490,9 +490,10 @@ class YouTubeInterface():
                        query.lr = lr
                if categories[0] is not None:
                        query.categories = categories
-               query.time = time
+#              query.time = time
                query.start_index = startIndex
                query.max_results = maxResults
+#              query.format = format
                try:
                        feed = YouTubeFeed(self.ytService.YouTubeQuery(query))
                except gaierror:

diff --git a/youtubeplayer/src/YouTubeList.py b/youtubeplayer/src/YouTubeList.py
index 061caa3..1195945 100644 (file)
--- a/youtubeplayer/src/YouTubeList.py
+++ b/youtubeplayer/src/YouTubeList.py
@@ -312,7 +312,8 @@ class YouTubeListScreen(Screen, NumericalTextInput):
                                        time = searchContext.time.value,
                                        lr = searchContext.lr.value,
                                        categories = [ searchContext.categories.value ],
-                                       sortOrder = searchContext.sortOrder.value)
+                                       sortOrder = searchContext.sortOrder.value,
+                                       format = config.plugins.youtubeplayer.quality)
                except Exception, e:
                        feed = None
                        self.session.open(MessageBox, _("Error querying feed for search term %s:\n%s" %

diff --git a/youtubeplayer/src/YouTubeUserConfig.py b/youtubeplayer/src/YouTubeUserConfig.py
index 4641b85..c9f9fba 100644 (file)
--- a/youtubeplayer/src/YouTubeUserConfig.py
+++ b/youtubeplayer/src/YouTubeUserConfig.py
@@ -36,13 +36,21 @@ from . import _
 # This should be executed only once during an enigma2-session
 config.plugins.youtubeplayer = ConfigSubsection()
 config.plugins.youtubeplayer.serverprofile = ConfigText("", False)
+#config.plugins.youtubeplayer.quality = ConfigSelection(
+#                              [
+#                               ("", _("Low Quality (Mono)")),
+#                               ("&fmt=6", _("Medium Quality (Mono)")),
+#                               ("&fmt=18", _("High Quality (Stereo)")),
+#                               ("&fmt=22", _("HD Quality (Stereo)"))
+#                              ], "&fmt=18")
 config.plugins.youtubeplayer.quality = ConfigSelection(
                                [
-                                ("", _("Low Quality (Mono)")),
-                                ("&fmt=6", _("Medium Quality (Mono)")),
-                                ("&fmt=18", _("High Quality (Stereo)")),
-                                ("&fmt=22", _("HD Quality (Stereo)"))
-                               ], "&fmt=18")
+                                ("1", _("Low Quality (Mono)")),
+                                ("6", _("Medium Quality (Mono)")),
+                                ("18", _("High Quality (Stereo)")),
+                                ("22", _("HD Quality (Stereo)"))
+                               ], "18")
+
 
 class __YouTubeUserConfig():
        def __init__(self):