@@ -181,10 +183,6 @@ foreach file [lsort -command logsort $loglist] {
puts {
-
-
-
}
footer
diff --git a/webif/html/diag/script.js b/webif/html/diag/script.js
index f147de5..9092cc2 100644
--- a/webif/html/diag/script.js
+++ b/webif/html/diag/script.js
@@ -3,14 +3,26 @@ $(function() {
$('button').button();
+$('#rundiag').button({icons: {primary: "ui-icon-play"}});
+$('#runfopkg').button({icons: {primary: "ui-icon-play"}});
+$('#runedit').button({icons: {primary: "ui-icon-folder-open"}});
+$('#dbinfo').button({icons: {primary: "ui-icon-wrench"}});
+$('#channelinfo').button({icons: {primary: "ui-icon-script"}});
+$('#diskdiag').button({icons: {primary: "ui-icon-disk"}});
+$('#dlna').button({icons: {primary: "ui-icon-video"}});
+$('#dspace').button({icons: {primary: "ui-icon-search"}});
+$('#reboot').button({icons: {primary: "ui-icon-power"}});
+//$('#runreset').button({icons: {primary: "ui-icon-radio-on"}});
+//$('#runrma').button({icons: {primary: "ui-icon-radio-on"}});
+
$('#rundiag').click(function() {
var val = $('#diagsel').val();
if (val == '0')
val = $('#seq').val();
$('#results')
.slideDown()
- .html('
' +
- 'Running diagnostic, please wait...')
+ .html(' ' +
+ 'Running diagnostic, please wait...')
.load('rundiag.jim?diag=' + encodeURIComponent(val), function() {
$('#results').wrapInner('');
});
@@ -57,7 +69,7 @@ $('#dspace').click(function(e) {
window.location = 'dspace/index.jim';
});
-$('#reboot').button({icons:{primary:"ui-icon-power"}}).click(function(e) {
+$('#reboot').click(function(e) {
e.preventDefault();
window.location = '/restart/index.jim';
});
diff --git a/webif/html/edit/edit.jim b/webif/html/edit/edit.jim
index 4c3ca9f..f83c61b 100755
--- a/webif/html/edit/edit.jim
+++ b/webif/html/edit/edit.jim
@@ -32,6 +32,7 @@ class="ui-widget ui-corner-all">
+
diff --git a/webif/html/edit/perms.jim b/webif/html/edit/perms.jim
new file mode 100755
index 0000000..4e3fed4
--- /dev/null
+++ b/webif/html/edit/perms.jim
@@ -0,0 +1,25 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require pretty_size
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file "/tmp/hosts"]
+if {$file eq "-"} { exit }
+
+httpheader "text/plain" 0
+
+if {[cgi_get op "-"] eq "x"} {
+ exec chmod +x $file
+}
+
+if {![file exists $file]} {
+ puts 0
+} else {
+ set stat [file stat $file]
+ puts $($stat(mode) & 0x1ff)
+}
+
diff --git a/webif/html/edit/script.js b/webif/html/edit/script.js
index c068b18..e5dc512 100644
--- a/webif/html/edit/script.js
+++ b/webif/html/edit/script.js
@@ -4,12 +4,19 @@ var forcefile = false;
$(function() {
var file = null;
+var perms = 0;
var changed = false;
$('button').button();
$('button.editactive').disable();
$('#editor').tabsupport().disable();
+$('#open').button({icons: {primary: "ui-icon-folder-open"}});
+$('#revert').button({icons: {primary: "ui-icon-refresh"}});
+$('#save').button({icons: {primary: "ui-icon-disk"}});
+$('#create').button({icons: {primary: "ui-icon-plus"}});
+$('#executable').button({icons: {primary: "ui-icon-gear"}});
+
function loadfile(f)
{
if (!f)
@@ -18,7 +25,7 @@ function loadfile(f)
$('button.editactive').disable();
$('#editor').disable().val('');
$('#msg').text('Loading ' + f);
- $.get('get.jim?file=' + encodeURIComponent(f), function(data) {
+ $.get('get.jim', { file: f }, function(data) {
if (data.match('>>>.*does not exist'))
{
$('#msg').text(data);
@@ -40,6 +47,15 @@ function loadfile(f)
$('#msg').html('Editing ' + f + '');
file = f;
changed = false;
+
+ $.get('perms.jim', { file: f }, function(data) {
+ perms = data;
+ if (data & 0x49)
+ {
+ $('#msg').append(' - Executable');
+ $('#executable').disable();
+ }
+ });
}
});
}
@@ -119,7 +135,7 @@ function createf_submit()
console.log('Creating: ' + f);
$('#createf').dialog('close');
- $.get('create.jim?file=' + encodeURIComponent(f), function(data) {
+ $.get('create.jim', { file: f }, function(data) {
if (data.match('^>>>'))
{
$('#msg').text(data);
@@ -158,6 +174,19 @@ $('a.qfile').on('click', function() {
loadfile($(this).text());
});
+$('#executable').on('click', function() {
+ if (!confirm('Make ' + file + ' executable?'))
+ return;
+ $.get('perms.jim', { file: file, op: 'x' }, function(data) {
+ perms = data;
+ if (data & 0x49)
+ {
+ $('#executable').disable();
+ $('#msg').append(' - Executable');
+ }
+ });
+});
+
if (forcefile)
{
loadfile(forcefile);
diff --git a/webif/html/js/topbar.js b/webif/html/js/topbar.js
index f49c7d1..c7d4ec0 100644
--- a/webif/html/js/topbar.js
+++ b/webif/html/js/topbar.js
@@ -8,3 +8,17 @@ $('#topbar a').on('click', function(e) {
e.stopPropagation();
});
+$(function() {
+
+function updateidle()
+{
+ $.get('/cgi-bin/idle.jim', function(idle) {
+ $('#idletime').html(idle);
+ });
+}
+
+updateidle();
+setInterval(updateidle, 60000);
+
+});
+
diff --git a/webif/html/lib/topbar.jim b/webif/html/lib/topbar.jim
index de278bd..340db6d 100644
--- a/webif/html/lib/topbar.jim
+++ b/webif/html/lib/topbar.jim
@@ -28,6 +28,7 @@ if {[system model] eq "HDR" && [system usbdisks] > 0} {
source /mod/webif/include/usbeject.jim
}
puts {
+
}
source /mod/webif/include/toolbar.jim
diff --git a/webif/html/play/play.jim b/webif/html/play/play.jim
index 7f4a22f..67d9fe6 100755
--- a/webif/html/play/play.jim
+++ b/webif/html/play/play.jim
@@ -13,11 +13,11 @@ if {[catch {$ts get file}]} {
exit
}
-if {![$ts flag "ODEncrypted"]} {
- set url $rfile
-} else {
- lassign [$ts dlnaloc] url
- if {$url eq ""} {
+lassign [$ts dlnaloc] url
+if {$url eq ""} {
+ if {![$ts flag "ODEncrypted"]} {
+ set url $rfile
+ } else {
puts "Media is encrypted and not indexed by the DLNA Server."
exit
}
diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto
index b0e5728..b24614f 100755
--- a/webif/lib/bin/auto
+++ b/webif/lib/bin/auto
@@ -135,13 +135,13 @@ eval_plugins auto 1
set scanstart [clock milliseconds]
log "-------------------------------------------------------"
-# is_listening is relatively expensive so it is checked once globally at
+# dlnastatus is relatively expensive so it is checked once globally at
# the start and then if the server is not listening then no decrypt
# operations will be attempted for this run, even if the server starts
# up halfway through. Otherwise the server is checked for every decryption
# and if it goes away then decryption will not be attempted for the rest
# of the run.
-if {[system is_listening 9000]} {
+if {[system dlnastatus]} {
set dlnaok 1
log "DLNA Server is running." 2
} else {
@@ -333,7 +333,7 @@ proc do_decrypt {ts} {
return
}
- if {![system is_listening 9000]} {
+ if {![system dlnastatus]} {
log " $file - DLNA Server not running." 2
set ::dlnaok 0
return
@@ -445,6 +445,7 @@ proc do_decrypt {ts} {
}
log "Done... [endclock $size]" 0
lappend processed_files [$ts get file]
+ $ts unflag "ODEncrypted"
runplugin postdecrypt $ts
endop
}
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 23599a0..839db4c 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -74,6 +74,13 @@ proc {system lastbootreason} {{descr 1}} {{lbr -1}} {
return "Unknown ($lbr)"
}
+proc {system idletime} {} {
+ if {[file exists "/tmp/.lastir"]} {
+ return $([clock seconds] - [file mtime "/tmp/.lastir"])
+ }
+ return 0
+}
+
proc {system fhtcpversion} {} {{ver ""}} {
if {$ver ne ""} { return $ver }
set file "/etc/fhtcpversion"
@@ -153,6 +160,10 @@ proc {system mediaroot} {} {
return ""
}
+proc {system dlnastatus} {} {
+ return [system is_listening 9000]
+}
+
proc {system dlnadb} {} {
switch [system model] {
HDR { return "/mnt/hd2/dms_cds.db" }
@@ -163,7 +174,9 @@ proc {system dlnadb} {} {
proc {system _dlnaurl} {file urlbase} {
set mime "video/ts"
- set db [sqlite3.open [system dlnadb]]
+ if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
+ return {}
+ }
set muri [$db query {
select tblresource.mimetype, contenturi
from tblresource join tblmedia using (mediaid)
@@ -300,11 +313,17 @@ proc {system diskspace} {{raw 0}} {
set fperc $(100 - $perc)
switch [system model] {
- HDR { set tsrdir "/mnt/hd2/Tsr" }
- HD { set tsrdir "/media/drive1/.tsr" }
+ HDR {
+ set tsrdir "/mnt/hd2/Tsr"
+ set tsrok [file isdirectory $tsrdir]
+ }
+ HD {
+ set tsrdir "/media/drive1/.tsr"
+ set tsrok [file exists "$tsrdir/0.ts"]
+ }
}
- if {[file exists "$tsrdir/0.ts"]} {
+ if {$tsrok} {
set tsrbuf 21474836480
lassign [exec du -ks $tsrdir] tsrused
set tsrused $($tsrused * 1024)
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index dbc7849..74967d7 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -87,6 +87,10 @@ ts method flag {f} {
if {$f in $flags} {return 1} else {return 0}
}
+ts method unflag {f} {
+ lremove flags $f
+}
+
ts method unlock {} {
set cmd [list /mod/bin/hmt -lock $file]
exec {*}$cmd