From a6752025375875470a9705ea5fe9ccb6154a59dc Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Sat, 18 Jul 2020 15:19:42 -0700
Subject: [PATCH] Browse path starting from from current value

---
 data/interfaces/default/app_import.html      |  6 +---
 data/interfaces/default/config_import.html   |  6 +---
 data/interfaces/default/notifier_config.html |  9 +-----
 data/interfaces/default/settings.html        | 31 +++++++++++---------
 plexpy/helpers.py                            |  3 ++
 5 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/data/interfaces/default/app_import.html b/data/interfaces/default/app_import.html
index ab7ef27b..a96009a7 100644
--- a/data/interfaces/default/app_import.html
+++ b/data/interfaces/default/app_import.html
@@ -40,7 +40,7 @@
                         <div class="col-xs-12">
                             <div class="input-group">
                                 <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_database_path_browse" data-filter=".db" data-target="#import_database_path">Browse</button>
+                                    <button class="btn btn-form" type="button" id="import_database_path_browse" data-toggle="browse" data-description="Database File" data-filter=".db" data-target="#import_database_path">Browse</button>
                                 </span>
                                 <input type="text" class="form-control" id="import_database_path" name="import_database_path" value="" placeholder="tautulli.db" required disabled>
                             </div>
@@ -114,10 +114,6 @@
     </div>
 </div>
 <script>
-    $("#import_database_path_browse").click(function () {
-        openBrowsePath(null, null, $(this).data('filter'), 'Database File', $(this).data('target'));
-    });
-
     $("#import_database_file").change(function() {
         if ($(this)[0].files[0]) {
             $("#import_database_file_name").val($(this)[0].files[0].name);
diff --git a/data/interfaces/default/config_import.html b/data/interfaces/default/config_import.html
index 20dfc41a..984e482f 100644
--- a/data/interfaces/default/config_import.html
+++ b/data/interfaces/default/config_import.html
@@ -27,7 +27,7 @@
                         <div class="col-xs-12">
                             <div class="input-group">
                                 <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_config_path_browse" data-filter=".ini" data-target="#import_config_path">Browse</button>
+                                    <button class="btn btn-form" type="button" id="import_config_path_browse" data-toggle="browse" data-description="Configuration File" data-filter=".ini" data-target="#import_config_path">Browse</button>
                                 </span>
                                 <input type="text" class="form-control" id="import_config_path" name="import_config_path" value="" placeholder="config.ini" required disabled>
                             </div>
@@ -62,10 +62,6 @@
     </div>
 </div>
 <script>
-    $("#import_config_path_browse").click(function () {
-        openBrowsePath(null, null, $(this).data('filter'), 'Configuration File', $(this).data('target'));
-    });
-
     $("#import_config_file").change(function() {
         if ($(this)[0].files[0]) {
             $("#import_config_file_name").val($(this)[0].files[0].name);
diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html
index 727dbdb2..1aaa53df 100644
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -53,7 +53,7 @@
                                                 <div class="input-group">
                                                     <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" ${'readonly' if item.get('readonly') else ''}>
                                                     <span class="input-group-btn">
-                                                        <button class="btn btn-form" type="button" id="${item['name']}_browse" data-filter=".folderonly" data-target="#${item['name']}">Browse</button>
+                                                        <button class="btn btn-form" type="button" id="${item['name']}_browse" data-toggle="browse" data-filter=".folderonly" data-target="#${item['name']}">Browse</button>
                                                     </span>
                                                 </div>
                                                 % else:
@@ -702,13 +702,6 @@
     var plexmobileapp_user_ids = $plexmobileapp_user_ids[0].selectize;
     plexmobileapp_user_ids.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'plexmobileapp_user_ids'), [])) | n});
 
-    % elif notifier['agent_name'] == 'scripts':
-    $("#scripts_script_folder_browse").click(function () {
-        var filter = $(this).data('filter');
-        var target = $(this).data('target');
-        openBrowsePath(null, null, filter, $("label[for='" + target.replace('#', '') + "']").text(), target);
-    });
-
     % endif
 
     function validateLogic() {
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 1ee1cfc4..f41d4946 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -572,7 +572,7 @@
                                         <div class="input-group">
                                             <input type="text" class="form-control http-settings" id="https_cert" name="https_cert" value="${config['https_cert']}">
                                             <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_cert_browse" data-filter=".pem" data-target="#https_cert">Browse</button>
+                                                <button class="btn btn-form" type="button" id="https_cert_browse" data-toggle="browse" data-filter=".pem" data-target="#https_cert">Browse</button>
                                             </span>
                                         </div>
                                     </div>
@@ -586,7 +586,7 @@
                                         <div class="input-group">
                                             <input type="text" class="form-control http-settings" id="https_cert_chain" name="https_cert_chain" value="${config['https_cert_chain']}">
                                             <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_cert_chain_browse" data-filter=".pem" data-target="#https_cert_chain">Browse</button>
+                                                <button class="btn btn-form" type="button" id="https_cert_chain_browse" data-toggle="browse" data-filter=".pem" data-target="#https_cert_chain">Browse</button>
                                             </span>
                                         </div>
                                     </div>
@@ -600,7 +600,7 @@
                                         <div class="input-group">
                                             <input type="text" class="form-control http-settings" id="https_key" name="https_key" value="${config['https_key']}">
                                             <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_key_browse" data-filter=".pem" data-target="#https_key">Browse</button>
+                                                <button class="btn btn-form" type="button" id="https_key_browse" data-toggle="browse" data-filter=".pem" data-target="#https_key">Browse</button>
                                             </span>
                                         </div>
                                     </div>
@@ -821,7 +821,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control" id="pms_logs_folder" name="pms_logs_folder" value="${config['pms_logs_folder']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^[^\~\%]" data-parsley-errors-container="#pms_logs_folder_error"  data-parsley-error-message="Shortcuts are not recognized.">
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="pms_logs_folder_browse" data-filter=".folderonly" data-target="#pms_logs_folder">Browse</button>
+                                            <button class="btn btn-form" type="button" id="pms_logs_folder_browse" data-toggle="browse" data-filter=".folderonly" data-target="#pms_logs_folder">Browse</button>
                                         </span>
                                     </div>
                                 </div>
@@ -1128,7 +1128,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control" id="newsletter_custom_dir" name="newsletter_custom_dir" value="${config['newsletter_custom_dir']}">
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="newsletter_custom_dir_browse" data-filter=".folderonly" data-target="#newsletter_custom_dir">Browse</button>
+                                            <button class="btn btn-form" type="button" id="newsletter_custom_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#newsletter_custom_dir">Browse</button>
                                         </span>
                                     </div>
                                 </div>
@@ -1142,7 +1142,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}" ${docker_setting}>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="newsletter_dir_browse" data-filter=".folderonly" data-target="#newsletter_dir" ${docker_setting}>Browse</button>
+                                            <button class="btn btn-form" type="button" id="newsletter_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#newsletter_dir" ${docker_setting}>Browse</button>
                                         </span>
                                     </div>
                                 </div>
@@ -1399,7 +1399,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control directory-settings" id="log_dir" name="log_dir" value="${config['log_dir']}" ${docker_setting}>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="log_dir_browse" data-filter=".folderonly" data-target="#log_dir" ${docker_setting}>Browse</button>
+                                            <button class="btn btn-form" type="button" id="log_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#log_dir" ${docker_setting}>Browse</button>
                                         </span>
                                     </div>
                                     <div class="btn-group">
@@ -1415,7 +1415,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control directory-settings" id="backup_dir" name="backup_dir" value="${config['backup_dir']}" ${docker_setting}>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="backup_dir_browse" data-filter=".folderonly" data-target="#backup_dir" ${docker_setting}>Browse</button>
+                                            <button class="btn btn-form" type="button" id="backup_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#backup_dir" ${docker_setting}>Browse</button>
                                         </span>
                                     </div>
                                     <div class="btn-group">
@@ -1432,7 +1432,7 @@
                                     <div class="input-group">
                                         <input type="text" class="form-control directory-settings" id="cache_dir" name="cache_dir" value="${config['cache_dir']}" ${docker_setting}>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="cache_dir_browse" data-filter=".folderonly" data-target="#cache_dir" ${docker_setting}>Browse</button>
+                                            <button class="btn btn-form" type="button" id="cache_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#cache_dir" ${docker_setting}>Browse</button>
                                         </span>
                                     </div>
                                     <div class="btn-group">
@@ -2072,6 +2072,10 @@ Rating: {rating}/10   --> Rating: /10
         });
     }
 
