Move addition of media file and manifest.f4m to higher level

Author: Martin Panter

iview/fetch.py

@@ -228,16 +228,16 @@ def fetch(self, *, dest_file, **kw):
 
 class HdsFetcher:
     def __init__(self, file, auth):
-        self.url = urljoin(auth['server'], auth['path'])
-        self.file = file
+        base = urljoin(auth['server'], auth['path'])
+        self.url = urljoin(base, file + '/manifest.f4m')
         self.tokenhd = auth.get('tokenhd')
 
     def fetch(self, *, frontend, execvp, quiet, **kw):
         if frontend is None:
             call = hds_open_file
         else:
             call = HdsThread
-        return call(self.url, self.file, self.tokenhd,
+        return call(self.url, self.tokenhd,
             frontend=frontend,
             player=config.akamaihd_player,
             key=config.akamaihd_key, **kw)

iview/hds.py

@@ -25,7 +25,7 @@
 import urllib.request
 from .utils import PersistentConnectionHandler, http_get
 from sys import stderr
-from urllib.parse import urljoin, urlencode, quote_plus
+from urllib.parse import urljoin, urlencode, quote_plus, urlsplit
 import io
 from .utils import xml_text_elements
 from . import flvlib
@@ -503,12 +503,15 @@ def progress_update(frontend, flv, time, duration):
             time, duration, size / 1e6))
         stderr.flush()
 
-def manifest_url(url, file, hdnea=None):
+def manifest_url(url, hdnea=None):
     query = [("hdcore", "")]  # Produces 403 Forbidden without this
     if hdnea:
         query.append(("hdnea", hdnea))
-    file += "/manifest.f4m?" + urlencode(query)
-    return urljoin(url, file)
+    query = urlencode(query)
+    base_query = urlsplit(url).query
+    if base_query:
+        query = base_query + "&" + query
+    return urljoin(url, "?" + query)
 
 def get_manifest(url, session):
     """Downloads the manifest specified by the URL and parses it

test.py

@@ -380,7 +380,7 @@ def common(self, exception):
             self.assertRaises(exception, iview.comm.get_auth)
 
         self.assertRaises(exception, hds.fetch,
-            "http://localhost/", "media path", "hdnea", dest_file=None)
+            "http://localhost/", "hdnea", dest_file=None)
 
 @contextmanager
 def substattr(obj, attr, *value):