From 1b881cb90a4c975830cf4ebf900f0a891d70e57d Mon Sep 17 00:00:00 2001
From: Peter <user@solaire.solaire.pw>
Date: Fri, 25 Jul 2014 20:33:38 +0200
Subject: [PATCH 1/2] Fixed issue #246 by increasing the channel limit.
 Channels are now sorted on tags (ASC). Also fixed a rare bug to prevent an
 empty channel list in case GetChannels returns after GetChannelTags returned.

---
 interfaces/default/js/tvheadend.js | 5 ++++-
 modules/tvheadend.py               | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/interfaces/default/js/tvheadend.js b/interfaces/default/js/tvheadend.js
index 3b62fc484..76f483961 100644
--- a/interfaces/default/js/tvheadend.js
+++ b/interfaces/default/js/tvheadend.js
@@ -67,6 +67,8 @@ function getChannelTags() {
 				
 			$(".tab-content").append(strTabPane.append($("<ul>").attr("id", "tag-" + pEntry.identifier + "-grid").attr("class", "thumbnails")));
 		});
+		
+		getChannels();
 	});
 	
 	$(window).trigger("hashchange");
@@ -91,6 +93,8 @@ function getChannels() {
 			
 			strHTML.append(pHTMLEntry);
 			
+			console.log(pEntry.tags);
+			
 			$.each(pEntry.tags, function(nIndex, nTag) {
 				$("#tag-" + nTag + "-grid").append($("<li>").append(strHTML));
 			});
@@ -142,6 +146,5 @@ function getRecordings() {
 
 $(document).ready(function () {
 	getChannelTags();
-	getChannels();
 	getRecordings();
 });
\ No newline at end of file
diff --git a/modules/tvheadend.py b/modules/tvheadend.py
index 9f1a651aa..9c903bf41 100644
--- a/modules/tvheadend.py
+++ b/modules/tvheadend.py
@@ -35,7 +35,7 @@ def GetEPG(self, strLimit = "300", strChannel = ""):
 	@cherrypy.expose()
 	@cherrypy.tools.json_out()
 	def GetChannels(self):
-		return self.fetch("api/channel/grid", None)
+		return self.fetch("api/channel/grid", { 'dir': 'ASC', 'sort': 'tags', 'limit': 1000 })
 	
 	@cherrypy.expose()
 	@cherrypy.tools.json_out()
@@ -71,7 +71,7 @@ def fetch(self, strQuery, rgpData):
 		try:
 			pRequest = urllib2.Request("http://%s:%s/%s" % (htpc.settings.get("tvheadend_host", ""), htpc.settings.get("tvheadend_port", ""), strQuery), data = strData, headers = rgpHeaders)
 			strResponse = urllib2.urlopen(pRequest).read()
-		except urllib2.HTTPError, e:
-			print e
+		except:
+			pass
 
 		return json.loads(strResponse)
\ No newline at end of file

From 16ddf5aef227d8b41d5e6c6d7a98842fa4f8e651 Mon Sep 17 00:00:00 2001
From: Peter <user@solaire.solaire.pw>
Date: Fri, 25 Jul 2014 20:36:59 +0200
Subject: [PATCH 2/2] Removed debug information

---
 interfaces/default/js/tvheadend.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interfaces/default/js/tvheadend.js b/interfaces/default/js/tvheadend.js
index 76f483961..1862fa624 100644
--- a/interfaces/default/js/tvheadend.js
+++ b/interfaces/default/js/tvheadend.js
@@ -93,8 +93,6 @@ function getChannels() {
 			
 			strHTML.append(pHTMLEntry);
 			
-			console.log(pEntry.tags);
-			
 			$.each(pEntry.tags, function(nIndex, nTag) {
 				$("#tag-" + nTag + "-grid").append($("<li>").append(strHTML));
 			});