mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-15 22:19:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

FileTree: allow regex filename matching options

Browse Source
This commit is contained in:
Eric Schultz
2016-06-30 12:21:24 -05:00
parent b79ff2e0cf
commit 74b7ca3d71
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/dynamix/include/FileTree.php
View File

@@ -34,6 +34,7 @@ if (substr($postDir, -1) != '/') {
$postDir = preg_replace("#[\/]+#", "/", $postDir);
$filters = (array)(isset($_POST['filter']) ? $_POST['filter'] : '');
$match = (isset($_POST['match']) ? $_POST['match'] : '.*');
// set checkbox if multiSelect set to true
$checkbox = ( isset($_POST['multiSelect']) && $_POST['multiSelect'] == 'true' ) ? "<input type='checkbox' />" : null;
@@ -76,7 +77,9 @@ if( file_exists($postDir) ) {
foreach ($filters as $filter) {
if (empty($filter) | $ext==$filter) {
echo "<li class='file ext_{$ext}'>{$checkbox}<a href='#' rel='" . $htmlRel . "'>" . $htmlName . "</a></li>";
if (empty($match) || preg_match('/'.$match.'/', $file)) {
echo "<li class='file ext_{$ext}'>{$checkbox}<a href='#' rel='" . $htmlRel . "'>" . $htmlName . "</a></li>";
}
}
}
}

7
plugins/dynamix/javascript/jquery.filetree.js
View File

@@ -9,6 +9,7 @@
*
* Options: root - root folder to display; default = /
* filter - filter on file extension; default = none
* match - regex filter on file name for inclusion; default = .* (match all)
* script - location of the serverside AJAX file to use; default = FileTree.php
* folderEvent - event to trigger expand/collapse; default = click
* expandSpeed - default = 500 (ms); use -1 for no animation
@@ -33,6 +34,7 @@ if(jQuery) (function($){
// Default options
if( options.root === undefined ) options.root = '/mnt/';
if( options.filter === undefined ) options.filter = '';
if( options.match === undefined ) options.match = '.*';
if( options.script === undefined ) options.script = '/webGui/include/FileTree.php';
if( options.folderEvent === undefined ) options.folderEvent = 'click';
if( options.expandSpeed === undefined ) options.expandSpeed = 300;
@@ -54,6 +56,7 @@ if(jQuery) (function($){
dir: dir,
multiSelect: options.multiSelect,
filter: options.filter,
match: options.match,
show_parent : show_parent
})
.done(function(data){
@@ -165,6 +168,7 @@ if(jQuery) (function($){
// Valid options:
// pickfolders (true/false) -- if true, the input value is populated when clicking folders within the tree picker
// pickfilter (string) -- File extension to filter on, comma-seperated for multiple
// pickmatch (string) -- File name to filter on by regex
// pickroot (string) -- The initial path to "start in" and list folders from
// pickcloseonfile (true/false) -- if true, hides the tree picker after selecting a file
//
@@ -208,7 +212,8 @@ if(jQuery) (function($){
picker.fileTree({
root: config.pickroot,
filter: (config.pickfilter || '').split(",")
filter: (config.pickfilter || '').split(","),
match: config.pickmatch || '.*'
},
($.isFunction(file_event) ? file_event : function(file) {
input.val(file).change();