aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-04 21:49:08 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-04 21:49:08 -0500
commit52a2ff5a2ee8cac36182bb56913e18d0e0f6f745 (patch)
tree20c63746423ddeffcb255c912bb4fa566b13e0c4 /MediaBrowser.Controller
parenta23c23f27b5300172756e2869217e9d4d79dc7c9 (diff)
updated image magick sharp
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs7
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs5
-rw-r--r--MediaBrowser.Controller/Entities/LinkedChild.cs1
-rw-r--r--MediaBrowser.Controller/Providers/BaseItemXmlParser.cs17
4 files changed, 1 insertions, 29 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 50a6dda30..7a13bfc1c 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1245,13 +1245,6 @@ namespace MediaBrowser.Controller.Entities
{
if (string.Equals(i.GetType().Name, info.ItemType, StringComparison.OrdinalIgnoreCase))
{
- if (info.ItemYear.HasValue)
- {
- if (info.ItemYear.Value != (i.ProductionYear ?? -1))
- {
- return false;
- }
- }
return true;
}
}
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 0d9bb03ac..cffc0989a 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1135,10 +1135,7 @@ namespace MediaBrowser.Controller.Entities
foreach (var child in LinkedChildren)
{
// Reset the cached value
- if (child.ItemId.HasValue && child.ItemId.Value == Guid.Empty)
- {
- child.ItemId = null;
- }
+ child.ItemId = null;
}
return false;
diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs
index 78e8e4959..949c9741b 100644
--- a/MediaBrowser.Controller/Entities/LinkedChild.cs
+++ b/MediaBrowser.Controller/Entities/LinkedChild.cs
@@ -11,7 +11,6 @@ namespace MediaBrowser.Controller.Entities
public string ItemName { get; set; }
public string ItemType { get; set; }
- public int? ItemYear { get; set; }
[IgnoreDataMember]
public string Id { get; set; }
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index a22e492f4..ddd650e3e 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -1407,23 +1407,6 @@ namespace MediaBrowser.Controller.Providers
break;
}
- case "Year":
- {
- var val = reader.ReadElementContentAsString();
-
- if (!string.IsNullOrWhiteSpace(val))
- {
- int rval;
-
- if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
- {
- linkedItem.ItemYear = rval;
- }
- }
-
- break;
- }
-
default:
reader.Skip();
break;