reinstate delete, add failed recordings

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@638 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.10
+Version: 0.8.11
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.3),ssmtp,anacron
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron
 Suggests: ffmpeg,webif-iphone,nicesplice,id3v2
 Description: An evolving web interface for the Humax.

var/mongoose/cgi-bin/browse.jim

@@ -10,8 +10,8 @@ puts ""
 set nicesplice [system pkginst nicesplice]
 set flatten [system pkginst flatten]
 
-set ignore {.nts .thm .hmt .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
+set ignore {.nts .thm .hmi}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
 
 cgi_input
 #cgi_dump
@@ -93,6 +93,12 @@ proc entry {file} {{i 0}} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
+	} elseif {$ext eq ".hmt"} {
+		if {[file exists "${base}.ts"]} { continue }
+		# Sole hmt file indicates failure to track.
+		set type bad
+		set ts 0
+		set img Video_Failed
 	} else {
 		set type gen
 		set ts 0
@@ -102,8 +108,8 @@ proc entry {file} {{i 0}} {
 	set new 0
 	if {$type eq "ts"} {
 		if {[$ts flag "New"] > 0} { set new 1 }
-	} else {
-		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
+	} elseif {$type eq "gen"} {
+		if {![file exists "${base}.hmi"]} { set new 1 }
 	}
 
 	if {$new} { append img _New }

var/mongoose/cgi-bin/browse/browse.js

@@ -253,7 +253,6 @@ function preparemenu(el, menu)
 		$(menu).disableContextMenuItems('#audio');
 		$(menu).disableContextMenuItems('#crop');
 	}
-$(menu).disableContextMenuItems('#delete');
 
 }
 
@@ -267,7 +266,6 @@ function preparedmenu(el, menu)
 			$(menu).changeContextMenuItem('#flat',
 			    'Prevent Flatten');
 	}
-$(menu).disableContextMenuItems('#delete');
 }
 
 $(document).ready(function() {
@@ -554,7 +552,7 @@ var dmenuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fsts:checked + a').each(function() {
-			files.push(encodeURIComponent($(this).attr('file')));
+			files.push($(this).attr('file'));
 		});
 		//console.log("%o", files);
 		window.location.href = '/cgi-bin/browse/join.jim?files=' +
@@ -565,7 +563,7 @@ var dmenuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fs:checked + a').each(function() {
-			files.push($(this).attr('file'));
+			files.push(decodeURIComponent($(this).attr('file')));
 		});
 		//console.log("%o", files);
 		var str = 'Are you sure you want to delete ' + files.length +
@@ -589,9 +587,10 @@ var dmenuclick = function(action, el, pos)
 				}
 			});
 			$('#pwfeedback').load(
-			    '/cgi-bin/browse/mdelete.jim?dir=' +
-			    encodeURIComponent(dir) + '&files=' +
-		    	    files.join(), function() {
+			    '/cgi-bin/browse/mdelete.jim', {
+				'dir': dir,
+				'files': files
+				}, function() {
 				$('#pwdialogue').dialog('close');
 				window.location.reload(true);
 			});
@@ -602,14 +601,19 @@ var dmenuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fs:checked + a').each(function() {
-			files.push($(this).attr('file'));
+			files.push(decodeURIComponent($(this).attr('file')));
 		});
 		//console.log("%o", files);
 		var action = $(this).attr('id');
-		if (action == 'copy' && !confirm('Are you sure? Copying recordings can take a very long time!'))
+		if (action == 'copy' && !confirm('Are you sure? ' +
+		    'Copying recordings can take a very long time!'))
 			return;
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
-		    '&path=' + files.join(), function() {
+
+		$.post('/cgi-bin/browse/clipboard.jim', {
+		    'act': 'add',
+		    'mode': action,
+		    'path': files
+		    }, function() {
 			reloadclipboard();
 			$('input.fs:checked').attr('checked', false);
 		    });
@@ -659,8 +663,6 @@ var dmenuclick = function(action, el, pos)
 		else
 			$('#delete,#cut,#copy').disable();
 
-		$('#delete').disable();
-	
 		var num = $('input.fsts:checked').size();
 		if (num > 1)
 			$('#join').enable();

var/mongoose/cgi-bin/browse/clipboard.jim

@@ -52,7 +52,7 @@ switch $action {
 		exit
 	}
 	set mode [cgi_get mode copy]
-	foreach p [split $path ","] {
+	foreach p $path {
 		set p [cgi_unquote_input $p]
 		if {![$cb present $p]} {
 			$cb add $mode $p

var/mongoose/cgi-bin/browse/mdelete.jim

@@ -8,13 +8,20 @@ puts "Content-Type: text/html\r\n\r\n"
 
 cgi_input 1
 #cgi_dump
+
 set dir [cgi_unquote_input [cgi_get dir]]
 
+#puts "DIR: ($dir)"
+
 puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
 puts "<ul style=\"list-style-type: square\">"
-foreach file [split [cgi_get files] ","] {
+foreach file [cgi_get files] {
 	set file [cgi_unquote_input $file]
 	puts -nonewline "<li>\"$file\"..."
+	if {![string match "$dir/*" $file]} {
+		puts "Error - outside directory."
+		continue
+	}
 
 	if {[file isdirectory $file]} {
 		puts -nonewline "Directory..."
@@ -38,15 +45,4 @@ foreach file [split [cgi_get files] ","] {
 	puts "</li>"
 }
 puts "</ul>"
-puts "<button id=back dir=\"$dir\">Back to media list</button>";
-
-puts {
-<script type=text/javascript>
-$('#deleting').slideUp('slow');
-$('#back').button().click(function() {
-	window.location.href = '/cgi-bin/browse.jim?dir=' +
-	    encodeURIComponent($('#back').attr('dir'));
-});
-</script>
-}