addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vidfltr" name="VIDFLTR Music Videos" version="1.0.0-rc.2" provider-name="bassdart">
+<addon id="plugin.video.vidfltr" name="VIDFLTR Music Videos" version="1.0.0-rc.1" provider-name="bassdart">
   <requires>
     <import addon="script.module.six" version="0.0.1"/>
     <import addon="script.module.kodi-six" />
@@ -33,10 +33,7 @@
         <clearlogo>resources/img/kodi/clearlogo.png</clearlogo>
         <screenshot></screenshot>
     </assets>
-    <news>1.0.0-rc.2
+    <news>1.0.0-alpha.1
-- handle direct download video_url's (e.g. Heroero.com)
-- minimal cleanups
-1.0.0-rc.1
 - finally push an initial 1.0.0-rc.1 with all the additions and fixes added in the last years
 0.9.9
 - play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl

changelog.txt

@@ -1,7 +1,4 @@
-1.0.0-rc.2
+1.0.0-alpha.1
-- handle direct download video_url's (e.g. Heroero.com)
-- minimal cleanups
-1.0.0-rc.1
 - finally push an initial 1.0.0-rc.1 with all the additions and fixes added in the last years
 0.9.9
 - play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl

default.py

@@ -493,35 +493,37 @@ def numbers():
 
 
 def camelot():
-    num1 = 0
+    #fanart = "resources/img/camelot/camleot.png"
-    for num in range(1, 13):
+    if sort == "random" or sort == "date":
-        # logic to get get all the different translation strings from camelot wheel
+        num1 = 0
-        minor = 30149 + num + num1
+        for num in range(1, 13):
-        major = 30149 + num + num1 + 1
+            # logic to get get all the different translation strings from camelot wheel
-        log(
+            minor = 30149 + num + num1
-            msg="camelotnumber=%s, minor=%s, major=%s" % (num, minor, major),
+            major = 30149 + num + num1 + 1
-            level=xbmc.LOGINFO,
+            log(
-        )
+                msg="camelotnumber=%s, minor=%s, major=%s" % (num, minor, major),
-        fanart = os.path.join(
+                level=xbmc.LOGINFO,
-            addonDir, "resources/img/camelot/" + str(num) + "A.png"
+            )
-        )
+            fanart = os.path.join(
-        addDir(
+                addonDir, "resources/img/camelot/" + str(num) + "A.png"
-            translation(minor), 
+            )
-            "&limit=camelot&sort=" + sort + "&start=" + str(num) + "A",
+            addDir(
-            "sortTitlesBy",
+                translation(minor), 
-            fanart,
+                "&limit=camelot&sort=" + sort + "&start=" + str(num) + "A",
-        )
+                "sortTitlesBy",
-        fanart = os.path.join(
+                fanart,
-            addonDir, "resources/img/camelot/" + str(num) + "B.png"
+            )
-        )
+            fanart = os.path.join(
-        addDir(
+                addonDir, "resources/img/camelot/" + str(num) + "B.png"
-            translation(major),
+            )
-            "&limit=camelot&sort=" + sort + "&start=" + str(num) + "B",
+            addDir(
-            "sortTitlesBy",
+                translation(major),
-            fanart,
+                "&limit=camelot&sort=" + sort + "&start=" + str(num) + "B",
-        )
+                "sortTitlesBy",
-        num1 += 1
+                fanart,
-    endOfDirectory()
+            )
+            num1 += 1
+        endOfDirectory()
 
 
 def opensettings():
@@ -737,25 +739,20 @@ def resolveprovider(entry):
         ):
             provider = str(entry["sources"][0]["provider"])
             videoid = str(entry["sources"][0]["videoid"])
-            agerestricted = int(entry["sources"][0]["age_limit"])
+            restricted = int(entry["sources"][0]["age_limit"])
-            video_url = str(entry["sources"][0]["video_url"])
         elif entry["sources"][1]["provider"] == preferedprovider:
             provider = str(entry["sources"][1]["provider"])
             videoid = str(entry["sources"][1]["videoid"])
-            agerestricted = int(entry["sources"][1]["age_limit"])
+            restricted = int(entry["sources"][1]["age_limit"])
-            video_url = str(entry["sources"][1]["video_url"])
         else:
             provider = str(entry["sources"][0]["provider"])
             videoid = str(entry["sources"][0]["videoid"])
-            agerestricted = int(entry["sources"][0]["age_limit"])
+            restricted = int(entry["sources"][0]["age_limit"])
-            video_url = str(entry["sources"][0]["video_url"])
     else:
-        # we should never end up here?
         provider = str(entry["sources"][0]["provider"])
         videoid = str(entry["sources"][0]["videoid"])
-        agerestricted = int(entry["sources"][0]["age_limit"])
+    agerestricted = 0
-        video_url = str(entry["sources"][0]["video_url"])
+    agerestricted = int(entry["sources"][0]["age_limit"])
-
     slug = str(entry["slug"])
     addonyoutube = addon.getSetting("addon-youtube")
     addonyoutubeagerestricted = addon.getSetting("addon-youtube-age-restricted")
@@ -838,9 +835,6 @@ def resolveprovider(entry):
                 % (videoid)
             )
         provider = addonvevo
-    elif len(video_url) > 0:
-        url = video_url
-
     if provider == "script.module.youtube.dl":
         import YDStreamExtractor