remove integrated flatten

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.3
+Version: 1.2.3-1
 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)

webif/html/browse/assets.jim

@@ -96,9 +96,6 @@ if {$model eq "HDR"} {
 		    </a></li>
 	}
 }
-if {$flatten} {
-	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
-}
 
 puts {
 	<li class=clock><a href=#expire>Auto-Expire Options</a></li>

webif/html/browse/index.jim

@@ -14,7 +14,6 @@ eval_plugins browse
 header
 
 set nicesplice [system pkginst nicesplice]
-set flatten [system pkginst flatten]
 
 set ignore {.nts .thm .hmi}
 set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt .m4v}

webif/html/browse/script.js

@@ -389,15 +389,6 @@ function fixdmenu(el, menu, flag, tag, descr, recurse)
 
 function preparedmenu(el, menu)
 {
-	if (el.attr('noflat') != undefined)
-	{
-		if (el.attr('noflat') > 0)
-			$(menu).changeContextMenuItem('#flat', 'Allow Flatten');
-		else
-			$(menu).changeContextMenuItem('#flat',
-			    'Prevent Flatten');
-	}
-
 	fixdmenu(el, menu, 'autoshrink', '#shrink', 'Auto-shrink', 1);
 	fixdmenu(el, menu, 'autodedup', '#dedup', 'Auto-dedup', 0);
 	fixdmenu(el, menu, 'autodecrypt', '#decrypt', 'Auto-decrypt', 1);
@@ -666,10 +657,6 @@ var dmenuclick = function(action, el, pos)
 		$('#aexpiry').dialog('open');
 		break;
 
-	    case 'flat':
-		flagdir(file, 'noflatten', iconset, results, el);
-		break;
-
 	    case 'dedup':
 		flagdir(file, 'autodedup', iconset, results, el);
 		break;

webif/html/sched/script.js

@@ -301,10 +301,16 @@ $('#manrsv').dialog({
 		if (s)
 			data.push({ name: "start", value: s.getTime() / 1000});
 
-		var s = $('#mretime').timepicker('getTime',
+		var e = $('#mretime').timepicker('getTime',
 		    $('#mredate').datepicker('getDate'));
-		if (s)
-			data.push({ name: "end", value: s.getTime() / 1000});
+		if (e)
+			data.push({ name: "end", value: e.getTime() / 1000});
+
+		if (s.getTime() >= e.getTime())
+		{
+			$('#mrerr').html('Invalid time range...');
+			return;
+		}
 
 		$('#mrerr')
 		    .html('<img src=/img/loading.gif> Creating event...');

webif/lib/bin/auto

@@ -10,6 +10,8 @@ set audiomp3 [$settings audiomp3]
 
 set modules {decrypt dedup shrink mpg mp3 expire}
 
+set root [system mediaroot]
+
 set logfile "/mod/tmp/auto.log"
 
 set logfd "unset"
@@ -72,6 +74,13 @@ proc inuse {ts} {
 	return [$ts inuse]
 }
 
+proc specialdir {dir} {
+	if {[string match {\[*} [string trimleft [file tail $dir]]]} {
+		return 1
+	}
+	return 0
+}
+
 proc elapsed {start} {
 	return $(([clock milliseconds] - $start) / 1000.0)
 }
@@ -121,7 +130,7 @@ proc runplugin {name {ts 0}} {
 	}
 }
 
-eval_plugins auto
+eval_plugins auto 1
 
 set scanstart [clock milliseconds]
 log "-------------------------------------------------------"
@@ -667,7 +676,7 @@ proc scan_run {dir flag callback} {
 
 	if {$dir eq $dustbin} return
 
-	if {[string match {\[*} [file tail $dir]]} return
+	if {[specialdir $dir]} return
 
 	if {[file exists "$dir/.$flag"]} { $callback $dir }
 
@@ -691,7 +700,7 @@ proc xscan {dir attr {force 0} {recurse 1}} {{indent 0} {forceflag ""}} {
 		return
 	}
 
-	if {[string match {\[*} [file tail $dir]]} {
+	if {[specialdir $dir]} {
 		# Special folder
 		file stat "$dir/" st
 		if {$st(dev) != $::rootdev} {
@@ -737,7 +746,7 @@ proc scanup {dir flag} {
 
 	set rl [string length $root]
 	while {[string length $dir] >= $rl} {
-		if {[string match {\[*} [file tail $dir]]} {
+		if {[specialdir $dir]} {
 			return -1
 		}
 		if {[file exists "$dir/.auto${flag}r"]} {
@@ -770,7 +779,6 @@ proc scansingle {dirs} {
 	}
 }
 
-set root [system mediaroot]
 file stat "$root/" rootstat
 set rootdev $rootstat(dev)
 log "Root device: $rootdev" 2

webif/lib/browse.class

@@ -4,8 +4,6 @@ require system.class plugin
 if {![exists -proc class]} { package require oo }
 class dir {}
 
-set _flatten [system pkginst flatten]
-
 proc _addicon {img {hover ""} {class va}} {
 	set icon "<img src=$img class=\"$class\" height=21"
 	if {$hover ne ""} {
@@ -36,15 +34,6 @@ proc {dir iconset} {dir} {
 	set icons {}
 	set attrs {}
 
-	set noflat 0
-	if {$::_flatten} {
-		if {[string match {\[*\]} [file tail $dir]]} { set noflat 1 }
-		if {[file exists "$dir/.noflatten"]} { set noflat 1 }
-		if {$noflat} { lappend icons \
-		    [_addicon "/img/flat-tyre.png" "No-flatten"] }
-		lappend attrs "noflat=$noflat"
-	}
-
 	set autoshrinkr 0
 	if {[file exists "$dir/.autoshrinkr"]} {
 		set autoshrinkr 1

webif/lib/plugin

@@ -1,8 +1,14 @@
 
-proc eval_plugins {hook} {
+proc eval_plugins {hook {verbose 0}} {
 	foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] {
+		if {[file exists "$plugin/.disabled"]} continue
 		if {[file isfile "$plugin/$hook.hook"]} {
-			catch {uplevel source "$plugin/$hook.hook"}
+			if {[catch \
+			    {uplevel source "$plugin/$hook.hook"} msg]} {
+				if {$verbose} {
+					puts "$plugin/$hook - $msg"
+				}
+			}
 		} 
 	}
 }