Fix MediaBrowser#15 : Hide Organize button when a task is running

PoppyPop · Jul 27, 2018 · 57ed195 · 57ed195
1 parent 26c1566
commit 57ed195
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Emby.AutoOrganize/Configuration/autoorganizelog.html b/Emby.AutoOrganize/Configuration/autoorganizelog.html
@@ -11,9 +11,10 @@
                     <button is="emby-button" type="button" class="btnClearLog raised button-cancel">
                         <i class="md-icon">clear_all</i><span>${ButtonClear}</span>
                     </button>
-                    <button is="emby-button" type="button" class="btnOrganize raised button-cancel"><i class="md-icon">check</i><span>Organize</span></button>
+                    <button is="emby-button" type="button" class="btnOrganize raised button-cancel" id="btnOrganize"><i class="md-icon">check</i><span>Organize</span></button>
                     <progress max="100" min="0" style="width: 100px;" class="organizeProgress"></progress>
                 </div>
+
                 <div class="listTopPaging">
                 </div>
 

diff --git a/Emby.AutoOrganize/Configuration/autoorganizelog.js b/Emby.AutoOrganize/Configuration/autoorganizelog.js
@@ -354,7 +354,7 @@
 
         html += '<td class="detailTableBodyCell">';
         var hide = item.IsInProgress ? '' : ' hide';
-        html += '<img src="css/images/throbber.gif" alt="" class="syncSpinner' + hide + '" style="vertical-align: middle;" />';
+        html += '<img src="thirdparty/jstree/themes/default/throbber.gif" alt="" class="syncSpinner' + hide + '" style="vertical-align: middle;" />';
         html += '</td>';
 
         html += '<td class="detailTableBodyCell" data-title="Date">';
@@ -514,7 +514,15 @@
                 progressElem: view.querySelector('.organizeProgress'),
                 panel: view.querySelector('.organizeTaskPanel'),
                 taskKey: 'AutoOrganize',
-                button: view.querySelector('.btnOrganize')
+                button: view.querySelector('#btnOrganize')
+            });
+
+            view.querySelector('#btnOrganize').addEventListener('DOMSubtreeModified', function () {
+                if (view.querySelector('#btnOrganize').disabled) {
+                    view.querySelector('#btnOrganize').classList.add('hide');
+                } else {
+                    view.querySelector('#btnOrganize').classList.remove('hide');
+                }
             });
         });
 
@@ -531,7 +539,7 @@
             // off here
             taskButton({
                 mode: 'off',
-                button: view.querySelector('.btnOrganize')
+                button: view.querySelector('#btnOrganize')
             });
         });
     };

diff --git a/Emby.AutoOrganize/Core/OrganizerScheduledTask.cs b/Emby.AutoOrganize/Core/OrganizerScheduledTask.cs
@@ -57,10 +57,11 @@ public async Task Execute(CancellationToken cancellationToken, IProgress<double>
 
             var options = GetAutoOrganizeOptions();
 
+            var fileOrganizationService = PluginEntryPoint.Current.FileOrganizationService;
+
             if (options.TvOptions.IsEnabled)
             {
                 queueTv = options.TvOptions.QueueLibraryScan;
-                var fileOrganizationService = PluginEntryPoint.Current.FileOrganizationService;
 
                 await new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, fileOrganizationService, _config, _providerManager)
                     .Organize(options.TvOptions, cancellationToken, progress).ConfigureAwait(false);
@@ -70,7 +71,6 @@ public async Task Execute(CancellationToken cancellationToken, IProgress<double>
             if (options.MovieOptions.IsEnabled)
             {
                 queueMovie = options.MovieOptions.QueueLibraryScan;
-                var fileOrganizationService = PluginEntryPoint.Current.FileOrganizationService;
 
                 await new MovieFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, fileOrganizationService, _config, _providerManager)
                     .Organize(options.MovieOptions, cancellationToken, progress).ConfigureAwait(false);