Preferences #2

Contents/Code/__init__.py

@@ -122,18 +122,34 @@ def getRecapItems(videos):
 		for video in videos:
 			bitrate = int(video["name"].split("_")[1][0:-1])
 			height = int(video["height"])
-			objects.insert(0, MediaObject(
-				container = Container.MP4,
-				video_codec = VideoCodec.H264,
-				audio_codec = AudioCodec.AAC,
-				video_resolution = height,
-				audio_channels = 2,
-				height = height,
-				width = int(video["width"]),
-				parts = [
-					PartObject(key=Callback(PlayRecap, url=video["url"]))
-				]
-			))
+			if Prefs['quality'][0:3] == str(height):
+				objects.insert(0, MediaObject(
+					container = Container.MP4,
+					video_codec = VideoCodec.H264,
+					audio_codec = AudioCodec.AAC,
+					video_resolution = height,
+					audio_channels = 2,
+					height = height,
+					width = int(video["width"]),
+					parts = [
+						PartObject(key=Callback(PlayRecap, url=video["url"]))
+					]
+				))
+			else:
+				objects.append(MediaObject(
+					container = Container.MP4,
+					video_codec = VideoCodec.H264,
+					audio_codec = AudioCodec.AAC,
+					video_resolution = height,
+					audio_channels = 2,
+					height = height,
+					width = int(video["width"]),
+					parts = [
+						PartObject(key=Callback(PlayRecap, url=video["url"]))
+					]
+				))
+		if Prefs['quality'] == 'Auto':
+			objects.sort(key=lambda o: o.video_resolution, reverse=True)
 		return objects
 
 	return VideoClipObject(
@@ -157,7 +173,10 @@ def getStreamItems():
 		if STREAM_CACHE[game.game_id].get(feed.mediaId) != None:
 			return STREAM_CACHE[game.game_id][feed.mediaId]
 
-		cdn = 'akc'
+		if Prefs['cdn'] == "Level 3":
+			cdn = "l3c"
+		else:
+			cdn = "akc"
 		if game.sport == "nhl":
 			url = "http://mf.svc.nhl.com/m3u8/%s/%s" % (date, feed.mediaId)
 		else:
@@ -225,12 +244,19 @@ def getStreamItems():
 						]
 					)
 
-				if int(height_s) < best_height or float(fps_s) < best_fps:
-					objects.append(media_object)
-				else:
-					best_height = int(height_s)
-					best_fps = float(fps_s)
+				if Prefs['quality'] == 'Auto':
+					if int(height_s) < best_height or float(fps_s) < best_fps:
+						objects.append(media_object)
+					else:
+						best_height = int(height_s)
+						best_fps = float(fps_s)
+						objects.insert(0, media_object)
+				elif Prefs['quality'] == '720p60' and round(float(fps_s)) == 60.0:
 					objects.insert(0, media_object)
+				elif Prefs['quality'] == media_object.video_resolution+'p':
+					objects.insert(0, media_object)
+				else:
+					objects.append(media_object)
 
 		STREAM_CACHE[game.game_id][feed.mediaId] = objects
 		return objects
@@ -330,4 +356,7 @@ def GetMediaAuth():
 	salt = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 	garbled = ''.join(random.sample(salt, len(salt)))
 	auth = ''.join([garbled[int(i * random.random()) % len(garbled)] for i in range(0,241)])
-	return auth
+	return auth
+
+def ValidatePrefs():
+	return None

Contents/Code/game.py

@@ -79,7 +79,10 @@ class Recap(object):
     def fromContent(content, content_title, sport):
         def fromItem(item):
             recap = Recap()
-            recap.title = item["title"]
+            if Prefs['show_scores'] or "Recap" not in item["title"]:
+            	recap.title = item["title"]
+            else:
+            	recap.title = 'Recap'
             recap.summary = item["description"]
             recap.year = int(item["date"][0:4])
             recap.studio = sport

Contents/DefaultPrefs.json

@@ -0,0 +1,22 @@
+[
+    {
+        "id": "show_scores",
+        "label": "Show scores for recaps",
+        "type": "bool",
+        "default": "true"
+    },
+    {
+        "id": "quality",
+        "type": "enum",
+        "label": "Quality",
+        "values": ["Auto", "720p60", "720p", "540p", "504p", "360p", "288p"],
+        "default": "Auto"
+    },
+    {
+    	"id": "cdn",
+    	"type": "enum",
+    	"label": "CDN",
+    	"values": ["Akamai", "Level 3"],
+    	"default": "Akamai"
+    }
+]