Update to 1.4.9-6

Reviewed-on: hummypkg/webif#45

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.9-3
+Version: 1.4.9-6
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.13),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

webif/html/browse/rename.jim

@@ -28,14 +28,16 @@ if {[file isdirectory $file]} {
 			set old [$ts get $attr]
 			if {$attr eq "title" || $attr eq "synopsis"} {
 				set new "\025$new"
+			} elseif {$attr eq "genre"} {
+				set new [ts genre $new]
 			}
 			if {$new ne $old} {
-				if {$attr eq guidance || $new ne ""} {
+				if {$attr eq "guidance" || $new ne ""} {
 					$ts set$attr $new
 				}
 			}
 		} msg]} {
-			puts "$attr: $msg"
+			stderr puts "$attr: $msg"
 		}
 	}
 	# deal with series number/ep num/ep total, which get set together
@@ -69,7 +71,7 @@ if {[file isdirectory $file]} {
 				lappend epdatanew $old
 			}
 		} msg]} {
-			puts "$attr: $msg"
+			stderr puts "$attr: $msg"
 		}
 	}
 	if {$epdatanew ne {}} {

webif/lib/ts.class

@@ -322,10 +322,18 @@ ts method setguidance {newguidance} {
 	set guidance $newguidance
 }
 
-ts method setgenre {newgenre} {
-	if {$newgenre <= 15} {
-		set newgenre $($newgenre << 4)
+proc {ts genre} {genre} {
+	if {![string is integer $genre] || $genre < 0} {
+		set genre 0
 	}
+	if {$genre <= 15} {
+		set genre $($genre << 4)
+	}
+	return $genre
+}
+
+ts method setgenre {newgenre} {
+	set newgenre [ts genre $newgenre]
 	exec /mod/bin/hmt "+setgenre=-${newgenre}" $file
 	set genre $newgenre
 }
@@ -862,6 +870,7 @@ ts method getkey {mode} {
 			if {[string length $key] == 32} {
 				ladd keys $key
 			}
+		} on error {} {
 		} finally {
 			catch {$fd close}
 		}
@@ -878,6 +887,7 @@ ts method getkey {mode} {
 			foreach key [split [$fd read -nonewline] "\n"] {
 				ladd keys $key
 			}
+		} on error {} {
 		} finally {
 			catch {$fd close}
 		}

webif/lib/utils

@@ -102,7 +102,7 @@ proc ::js::_unescape {str} {
 
 proc ::js::escape {str} {
 	return [subst -nobackslashes -novariables \
-		[regsub -all -- {[^A-Za-z0-9@*_+-./]+} $str \
+		[regsub -all -- {[^A-Za-z0-9@*_+./-]+} $str \
 			{[::js::_escape {&}]}]]
 }