diff --git a/http/jscript/functions.js b/http/jscript/functions.js
index 617a567..c47e239 100644
--- a/http/jscript/functions.js
+++ b/http/jscript/functions.js
@@ -9,7 +9,7 @@ var webtools = {
['subtitlemgmt', 'Subtitle Management'],
['logviewer', 'LogViewer/Downloader Tool'],
['install', 'Unsupported AppStore']
- //['findunmatched','FindUnmatched']
+ ,['findmedia','FindMedia']
],
stylesheets: [],
active_stylesheet: '',
@@ -62,7 +62,7 @@ webtools.list_modules.inline([
dataType: 'JSON',
success: function(data) {
webtools.version = data.version;
- $('#MainLink').html('Webtools - v' + data.version);
+ $('#MainLink').html('WebTools - v' + data.version);
if (data.PlexTVOnline === false) {
$('#OptionsMenu').append('
Change Password ');
}
@@ -211,9 +211,12 @@ webtools.list_modules.inline([
'Webtools is a tool that enables the use of modules to help you with your Plex Server management.
',
'
Available Modules '
];
+ $('#SublinkMainTitle').html('Choose Module');
webtools.modules.forEach(function(modulename) {
- contents.push('
' + modulename[1] + ' ');
+ contents.push('
' + modulename[1] + ' ');
+ $('#SublinkMenu').append('
' + modulename[1] + ' ');
});
+
contents.push('
Latest changelog ' + webtools.changelog + '
');
contents.push('
Credits ' + webtools.credits + '
');
$('#ContentBody').html(contents.join('
'));
@@ -254,8 +257,16 @@ webtools.activate_module = function(modulename) {
}
});
- $("#SubLink").attr('onclick', 'javascript:webtools.activate_module(\'' + modulename + '\')');
- $("#SubLink").html('/' + moduledisplayname);
+ //$("#SubLink").attr('onclick', 'javascript:webtools.activate_module(\'' + modulename + '\')');
+ //$("#SubLink").html('/' + moduledisplayname);
+
+ $('#SublinkMainTitle').html(moduledisplayname);
+ $('#SublinkMenu').html('
Reload ' + moduledisplayname + ' ');
+ webtools.modules.forEach(function(modulename) {
+ if (modulename[1] != moduledisplayname) {
+ $('#SublinkMenu').append('
' + modulename[1] + ' ');
+ }
+ });
$('#ModuleCSS').attr('href', 'modules/' + modulename + '/css/' + modulename + '.css');
if (webtools.longermodulestart === false) {
@@ -407,12 +418,7 @@ webtools.show_log = function(filename) {
$('#navfoot').html('
Search keyword Previous Next Jump to Top ');
webtools.clearresult();
$.ajax({
- url: '/webtools2',
- data: {
- 'module': 'logs',
- 'function': 'show',
- 'fileName': filename
- },
+ url: '/webtools2&module=logs&function=show&fileName' + filename.replace(/ /g, "%20"),
type: 'GET',
cache: false,
dataType: 'JSON',
@@ -702,7 +708,7 @@ webtools.dynamicSort = function(property) {
property = property.substr(1);
}
return function(a, b) {
- var result = (a[property] < b[property]) ? -1 : (a[property] > b[property]) ? 1 : 0;
+ var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property] > b[property]) ? 1 : 0;
return result * sortOrder;
}
}
diff --git a/http/manual/WebTools-User-Manual.odt b/http/manual/WebTools-User-Manual.odt
new file mode 100644
index 0000000..22bb534
Binary files /dev/null and b/http/manual/WebTools-User-Manual.odt differ
diff --git a/http/manual/WebTools-User-Manual.pdf b/http/manual/WebTools-User-Manual.pdf
new file mode 100644
index 0000000..91a4883
Binary files /dev/null and b/http/manual/WebTools-User-Manual.pdf differ
diff --git a/http/modules/findmedia/css/findmedia.css b/http/modules/findmedia/css/findmedia.css
new file mode 100644
index 0000000..fc78aa8
--- /dev/null
+++ b/http/modules/findmedia/css/findmedia.css
@@ -0,0 +1 @@
+.sectionicon {max-height:15px;}
\ No newline at end of file
diff --git a/http/modules/findmedia/jscript/findmedia.js b/http/modules/findmedia/jscript/findmedia.js
new file mode 100644
index 0000000..ee4ff1b
--- /dev/null
+++ b/http/modules/findmedia/jscript/findmedia.js
@@ -0,0 +1,312 @@
+webtools.functions.findmedia = {
+ start: function() {},
+ hasoptions: true,
+ loading: new asynchelper(true, false),
+ options: {},
+ resetSettings: function() {},
+ save_options: function() {},
+ show_options: function() {},
+ sections: [],
+ scanning_start: function() {},
+ scanning_wait: function() {},
+ scanning_present_result: function() {}
+}
+var findmedia = webtools.functions.findmedia;
+
+findmedia.start = function() {
+ webtools.loading();
+ webtools.longermodulestart = true;
+ findmedia.loading.start();
+}
+
+findmedia.loading.inline([
+ function(callback) {
+ $.ajax({
+ ///webtools2?module=settings&function=getSettings
+ url: '/webtools2?module=findMedia&function=getSettings',
+ cache: false,
+ dataType: 'JSON',
+ success: function(data) {
+ console.log(data);
+ findmedia.options = data;
+ callback();
+ },
+ error: function(data) {
+ console.log('error:' + data);
+ data.url = this.url;
+ findmedia.loading.abort();
+ webtools.display_error('Failed fetching the settings from the server. Reload the page and try again.
If the error persists please restart the server.
Contact devs on the Plex forums if it occurs again.', data);
+ }
+ });
+ },
+ function (callback) {
+ $.ajax({
+ url: '/webtools2',
+ data: {
+ 'module': 'pms',
+ 'function': 'getSectionsList'
+ },
+ cache: false,
+ dataType: 'JSON',
+ success: function(data) {
+ data.forEach(function(currentsection) {
+ findmedia.sections.push(currentsection);
+ });
+ callback('SectionFetch:Success');
+ },
+ error: function(data) {
+ data.url = this.url;
+ webtools.display_error('Failed fetching the sections from the server. Please restart the server.', data);
+ findmedia.loading.abort('Error: ' + data.statusText);
+ }
+
+ });
+ }
+ ], function () {
+ $('#ContentHeader').html('Welcome to FindMedia');
+
+ var body = ['This tool is a combination of FindUnmatched and FindMissing.','Select one of the libraries below to scan for videos/shows that are not in the Plex database or is not on your harddrive.'];
+
+ findmedia.sections.forEach(function (section) {
+ if( (section.type == "movie") || (section.type == "show") ){
+ body.push('
');
+ }
+ })
+ body.push('');
+ $('#ContentBody').html(body.join('
'));
+ $('#ContentFoot').html('');
+ $('#navfoot').html('');
+ $('.modal').modal('hide');
+ });
+
+findmedia.resetSettings = function() {
+ $('#myModalLabel').html('Resetting settings');
+ $('#myModalBody').html('Resetting settings...');
+ $('#myModalFoot').html('');
+
+ $.ajax({
+ url: '/webtools2?module=findMedia&function=resetSettings',
+ cache: false,
+ type: 'POST',
+ dataType: 'text',
+ success: function(data) {
+ $('#myModalBody').html('Settings has been reset.');
+ webtools.log('Options reset successfully.');
+ $('#myModalFoot').html('
Close ');
+ },
+ error: function(data) {
+ $('#myModalBody').html('Failed resetting settings.');
+ webtools.log('Settings has not been reset due to an error.');
+ $('#myModalFoot').html('
Close ');
+ }
+ });
+}
+
+findmedia.show_options = function() {
+ // Define the default view of options for SubtitleMGMT.
+ $('#myModalLabel').html('Preferences');
+ $('#myModalBody').html('
');
+ $('#myModalFoot').html('
Close Save Options ');
+
+
+ $('#OptionsModalAlert').hide();
+
+ var ignored_dirs_string = '';
+ findmedia.options.IGNORED_DIRS.forEach( function (ignored_dir) {
+ if (ignored_dir.length > 0) {
+ ignored_dirs_string += ignored_dir + ',';
+ }
+ });
+ ignored_dirs_string = ignored_dirs_string.substring(0,ignored_dirs_string.length-1);
+
+ var valid_extensions_string = '';
+ findmedia.options.VALID_EXTENSIONS.forEach( function (extensions) {
+ if (extensions.length > 0) {
+ valid_extensions_string += extensions + ',';
+ }
+ });
+ valid_extensions_string = valid_extensions_string.substring(0,valid_extensions_string.length-1);
+
+ var ignore_hidden_checked = '';
+ if (findmedia.options.IGNORE_HIDDEN === true) {
+ ignore_hidden_checked = 'checked=' + findmedia.options.IGNORE_HIDDEN;
+ }
+
+ var options = [
+ '
Seperate values with , (comma). ',
+ '
Ignore Hidden: ',
+ '
Ignored Directories: ',
+ '
Valid Extensions: ',
+ '
Reset settings to default '
+ ]
+
+ $('#OptionsTable').html(options.join('
'));
+
+ $('#myModal').modal('show');
+}
+
+findmedia.save_options = function() {
+ console.log($("input[name=options_ignore_hidden]").prop('checked'));
+ findmedia.options.IGNORE_HIDDEN = $("input[name=options_ignore_hidden]").prop('checked');
+ //if ($("input[name=options_ignore_hidden]").val() == 'on') {
+ // findmedia.options.IGNORE_HIDDEN = true;
+ //}
+
+
+
+
+ var ignored_dirs = $("input[name=options_ignored_dirs]").val().split(',');
+ findmedia.options.IGNORED_DIRS = [''];
+ ignored_dirs.forEach(function (dir) {
+ if(dir.length > 0) {
+ findmedia.options.IGNORED_DIRS.push(dir);
+ }
+ })
+
+ var valid_extensions = $("input[name=options_valid_extensions]").val().split(',');
+ findmedia.options.VALID_EXTENSIONS = [''];
+ valid_extensions.forEach(function (dir) {
+ if(dir.length > 0) {
+ findmedia.options.VALID_EXTENSIONS.push(dir);
+ }
+ })
+
+ var save_options_to_server = new asynchelper(false, true);
+ save_options_to_server.inline([
+ function(callback) {
+ var optionkeys = [];
+ for (var key in findmedia.options) {
+ optionkeys.push(key);
+ save_options_to_server.functionsarray.push(function(callback, optionkeys) {
+ var currentkey = optionkeys.shift();
+ $.ajax({
+ url: '/webtools2?module=findMedia&function=setSetting',
+ cache: false,
+ type: 'POST',
+ data: {key: currentkey, value: findmedia.options[currentkey].toString()},
+ dataType: 'text',
+ success: function(data) {
+ webtools.log('Options saved successfully.');
+ callback('Successfully saved ' + currentkey, optionkeys);
+ },
+ error: function(data) {
+ webtools.log('Options has not been saved due to an error.');
+ callback('Failed saving ' + currentkey, optionkeys);
+ }
+ });
+
+ });
+
+ }
+ callback('Fetched Optionkeys', optionkeys);
+ }
+ ], function(result) {
+ webtools.log(result);
+ $('.modal').modal('hide');
+ });
+}
+
+findmedia.scanning_start = function(sectionKey) {
+ webtools.loading('Starting scan of section.');
+
+ $.ajax({
+ url: '/webtools2?module=findMedia&function=scanSection§ion=' + sectionKey,
+ cache: false,
+ type: 'GET',
+ success: function(data) {
+ findmedia.scanning_wait()
+ },
+ error: function(data) {
+ data.url = this.url;
+ webtools.display_error('Failed starting the scanning. Please restart the server.', data);
+ findmedia.loading.abort('Error: ' + data.statusText);
+ }
+
+ });
+
+}
+
+findmedia.scanning_wait = function() {
+ $.ajax({
+ url: '/webtools2?module=findMedia&function=getStatus',
+ cache: false,
+ type: 'GET',
+ dataType: 'text',
+ success: function(data) {
+ console.log(data);
+ if(data == 'Idle') {
+ findmedia.scanning_present_result();
+ } else {
+ webtools.loading(data);
+ setTimeout(findmedia.scanning_wait,2000);
+ }
+ },
+ error: function(data) {
+ data.url = this.url;
+ webtools.display_error('Failed fetching the status from the server. Please restart the server.', data);
+ findmedia.loading.abort('Error: ' + data.statusText);
+ }
+
+ });
+}
+
+findmedia.scanning_present_result = function() {
+ $.ajax({
+ url: '/webtools2?module=findMedia&function=getResult',
+ cache: false,
+ type: 'GET',
+ dataType: 'JSON',
+ success: function(data) {
+ console.log(data);
+
+ var MissingFromDB = [];
+ var MissingFromFS = [];
+
+ var body = ['
',
+ 'Missing From Plex DB
',
+ '
',
+ '
',
+ 'Missing From Filesystem
'
+ ];
+
+ body = body.join('\n');
+
+
+ if(data.MissingFromDB.length > 0) {
+ data.MissingFromDB.forEach(function(item) {
+ MissingFromDB.push('
' + item + ' ');
+ })
+ } else {
+ MissingFromDB = ['
','Nothing Missing',' '];
+ }
+
+ if(data.MissingFromFS.length > 0) {
+ data.MissingFromFS.forEach(function(item) {
+ MissingFromFS.push('
' + item + ' ');
+ })
+ } else {
+ MissingFromFS = ['
','Nothing Missing',' '];
+ }
+
+ MissingFromDB = MissingFromDB.join('\n');
+ MissingFromFS = MissingFromFS.join('\n');
+
+ body = body.replace('{MissingFromDB}',MissingFromDB);
+ body = body.replace('{MissingFromFS}',MissingFromFS);
+
+ $('#ContentBody').html(body);
+
+ $('.modal').modal('hide');
+ },
+ error: function(data) {
+ data.url = this.url;
+ webtools.display_error('Failed fetching the results from the server. Please restart the server.', data);
+ findmedia.loading.abort('Error: ' + data.statusText);
+ }
+
+ });
+}
\ No newline at end of file
diff --git a/http/modules/install/css/install.css b/http/modules/install/css/install.css
index 2ce3798..2389d95 100644
--- a/http/modules/install/css/install.css
+++ b/http/modules/install/css/install.css
@@ -9,6 +9,17 @@
.aligncenter {text-align: center;}
.subheadline {font-weight: bold; margin-right: 5px;}
.installhidden {display: none;}
+
+.branch-dropdown {
+ margin-right: 4px;
+ padding: 2px 0 2px 2px;
+
+ font-size: 12px;
+
+ border: 1px solid #ccc;
+ border-radius: 3px;
+}
+
@media screen and (max-width:678px) {
.changeDisplay{display: block; font-size: 10pt; word-break: break-word}
.marginRight {margin-right:0px;}
diff --git a/http/modules/install/jscript/install.js b/http/modules/install/jscript/install.js
index 1cf89b5..c5aef24 100644
--- a/http/modules/install/jscript/install.js
+++ b/http/modules/install/jscript/install.js
@@ -109,6 +109,20 @@ install.show_options = function() {
}
install.installfromgit = function(github) {
+ var branch = null;
+
+ // Retrieve channel element
+ var $channel = $('#channellist .panel[data-url="' + github + '"]');
+ if($channel.length !== 0) {
+ // Try retrieve selected branch
+ var $branchDropdown = $('.branch-dropdown', $channel);
+
+ if($branchDropdown.length !== 0) {
+ branch = $branchDropdown.val();
+ }
+ }
+
+
if ((typeof(github) != 'undefined') && (github.length > 0)) {
//var gitlink = $('#gitlink').val().replace(/\//g,'--wt--');
$('#myModalLabel').html('Install Plugin');
@@ -121,7 +135,8 @@ install.installfromgit = function(github) {
data: {
'module': 'git',
'function': 'getGit',
- 'url': github
+ 'url': github,
+ 'branch': branch
},
type: 'GET',
dataType: 'text',
@@ -142,6 +157,7 @@ install.installfromgit = function(github) {
Fetch channels and get a list of types (categories)
*/
install.loadChannels = function(InitalRun) {
+
webtools.loading();
$('#navfoot').html('');
if (typeof($('#channelmenu>button.btn-active').html()) != 'undefined') {
@@ -192,6 +208,7 @@ install.loadChannels = function(InitalRun) {
dataType: 'JSON',
type: 'GET',
success: function(data) {
+ console.log(data);
//install.allBundles = data;
var tempArray = [];
for (var key in data) {
@@ -206,6 +223,7 @@ install.loadChannels = function(InitalRun) {
var tempkey = object.key;
delete object.key;
install.allBundles[tempkey] = object;
+ console.log(object);
})
callback();
@@ -297,7 +315,7 @@ install.showChannels = function(button, type, page, highlight) {
// Reset install.channelstoshow
install.channelstoshow = [];
$('#channelmenu>button').removeClass('btn-active');
- $('#All').focus();
+ //$('#All').focus();
$('#' + type.replace(' ', '')).addClass('btn-active');
var channellist = [];
@@ -361,6 +379,10 @@ install.showChannels = function(button, type, page, highlight) {
for (var i = start; i < end; i++) {
var key = install.channelstoshow[i];
+ var bundleInfo = install.allBundles[key];
+ console.log(bundleInfo);
+ var dropdown_branch = '';
+
var link_install = '';
var link_update = '';
var link_uninstall = '';
@@ -370,7 +392,32 @@ install.showChannels = function(button, type, page, highlight) {
var rowspan = 3;
var repolink = '';
- if ((typeof(install.allBundles[key].date) != 'undefined') && (install.allBundles[key].date.length > 0)) {
+ if((typeof(bundleInfo.branches) != 'undefined') && Array.isArray(bundleInfo.branches)) {
+ // Retrieve selected branch
+ var selectedBranch = null;
+
+ if(typeof(bundleInfo.branch) != 'undefined') {
+ selectedBranch = bundleInfo.branch;
+ }
+
+ // Build list of dropdown choices
+ var choices = '';
+
+ for(var bi = 0; bi < bundleInfo.branches.length; bi++) {
+ var branch = bundleInfo.branches[bi];
+
+ choices += (
+ '
' +
+ branch.label +
+ ' '
+ );
+ }
+
+ // Build dropdown element
+ dropdown_branch = '
' + choices + ' ';
+ }
+
+ if ((typeof(bundleInfo.date) != 'undefined') && (bundleInfo.date.length > 0)) {
isInstalled = true;
rowspan = 3;
if ((key.indexOf('http') != -1) && (key.indexOf('https') != -1)) {
@@ -381,16 +428,20 @@ install.showChannels = function(button, type, page, highlight) {
if ((key.indexOf('http') != -1) && (key.indexOf('https') != -1)) {
if (isInstalled === false) {
- link_install = '';
+ link_uninstall = '
Uninstall Bundle ';
}
//}
@@ -398,28 +449,46 @@ install.showChannels = function(button, type, page, highlight) {
var iconurl = 'icons/NoIcon.png';
var supporturl = '-';
var updateTime = '-';
- if (install.allBundles[key].icon.length > 0) {
- iconurl = 'uas/Resources/' + install.allBundles[key].icon;
- }
- if (typeof(install.allBundles[key].supporturl) != 'undefined') {
- supporturl = '
' + install.allBundles[key].supporturl + ' ';
- }
-
- if (typeof(install.allBundles[key].latestupdateongit) != 'undefined') {
- updateTime = install.allBundles[key].latestupdateongit;
+ //if (install.allBundles[key].icon.length > 0) {
+ // iconurl = 'uas/Resources/' + install.allBundles[key].icon;
+ if (bundleInfo.icon.length > 0) {
+ iconurl = 'uas/Resources/' + bundleInfo.icon;
}
+
+ //if (typeof(install.allBundles[key].supporturl) != 'undefined') {
+ // supporturl = '
' + install.allBundles[key].supporturl + ' ';
+ //}
+
+ if (typeof(bundleInfo.supporturl) != 'undefined') {
+ supporturl = '
' + bundleInfo.supporturl + ' ';
+ }
+
+ if (typeof(bundleInfo.latestupdateongit) != 'undefined') {
+ updateTime = bundleInfo.latestupdateongit;
+ }
+
+ //if (typeof(install.allBundles[key].latestupdateongit) != 'undefined') {
+ // updateTime = install.allBundles[key].latestupdateongit;
+ //}
- var newEntry = ['
'];
- newEntry.push('
' + install.allBundles[key].title + ' ');
+ //var newEntry = ['
'];
+ //newEntry.push('
' + install.allBundles[key].title + ' ');
+ var newEntry = ['
'];
+ newEntry.push('
' + bundleInfo.title + ' ');
newEntry.push('
');
- newEntry.push('' + install.allBundles[key].description + ' Categories: ' + install.allBundles[key].type + '
Repo: ' + repolink + '
Support: ' + supporturl + '
' + install.allBundles[key].description + ' Categories: ' + install.allBundles[key].type + '
Repo: ' + repolink + '
Support: ' + supporturl + '
' + bundleInfo.description + ' Categories: ' + bundleInfo.type + '
Repo: ' + repolink + '
Support: ' + supporturl + '
Installed: ' + install.allBundles[key].date + '
Latest Update on Github: ' + updateTime + '
Installed: ' + install.allBundles[key].date + '
Latest Update on Github: ' + updateTime + '
Installed: ' + bundleInfo.date + '
Latest Update on Github: ' + updateTime + '
');
- newEntry.push('');
+ //newEntry.push('');
+ newEntry.push('');
+
newEntry.push('
');
$('#channellist').append(newEntry.join('\n'));
diff --git a/http/modules/logviewer/jscript/logviewer.js b/http/modules/logviewer/jscript/logviewer.js
index 0b09917..be91934 100644
--- a/http/modules/logviewer/jscript/logviewer.js
+++ b/http/modules/logviewer/jscript/logviewer.js
@@ -39,10 +39,11 @@ logviewer.fetchlogfiles = function() {
cache: false,
success: function(data) {
data.forEach(function(logname) {
- $('#LogfileList').append('
' + logname);
+ var downloadlogname = logname.replace(/ /g, "%20");
+ $('#LogfileList').append(' ' + logname);
});
- $('#LogfileList').val("Plex Media Server.log");
- logviewer.viewlogfile("Plex Media Server.log");
+ $('#LogfileList').val("Plex%20Media%20Server.log");
+ logviewer.viewlogfile("Plex%20Media%20Server.log");
},
error: function(data, statustext, errorthrown) {
data.url = this.url;
@@ -54,12 +55,7 @@ logviewer.fetchlogfiles = function() {
logviewer.viewlogfile = function(filename) {
webtools.clearresult();
$.ajax({
- url: '/webtools2',
- data: {
- 'module': 'logs',
- 'function': 'show',
- 'fileName': filename
- },
+ url: '/webtools2?module=logs&function=show&fileName=' + filename,
cache: false,
type: 'GET',
dataType: 'JSON',
@@ -100,15 +96,17 @@ logviewer.viewlogfile = function(filename) {
error: function(data) {
data.url = this.url;
webtools.log('Failed fetching ' + filename);
- webtools.display_error('Failed fetching the settings from the server. Reload the page and try again.