diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-04 23:41:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-04 23:41:56 -0400 |
| commit | c5319bb4ae9606e07d62525a022e5a67f85a7d43 (patch) | |
| tree | 248e5e889e93aa7e2ba2feccf07ca857fe8e6a64 /MediaBrowser.Controller | |
| parent | 2714127d2b663b735048da6d9def08efa38f2b5f (diff) | |
update playlist xml saving
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/LinkedChild.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/TVUtils.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/BaseItemXmlParser.cs | 23 |
4 files changed, 8 insertions, 32 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 36e65f5f5..a476f555f 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1045,13 +1045,6 @@ namespace MediaBrowser.Controller.Entities return false; } } - if (info.ItemIndexNumber.HasValue) - { - if (info.ItemIndexNumber.Value != (i.IndexNumber ?? -1)) - { - return false; - } - } return true; } } diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs index 3fc0ab716..c77fe18c4 100644 --- a/MediaBrowser.Controller/Entities/LinkedChild.cs +++ b/MediaBrowser.Controller/Entities/LinkedChild.cs @@ -12,7 +12,6 @@ namespace MediaBrowser.Controller.Entities public string ItemName { get; set; } public string ItemType { get; set; } public int? ItemYear { get; set; } - public int? ItemIndexNumber { get; set; } /// <summary> /// Serves as a cache @@ -24,11 +23,8 @@ namespace MediaBrowser.Controller.Entities { return new LinkedChild { - ItemName = item.Name, - ItemYear = item.ProductionYear, - ItemType = item.GetType().Name, - Type = LinkedChildType.Manual, - ItemIndexNumber = item.IndexNumber + Path = item.Path, + Type = LinkedChildType.Manual }; } } diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs index 5e43eb644..541dfd226 100644 --- a/MediaBrowser.Controller/Library/TVUtils.cs +++ b/MediaBrowser.Controller/Library/TVUtils.cs @@ -303,8 +303,6 @@ namespace MediaBrowser.Controller.Library } else { - logger.Debug("Evaluating series file: {0}", child.FullName); - var fullName = child.FullName; if (EntityResolutionHelper.IsVideoFile(fullName) || EntityResolutionHelper.IsVideoPlaceHolder(fullName)) diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 7e6895ec5..06d738297 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -1304,30 +1304,19 @@ namespace MediaBrowser.Controller.Providers break; } - case "Type": + case "Path": { - linkedItem.ItemType = reader.ReadElementContentAsString(); + linkedItem.Path = reader.ReadElementContentAsString(); break; } - case "Year": + case "Type": { - var val = reader.ReadElementContentAsString(); - - if (!string.IsNullOrWhiteSpace(val)) - { - int rval; - - if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval)) - { - linkedItem.ItemYear = rval; - } - } - + linkedItem.ItemType = reader.ReadElementContentAsString(); break; } - case "IndexNumber": + case "Year": { var val = reader.ReadElementContentAsString(); @@ -1337,7 +1326,7 @@ namespace MediaBrowser.Controller.Providers if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval)) { - linkedItem.ItemIndexNumber = rval; + linkedItem.ItemYear = rval; } } |