+    $("#browse-path-modal").on('hidden.bs.modal', function() {
+        $("#select-browse-file").unbind('click');
+    });
+
     function openBrowsePath(key, path, filter_ext, file_description, select_target) {
         $("#browse-path-type").text(file_description);
         $("#browse-path-modal").modal('show');
@@ -2079,7 +2083,6 @@ Rating: {rating}/10   --> Rating: /10
         $("#select-browse-file").click(function () {
             $("#browse-path-modal").modal('hide');
             $(select_target).val($("#browse-path").val()).change();
-            $(this).unbind('click');
         });
 
         browsePath(key, path, filter_ext);
@@ -3059,12 +3062,12 @@ $(document).ready(function() {
         }
     });
 
-    $("#log_dir_browse, #backup_dir_browse, #cache_dir_browse, " +
-            "#newsletter_custom_dir_browse, #newsletter_dir_browse, #pms_logs_folder_browse, " +
-            "#https_cert_browse, #https_cert_chain_browse, #https_key_browse").click(function () {
+    $("body").on('click', '[data-toggle=browse]', function () {
         var filter = $(this).data('filter');
         var target = $(this).data('target');
-        openBrowsePath(null, null, filter, $("label[for='" + target.replace('#', '') + "']").text(), target);
+        var path = $(target).val();
+        var description = $(this).data('description') || $("label[for='" + target.replace('#', '') + "']").text();
+        openBrowsePath(null, path, filter, description, target);
     });
 });
 </script>
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index b6d7ba1a..07785582 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -1232,6 +1232,9 @@ def browse_path(path=None, include_hidden=False, filter_ext=''):
             }
             output.append(out)
 
+    if os.path.isfile(path):
+        path = os.path.dirname(path)
+
     if not os.path.isdir(path):
         return output