From 3a868e28b3e3d9f0a13fc38c680047010d627b0f Mon Sep 17 00:00:00 2001
From: softworkz <softworkz@hotmail.com>
Date: Wed, 23 Sep 2015 06:12:46 +0200
Subject: Auto-Organize: Added feature to remember/persist series matching in
 manual organization dialog #2

When a filename cannot be auto-matched to an existing series name, the
organization must be performed manually.
Unfortunately not just once, but again and again for each episode coming
in.
This change proposes a simple but solid method to optionally persist the
matching condition from within the manual organization dialog.
This approach will make Emby "learn" how to organize files in the future
without user interaction.
---
 .../FileOrganization/TvFolderOrganizer.cs                    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs')

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index 3e5296639..c3fde2c1e 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         private bool EnableOrganization(FileSystemMetadata fileInfo, TvFileOrganizationOptions options)
         {
-            var minFileBytes = options.MinFileSizeMb * 1024 * 1024;
+            var minFileBytes = options.TvOptions.MinFileSizeMb * 1024 * 1024;
 
             try
             {
@@ -52,9 +52,9 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             return false;
         }
 
-        public async Task Organize(TvFileOrganizationOptions options, CancellationToken cancellationToken, IProgress<double> progress)
+        public async Task Organize(AutoOrganizeOptions options, CancellationToken cancellationToken, IProgress<double> progress)
         {
-            var watchLocations = options.WatchLocations.ToList();
+            var watchLocations = options.TvOptions.WatchLocations.ToList();
 
             var eligibleFiles = watchLocations.SelectMany(GetFilesToOrganize)
                 .OrderBy(_fileSystem.GetCreationTimeUtc)
@@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
                     try
                     {
-                        var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
+                        var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.TvOptions.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
                         if (result.Status == FileSortingStatus.Success && !processedFolders.Contains(file.DirectoryName, StringComparer.OrdinalIgnoreCase))
                         {
                             processedFolders.Add(file.DirectoryName);
@@ -100,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             foreach (var path in processedFolders)
             {
-                var deleteExtensions = options.LeftOverFileExtensionsToDelete
+                var deleteExtensions = options.TvOptions.LeftOverFileExtensionsToDelete
                     .Select(i => i.Trim().TrimStart('.'))
                     .Where(i => !string.IsNullOrEmpty(i))
                     .Select(i => "." + i)
@@ -111,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     DeleteLeftOverFiles(path, deleteExtensions);
                 }
 
-                if (options.DeleteEmptyFolders)
+                if (options.TvOptions.DeleteEmptyFolders)
                 {
                     if (!IsWatchFolder(path, watchLocations))
                     {
-- 
cgit v1.2.3


From c02635c2569b0dfe2144c337cc0f8591e55c528c Mon Sep 17 00:00:00 2001
From: softworkz <softworkz@hotmail.com>
Date: Fri, 5 Feb 2016 03:01:03 +0100
Subject: Merge fixes

---
 .../FileOrganization/TvFolderOrganizer.cs                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs')

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index c3fde2c1e..845fcdff2 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         private bool EnableOrganization(FileSystemMetadata fileInfo, TvFileOrganizationOptions options)
         {
-            var minFileBytes = options.TvOptions.MinFileSizeMb * 1024 * 1024;
+            var minFileBytes = options.MinFileSizeMb * 1024 * 1024;
 
             try
             {
@@ -58,7 +58,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             var eligibleFiles = watchLocations.SelectMany(GetFilesToOrganize)
                 .OrderBy(_fileSystem.GetCreationTimeUtc)
-                .Where(i => EnableOrganization(i, options))
+                .Where(i => EnableOrganization(i, options.TvOptions))
                 .ToList();
 
             var processedFolders = new HashSet<string>();
-- 
cgit v1.2.3