diff --git a/webif/plugin/sweeper/img/icon256.png b/webif/plugin/sweeper/img/icon256.png new file mode 100644 index 0000000..b407c33 Binary files /dev/null and b/webif/plugin/sweeper/img/icon256.png differ diff --git a/webif/plugin/sweeper/img/noicon22.png b/webif/plugin/sweeper/img/noicon22.png new file mode 100644 index 0000000..8f906e7 Binary files /dev/null and b/webif/plugin/sweeper/img/noicon22.png differ diff --git a/webif/plugin/sweeper/menu.hook b/webif/plugin/sweeper/menu.hook new file mode 100755 index 0000000..57c0ec5 --- /dev/null +++ b/webif/plugin/sweeper/menu.hook @@ -0,0 +1,5 @@ +menuitem \ + "Sweeper" \ + "/plugin/sweeper/img/icon256.png" \ + "/plugin/sweeper/edit.jim" + diff --git a/webif/plugin/sweeper/rules_json.jim b/webif/plugin/sweeper/rules_json.jim index ff2d486..bddd378 100755 --- a/webif/plugin/sweeper/rules_json.jim +++ b/webif/plugin/sweeper/rules_json.jim @@ -76,12 +76,19 @@ proc rule {id rule} { set lockfound -1 while {[llength $rule] > 1} { set rule [lassign $rule cmd arg] + if {[string index $cmd 0] eq "!"} { + set negate 1 + set cmd [string range $cmd 1 end] + } else { + set negate 0 + } if {$cmd eq "action"} break if {$cmd eq "lock"} { set lockfound $arg } if {$c} { add_json ",\n" } incr c add_json " {\n" + add_json " \"negate\": $negate,\n" add_json " \"cmd\": \"[quot $cmd]\",\n" add_json " \"arg\": \"[quot $arg]\"\n" add_json " }" diff --git a/webif/plugin/sweeper/schema.js b/webif/plugin/sweeper/schema.js index c57a65b..2a99b1c 100644 --- a/webif/plugin/sweeper/schema.js +++ b/webif/plugin/sweeper/schema.js @@ -46,18 +46,21 @@ var schema = { 'class': 'all', type: 'substr', desc: 'Recording Title contains', + idesc: 'Recording Title does not contain', def: 'Enter text here...' }, synopsis: { 'class': 'all', type: 'substr', desc: 'Synopsis contains', + idesc: 'Synopsis does not contain', def: 'Enter text here...' }, guidance: { 'class': 'all', type: 'substr', desc: 'Guidance Text contains', + idesc: 'Guidance Text does not contain', def: 'Enter text here...' }, genre: { @@ -91,6 +94,7 @@ var schema = { 'class': 'all', type: 'select', desc: 'Recording Flagged as', + idesc: 'Recording not Flagged as', select: { Locked: 'Locked', New: 'New', @@ -113,11 +117,18 @@ var schema = { def: 1, deprecated: true }, + filename: { + 'class': 'all', + type: 'substr', + desc: 'Filename contains', + def: 'Enter text here...' + }, fflag: { 'class': 'folder', type: 'string', desc: 'Folder flagged as', - def: 'noflatten' + idesc: 'Folder not flagged as', + def: 'nosweep' } }, action: { @@ -169,6 +180,12 @@ var schema = { desc: 'Merge into or create folder of ' + 'same name found under...', continues: false + }, + renamefile: { + 'class': 'all', + argtype: 'string', + desc: 'Rename recording files to...', + continue: true } } }; diff --git a/webif/plugin/sweeper/script.js b/webif/plugin/sweeper/script.js index 47f585a..81b742c 100644 --- a/webif/plugin/sweeper/script.js +++ b/webif/plugin/sweeper/script.js @@ -101,11 +101,14 @@ function ruleconf(rule) rule.find('tr.clause').each(function(i) { cmd = $(this).find('th.cmd').attr('cmd'); + negate = $(this).find('th.cmd').attr('negate'); c = schema.criterion[cmd]; val = $.trim($(this).find('td.val').html()); if (getters[c.type]) val = getters[c.type](cmd, val); + if (negate == '1') + s += '!'; s += cmd + ' ' + quot(val) + ' '; }); @@ -156,14 +159,32 @@ function rulerefresh(rule) } } +function critdesc(cmd, negate) +{ + var c = schema.criterion[cmd]; + if (!c) + return 'Unknown (' + cmd + ')'; + if (negate == '1' && c.idesc) + return c.idesc; + else if (negate == '1') + return c.desc + ' is not'; + else + return c.desc; +} + function criterion(data) { var c = schema.criterion[data.cmd]; var s; + if (!c) + { + alert('Unknown Criterion (' + data.cmd + ')'); + return; + } s = '
Running rules... Please wait...');
+ $('#testresults').dialog({
+ height: '600', width: '800',
+ draggable: true, resizable: true,
+ autoOpen: true,
+ buttons: {
+ "Close": function() {
+ $(this).dialog('close');
+ }
+ }
+ });
+ $.post('test.jim', {
+ dir: $('span.dir').text(),
+ data: conffile()
+ }, function(data) {
+ $('#testresults_inner').text(data);
+ });
+});
+
$('#b_raw').button({icons: {primary: "ui-icon-gear"}})
.on('click', function(e) {
$('#ruleset div.raw').toggle('slow');
@@ -552,6 +599,56 @@ $('#macros').on('click', '#b_macro', function(e) {
changed(0);
+function addcriterion(rule)
+{
+ var type = rule.attr('type');
+
+ if (type == 'folder')
+ options = select_folder_criteria;
+ else
+ options = select_file_criteria;
+
+ // Populate select box and reset form.
+ $('#newcondition_cmd').empty();
+ $.each(options, function(k, v) {
+ $('#newcondition_cmd').append(
+ $('').attr('value', k).html(v)
+ );
+ });
+ $('#newcondition_negate').prop('checked', false);
+
+ $('#newcondition').dialog({
+ height: 'auto', width: 'auto',
+ draggable: false, resizable: false,
+ autoOpen: true,
+ position: {
+ my: 'bottom left',
+ at: 'top right',
+ of: rule
+ },
+ buttons: {
+ "Add Condition": function() {
+ $(this).dialog('close');
+ var id = rule.attr('id');
+ var val = $('#newcondition_cmd').val();
+ var negate = $('#newcondition_negate')
+ .prop('checked') ? '1' : '0';
+ rule.find('table.criteria tbody')
+ .append(criterion({
+ cmd: val,
+ negate: negate,
+ arg: schema.criterion[val].def
+ }));
+ changed(1);
+ rulerefresh(rule);
+ },
+ "Cancel": function() {
+ $(this).dialog('close');
+ }
+ }
+ });
+}
+
$('#ruleset')
.on('click', 'a.editclause', function(e) {
e.preventDefault();
@@ -559,24 +656,7 @@ $('#ruleset')
})
.on('click', 'a.addcriterion', function(e) {
e.preventDefault();
- var rule = $(this).closest('div.rule');
- var type = rule.attr('type');
-
- if (type == 'folder')
- options = select_folder_criteria;
- else
- options = select_file_criteria;
- edit_select(rule, 'Add new condition',
- options, '', function(rule, val) {
- var id = rule.attr('id');
- rule.find('table.criteria tbody')
- .append(criterion({
- cmd: val,
- arg: schema.criterion[val].def
- }));
- changed(1);
- rulerefresh(rule);
- });
+ addcriterion($(this).closest('div.rule'));
})
.on('click', 'a.editcomment', function(e) {
e.preventDefault();
diff --git a/webif/plugin/sweeper/style.css b/webif/plugin/sweeper/style.css
index ffbc131..82d777a 100644
--- a/webif/plugin/sweeper/style.css
+++ b/webif/plugin/sweeper/style.css
@@ -148,3 +148,9 @@ tr.blank td
line-height: 7px;
}
+#testresults_inner
+{
+ overflow: auto;
+ white-space: pre;
+}
+
diff --git a/webif/plugin/sweeper/test.jim b/webif/plugin/sweeper/test.jim
new file mode 100755
index 0000000..9e26b21
--- /dev/null
+++ b/webif/plugin/sweeper/test.jim
@@ -0,0 +1,62 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require lock system.class ts.class tdelete pretty_size browse.class \
+ safe_delete settings.class plugin
+
+httpheader
+
+set dir [cgi_get dir ""]
+set root [system mediaroot]
+
+set cf "/tmp/sweepertest.cf"
+
+set data [string map {
+ & &
+ < <
+ > >
+} [cgi_get data "-"]]
+
+if {$data eq "-" || $data eq ""} {
+ puts "No data sent!"
+ exit
+}
+
+if {[catch {set fp [open $cf w]} msg]} {
+ puts "Error, $msg"
+ exit
+}
+
+$fp puts -nonewline $data
+close $fp
+
+proc log {msg {level 1}} {
+ puts $msg
+}
+
+proc elapsed {start} {
+ return $(([clock milliseconds] - $start) / 1000.0)
+}
+
+proc startclock {} {
+ set ::startclock_s [clock milliseconds]
+}
+
+proc endclock {size} {
+ set el [elapsed $::startclock_s]
+ set rate $($size / $el)
+ return "[pretty_size $size] in $el seconds - [pretty_size $rate]/s"
+}
+
+proc register {args} {}
+
+set root [system mediaroot]
+
+source auto.hook
+
+set ::sweeper::dryrun 1
+::sweeper::apply $dir $cf
+
+file delete $cf
+
diff --git a/webif/plugin/sweeper/toolbar.hook b/webif/plugin/sweeper/toolbar.hook
new file mode 100755
index 0000000..a98fe64
--- /dev/null
+++ b/webif/plugin/sweeper/toolbar.hook
@@ -0,0 +1,3 @@
+
+tb "/plugin/sweeper/img/icon256.png" "Sweeper" "/plugin/sweeper/edit.jim"
+