Standardize logging and new options

Emby.AutoOrganize/Configuration/autoorganizelog.js

@@ -193,11 +193,16 @@
             return;
         }
 
-        var message = 'The following file will be moved from:' + '<br/><br/>' + item.OriginalPath + '<br/><br/>' + 'To:' + '<br/><br/>' + item.TargetPath;
+        for (var i = 0; i < item.DuplicatePaths.length; i++) { //remove the target filename from the list (as we will overwrite it and better for display)
+            if (item.DuplicatePaths[i].replace(/^.*[\\\/]/, '') === item.TargetPath.replace(/^.*[\\\/]/, '')) {
+                item.DuplicatePaths.splice(i, 1);
+                i--;
+            }
+        }
 
-        if (item.DuplicatePaths.length) {
+        var message = 'The following file will be moved from:' + '<br/><br/>' + item.OriginalPath + '<br/><br/>' + 'To:' + '<br/><br/>' + item.TargetPath;
+        if (item.DuplicatePaths.length > 0) {
             message += '<br/><br/>' + 'The following duplicates will be deleted:';
-
             message += '<br/><br/>' + item.DuplicatePaths.join('<br/>');
         }
 
@@ -386,9 +391,9 @@
 
         var html = '';
 
-        html += '<td class="detailTableBodyCell">';
+        html += '<td class="detailTableBodyCell" style="width:25px">';
         var hide = item.IsInProgress ? '' : ' hide';
-        html += '<img src="css/images/throbber.gif" alt="" class="syncSpinner' + hide + '" style="vertical-align: middle;" />';
+        html += '    <img class="' + hide + '" src="data:image/gif;base64,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"/>';
         html += '</td>';
 
         html += '<td class="detailTableBodyCell" data-title="Date">';

Emby.AutoOrganize/Configuration/autoorganizetv.html

@@ -180,20 +180,35 @@
                         </table>
                     </div>
                 </div>
-
-                <br /><br />
+                <br />
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkAllowTBA" />
+                        <span>Allow episodes titled 'TBA'</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">'TBA' is often set before the true name of an episode is known. Disabling this will prevent episodes being moved until a valid name is provided.</div>
+                </div>
                 <div class="selectContainer">
                     <select is="emby-select" id="copyOrMoveFile" label="Transfer method:">
                         <option value="true">Copy</option>
                         <option value="false">Move</option>
                     </select>
                     <div class="fieldDescription editorfieldDescription">Copy or move files from the watch folder</div>
                 </div>
-                <div>
-                    <label class="checkboxContainer">
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
                         <input type="checkbox" is="emby-checkbox" id="chkOverwriteExistingEpisodes" />
                         <span>Overwrite existing episodes</span>
                     </label>
+                    <div class="fieldDescription checkboxFieldDescription">This option allows you to overwrite files matching the destination name</div>
+                </div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkSingleEpisodeVersion" />
+                        <span>Only keep single format of episode</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">Enabled  - Sorting will enforce a single copy of an episode, removing any copies regardless of the file pattern set.</div>
+                    <div class="fieldDescription checkboxFieldDescription">Disabled - Sorting will allow multiple copies of an episode, as long as the file pattern does not match.</div>
                 </div>
                 <div class="inputContainer">
                     <input is="emby-input" id="txtDeleteLeftOverFiles" type="text" label="Delete left over files" />

Emby.AutoOrganize/Configuration/autoorganizetv.js

@@ -141,7 +141,9 @@
         var tvOptions = config.TvOptions;
 
         view.querySelector('#chkEnableTvSorting').checked = tvOptions.IsEnabled;
+        view.querySelector('#chkAllowTBA').checked = tvOptions.AllowTBA;
         view.querySelector('#chkOverwriteExistingEpisodes').checked = tvOptions.OverwriteExistingEpisodes;
+        view.querySelector('#chkSingleEpisodeVersion').checked = tvOptions.SingleEpisodeVersion;
         view.querySelector('#chkDeleteEmptyFolders').checked = tvOptions.DeleteEmptyFolders;
 
         view.querySelector('#txtMinFileSize').value = tvOptions.MinFileSizeMb;
@@ -170,7 +172,9 @@
             var tvOptions = config.TvOptions;
 
             tvOptions.IsEnabled = view.querySelector('#chkEnableTvSorting').checked;
+            tvOptions.AllowTBA = view.querySelector('#chkAllowTBA').checked;
             tvOptions.OverwriteExistingEpisodes = view.querySelector('#chkOverwriteExistingEpisodes').checked;
+            tvOptions.SingleEpisodeVersion = view.querySelector('#chkSingleEpisodeVersion').checked;
             tvOptions.DeleteEmptyFolders = view.querySelector('#chkDeleteEmptyFolders').checked;
 
             tvOptions.MinFileSizeMb = view.querySelector('#txtMinFileSize').value;