From 0c3af11f45fd40c8f3d8f174fb71c066e8bfe442 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Thu, 25 Jun 2015 22:19:05 +0000
Subject: [PATCH] mux updates

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2439 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                          |  2 +-
 webif/html/dedup/process.jim             |  2 ++
 webif/{cgi-bin => html/diag}/channel.jim | 15 ++++++++++++---
 webif/html/diag/script.js                |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)
 rename webif/{cgi-bin => html/diag}/channel.jim (93%)

diff --git a/CONTROL/control b/CONTROL/control
index 72924a8d..a2392e31 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.3-2
+Version: 1.2.3-3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.3),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>2.0.3-3),auto-unprotect(>=2.0.0-1)
diff --git a/webif/html/dedup/process.jim b/webif/html/dedup/process.jim
index eb11ba1e..92ee1c90 100755
--- a/webif/html/dedup/process.jim
+++ b/webif/html/dedup/process.jim
@@ -21,6 +21,8 @@ proc dedupprocess {file} {{seen {}}} {
 	set dir [file dirname $file]
 	set base [file tail [file rootname $file]]
 	set syn [dedupnormalise [$ts get synopsis] [$ts get title]]
+#	set epname [$ts episode_name]
+#	set syn "[$ts epstr] - $epname"
 	# Escape special characters to create the filename.
 	set fn [system filename $syn]
 
diff --git a/webif/cgi-bin/channel.jim b/webif/html/diag/channel.jim
similarity index 93%
rename from webif/cgi-bin/channel.jim
rename to webif/html/diag/channel.jim
index 0fc87258..40c16ca8 100755
--- a/webif/cgi-bin/channel.jim
+++ b/webif/html/diag/channel.jim
@@ -70,15 +70,24 @@ foreach tw [$db query {
 		lassign $chan x lcn x name
 		set name [system strip $name]
 		if {$lcn >= 800} { incr ehs }
-		switch $name {
+		switch -glob -- $name {
+			"BBC TWO" -
 			"BBC THREE" { set mux "PSB1/BBC A" }
-			"ITV1" { set mux "PSB2/D3&amp;4" }
-			"ITV" { set mux "PSB2/D3&amp;4" }
+			"Channel 5" -
+			"ITV2" { set mux "PSB2/D3&amp;4" }
+			"Channel 4 HD" -
 			"BBC ONE HD" { set mux "PSB3/BBC B" }
+			"5 USA" -
+			"CITV" -
 			"ITV3" { set mux "COM4/SDN" }
+			"Really" -
 			"Dave" { set mux "COM5/ARQ A" }
+			"4Music" -
+			"Yesterday" -
 			"ITV4" { set mux "COM6/ARQ B" }
+			"BBC FOUR HD" -
 			"BBC NEWS HD" { set mux "COM7/ARQ C" }
+			"Made In *" -
 			"Movies4Men" { set mux "Local" }
 			"QVC + 1 HD" { set mux "COM8/ARQ D" }
 		}
diff --git a/webif/html/diag/script.js b/webif/html/diag/script.js
index d0665e29..f147de51 100644
--- a/webif/html/diag/script.js
+++ b/webif/html/diag/script.js
@@ -39,7 +39,7 @@ $('#dbinfo').click(function(e) {
 
 $('#channelinfo').click(function(e) {
 	e.preventDefault();
-	window.location = '/cgi-bin/channel.jim';
+	window.location = '/diag/channel.jim';
 });
 
 $('#diskdiag').click(function(e) {