aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-08 00:17:18 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-08 00:17:18 -0400
commit2c6a9892f2082c6a288ba01033f3fd7d517fa92e (patch)
tree3a3e4bcbbcb20fc4c6fc326cc6452bb0957de938 /MediaBrowser.Providers
parent63aea3d90836765ceb38f0b9b130970af9b132d9 (diff)
update translations
Diffstat (limited to 'MediaBrowser.Providers')
-rw-r--r--MediaBrowser.Providers/Manager/MetadataService.cs2
-rw-r--r--MediaBrowser.Providers/Manager/ProviderManager.cs24
-rw-r--r--MediaBrowser.Providers/Savers/ArtistXmlSaver.cs1
3 files changed, 21 insertions, 6 deletions
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 2b1bcb81b2..b2e23682b3 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -174,7 +174,7 @@ namespace MediaBrowser.Providers.Manager
if (string.IsNullOrEmpty(item.Name) && !string.IsNullOrEmpty(item.Path))
{
item.Name = Path.GetFileNameWithoutExtension(item.Path);
- updateType = updateType | ItemUpdateType.MetadataEdit;
+ updateType = updateType | ItemUpdateType.MetadataDownload;
}
return updateType;
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 5f6702e745..414d7f064d 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -613,14 +613,30 @@ namespace MediaBrowser.Providers.Manager
{
if (!includeDisabled)
{
- if (!item.IsSaveLocalMetadataEnabled())
+ if (options.DisabledMetadataSavers.Contains(saver.Name, StringComparer.OrdinalIgnoreCase))
{
return false;
}
-
- if (options.DisabledMetadataSavers.Contains(saver.Name, StringComparer.OrdinalIgnoreCase))
+
+ if (!item.IsSaveLocalMetadataEnabled())
{
- return false;
+ if (updateType >= ItemUpdateType.MetadataEdit)
+ {
+ var fileSaver = saver as IMetadataFileSaver;
+
+ // Manual edit occurred
+ // Even if save local is off, save locally anyway if the metadata file already exists
+ if (fileSaver == null || !File.Exists(fileSaver.GetSavePath(item)))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ // Manual edit did not occur
+ // Since local metadata saving is disabled, consider it disabled
+ return false;
+ }
}
}
diff --git a/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs b/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs
index 3e98e6225e..5f9c06d257 100644
--- a/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs
+++ b/MediaBrowser.Providers/Savers/ArtistXmlSaver.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
using System.Collections.Generic;
using System.IO;
using System.Text;