diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-19 12:54:41 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-19 12:54:41 -0400 |
| commit | 874469d47633851f4da75ad8640bc47dcfa810ce (patch) | |
| tree | f2cd7d500de68d4078670ecdc9d3a0e11624064c /MediaBrowser.Controller | |
| parent | c658ea7febc790c291fa83b749e2147f8ec27343 (diff) | |
Made xml fetching task-based
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Providers/FolderProviderFromXml.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Xml/BaseItemXmlParser.cs | 43 |
2 files changed, 30 insertions, 28 deletions
diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs index 5ba02b38d..14067dd20 100644 --- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs @@ -14,17 +14,14 @@ namespace MediaBrowser.Controller.Providers return item is Folder;
}
- public override Task Fetch(BaseItem item, ItemResolveEventArgs args)
+ public async override Task Fetch(BaseItem item, ItemResolveEventArgs args)
{
- return Task.Run(() =>
- {
- var metadataFile = args.GetFileByName("folder.xml");
+ var metadataFile = args.GetFileByName("folder.xml");
- if (metadataFile.HasValue)
- {
- new FolderXmlParser().Fetch(item as Folder, metadataFile.Value.Key);
- }
- });
+ if (metadataFile.HasValue)
+ {
+ await new FolderXmlParser().Fetch(item as Folder, metadataFile.Value.Key);
+ }
}
}
}
diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs index eabbae869..0e514b8b2 100644 --- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq;
using System.Xml;
using MediaBrowser.Model.Entities;
+using System.Threading.Tasks;
namespace MediaBrowser.Controller.Xml
{
@@ -16,33 +17,37 @@ namespace MediaBrowser.Controller.Xml /// <summary>
/// Fetches metadata for an item from one xml file
/// </summary>
- public virtual void Fetch(T item, string metadataFile)
+ public Task Fetch(T item, string metadataFile)
{
- // Use XmlReader for best performance
- using (XmlReader reader = XmlReader.Create(metadataFile))
+ // Wrapping this for now until I have a chance to async the whole process
+ return Task.Run(() =>
{
- reader.MoveToContent();
-
- // Loop through each element
- while (reader.Read())
+ // Use XmlReader for best performance
+ using (XmlReader reader = XmlReader.Create(metadataFile))
{
- if (reader.NodeType == XmlNodeType.Element)
+ reader.MoveToContent();
+
+ // Loop through each element
+ while (reader.Read())
{
- FetchDataFromXmlNode(reader, item);
+ if (reader.NodeType == XmlNodeType.Element)
+ {
+ FetchDataFromXmlNode(reader, item);
+ }
}
}
- }
- // If dates weren't supplied in metadata, use values from the xml file
- if (item.DateCreated == DateTime.MinValue)
- {
- item.DateCreated = File.GetCreationTime(metadataFile);
- }
+ // If dates weren't supplied in metadata, use values from the xml file
+ if (item.DateCreated == DateTime.MinValue)
+ {
+ item.DateCreated = File.GetCreationTime(metadataFile);
+ }
- if (item.DateModified == DateTime.MinValue)
- {
- item.DateModified = File.GetLastWriteTime(metadataFile);
- }
+ if (item.DateModified == DateTime.MinValue)
+ {
+ item.DateModified = File.GetLastWriteTime(metadataFile);
+ }
+ });
}
/// <summary>
|