aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-15 11:36:09 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-15 11:36:09 -0500
commit8b71ab2e7d81f315f729aaee5eb976d181b8909b (patch)
treedd21a96c08d1f9353ce61e0e77d34b8070c97a07 /MediaBrowser.Controller/Entities
parent4e414ebc919df021bfe339a98a5385a0e618c391 (diff)
expose omdb to metadata config
Diffstat (limited to 'MediaBrowser.Controller/Entities')
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicArtist.cs6
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs7
-rw-r--r--MediaBrowser.Controller/Entities/Movies/BoxSet.cs6
-rw-r--r--MediaBrowser.Controller/Entities/Trailer.cs6
5 files changed, 19 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 2b5570a80..e68790e61 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -178,7 +178,7 @@ namespace MediaBrowser.Controller.Entities.Audio
// Refresh all non-songs
foreach (var item in others)
{
- if (tasks.Count > 3)
+ if (tasks.Count > 4)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear();
@@ -202,7 +202,9 @@ namespace MediaBrowser.Controller.Entities.Audio
}
});
- tasks.Add(RefreshItem(item, refreshOptions, innerProgress, cancellationToken));
+ // Avoid implicitly captured closure
+ var taskChild = item;
+ tasks.Add(Task.Run(async () => await RefreshItem(taskChild, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken));
}
await Task.WhenAll(tasks).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 415b49f80..41c4f0bae 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1236,7 +1236,7 @@ namespace MediaBrowser.Controller.Entities
public virtual Task UpdateToRepository(ItemUpdateType updateReason, CancellationToken cancellationToken)
{
- return LibraryManager.UpdateItem(this, ItemUpdateType.ImageUpdate, cancellationToken);
+ return LibraryManager.UpdateItem(this, updateReason, cancellationToken);
}
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index b718864d2..c928a130e 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -521,7 +521,7 @@ namespace MediaBrowser.Controller.Entities
foreach (var child in children)
{
- if (tasks.Count >= 8)
+ if (tasks.Count >= 4)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear();
@@ -552,7 +552,10 @@ namespace MediaBrowser.Controller.Entities
}
else
{
- tasks.Add(RefreshChildMetadata(child, refreshOptions, false, innerProgress, cancellationToken));
+ // Avoid implicitly captured closure
+ var taskChild = child;
+
+ tasks.Add(Task.Run(async () => await RefreshChildMetadata(taskChild, refreshOptions, false, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken));
}
}
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index a00bda772..3fd2af091 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities.Movies
// Refresh songs
foreach (var item in items)
{
- if (tasks.Count >= 2)
+ if (tasks.Count >= 4)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear();
@@ -123,7 +123,9 @@ namespace MediaBrowser.Controller.Entities.Movies
}
});
- tasks.Add(RefreshItem(item, refreshOptions, innerProgress, cancellationToken));
+ // Avoid implicitly captured closure
+ var taskChild = item;
+ tasks.Add(Task.Run(async () => await RefreshItem(taskChild, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken));
}
await Task.WhenAll(tasks).ConfigureAwait(false);
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index d655c275d..50ccd060b 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -102,7 +102,11 @@ namespace MediaBrowser.Controller.Entities
public TrailerInfo GetLookupInfo()
{
- return GetItemLookupInfo<TrailerInfo>();
+ var info = GetItemLookupInfo<TrailerInfo>();
+
+ info.IsLocalTrailer = IsLocalTrailer;
+
+ return info;
}
}
}