--- trunk/libxmltv/Core/XMLTVProgram.cs 2013/03/09 14:58:09 89 +++ trunk/libxmltv/Core/XMLTVProgram.cs 2013/03/14 13:08:20 141 @@ -43,79 +43,35 @@ private void InternalDictionaryAddKnownProperties() { - Properties = new Dictionary(); - Properties.Add("Id", 0); - Properties.Add(XMLTVConstants.Programs.ProgramStart, new DateTime()); - Properties.Add(XMLTVConstants.Programs.ProgramStop, new DateTime()); - Properties.Add(XMLTVConstants.Programs.ProgramChannelId, string.Empty); - Properties.Add(XMLTVConstants.Programs.ProgramTitle, string.Empty); - Properties.Add(XMLTVConstants.Programs.ProgramSubTitle, string.Empty); - Properties.Add(XMLTVConstants.Programs.ProgramDescription, string.Empty); - } - - public Dictionary Properties { get; private set; } - - private void InternalDictionaryTestOrThrow() - { - if (Properties == null) { throw new NullReferenceException("Properties collection has not been initialized."); } - //if (Properties.Count == 0) { throw new IndexOutOfRangeException("Properties collection has 0 elements."); } - } - private void InternalProperyExistsOrThrow(string propertyname) + MetaData = new PropertyDictionary(); + MetaData.AddProperty("Id", 0); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramStart, new DateTime()); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramStop, new DateTime()); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramChannelId, string.Empty); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramTitle, string.Empty); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, string.Empty); + MetaData.AddProperty(XMLTVConstants.Programs.ProgramDescription, string.Empty); + } + + #region Property Dictionary Support + private IPropertyDictionary _MetaData; + public IPropertyDictionary MetaData { get { return _MetaData; } private set { _MetaData = value; } } + public ExtraList GetExtraMetaData() { - InternalDictionaryTestOrThrow(); - //if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); } - } - - public void RemoveProperty(string propertyname) - { - if (ContainsProperty(propertyname)) - { - Properties.Remove(propertyname); - } - else - { - throw new ArgumentException(string.Format("Property '{0}' deos not exist", propertyname), propertyname); - } + return (ExtraList)this.MetaData[XMLTVConstants.Programs.ProgramExtraMetaData]; } + #endregion - public void AddProperty(string propertyname) { AddProperty(propertyname, new object()); } - public void AddProperty(string propertyname, object propertyvalue) - { - if (!ContainsProperty(propertyname)) - { - Properties.Add(propertyname, propertyvalue); - } - else - { - SetProperty(propertyname, propertyvalue); - } - } - public bool ContainsProperty(string propertyname) - { - return Properties.ContainsKey(propertyname); - } - public object GetProperty(string propertyname) - { - InternalProperyExistsOrThrow(propertyname); - if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); } - return Properties[propertyname]; - } - public void SetProperty(string propertyname, object propertyvalue) - { - InternalProperyExistsOrThrow(propertyname); - if (!ContainsProperty(propertyname)) { throw new KeyNotFoundException(string.Format("Property '{0}' does not exist.", propertyname)); } - Properties[propertyname] = propertyvalue; - } #endregion public override string ToString() { return string.Format("{0}: {1} - {2} ({3}) ['{4}' <==> '{5}']", - GetProperty("Id").ToString(), - GetProperty(XMLTVConstants.Programs.ProgramTitle).ToString(), - GetProperty(XMLTVConstants.Programs.ProgramSubTitle).ToString(), - GetProperty(XMLTVConstants.Programs.ProgramChannelId).ToString(), - ((DateTime)GetProperty(XMLTVConstants.Programs.ProgramStart)).ToString("yyyy/MM/dd hh:mm tt"), - ((DateTime)GetProperty(XMLTVConstants.Programs.ProgramStop)).ToString("yyyy/MM/dd hh:mm tt")); + MetaData["Id"].ToString(), + MetaData[XMLTVConstants.Programs.ProgramTitle].ToString(), + MetaData[XMLTVConstants.Programs.ProgramSubTitle].ToString(), + MetaData[XMLTVConstants.Programs.ProgramChannelId].ToString(), + ((DateTime)MetaData[XMLTVConstants.Programs.ProgramStart]).ToDateTimeString(), + ((DateTime)MetaData[XMLTVConstants.Programs.ProgramStop]).ToDateTimeString()); } @@ -128,14 +84,14 @@ var fields = instance_type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance); foreach (var field in fields) { - if (field.FieldType == typeof(List)) + if (field.FieldType == typeof(ProgramList)) { found_field = true; try { - - var list = (List)field.GetValue(this.GetInstance()); - this.SetProperty("Id", list.Count + 1); + + var list = (ProgramList)field.GetValue(this.GetInstance()); + MetaData["Id"] = list.Count + 1; list.Add(this); xmltv_logger.Verbose.Debug.WriteLine("Updating instance with program information: {0}", this.ToString()); field.SetValue(this.GetInstance(), list); @@ -156,48 +112,8 @@ private void Create(XElement node) { - //if (node.HasAttributes) - //{ - // var start = node.Attribute(XMLTVConstants.Programs.ProgramStart); - // this.Start = start == null ? new DateTime() : ParseDate(start.Value); - // if (!this.Start.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_start: {0}", start); } - - // var stop = node.Attribute(XMLTVConstants.Programs.ProgramStop); - // this.Stop = stop == null ? new DateTime() : ParseDate(stop.Value); - // if (!this.Stop.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_stop: {0}", stop); } - - // var channelid = node.Attribute(XMLTVConstants.Programs.ProgramChannelId); - // if (!string.IsNullOrEmpty(this.channelid)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_channelid: {0}", channelid); } - // IXMLTVChannel channel = new XMLTVChannel(); - // string _channelid = channelid == null ? string.Empty : channelid.Value; - // this.Channel = this.GetInstance().Channels.Find(m => m.Id == _channelid); - // if (this.Channel == null) { this.Channel = new XMLTVChannel(); } - // if (!string.IsNullOrEmpty(_channelid)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_channel: {0}", this.Channel.ToString()); } //} - //try - //{ - // var title = node.Descendants(XMLTVConstants.Programs.ProgramTitle).FirstOrDefault(); - // this.Title = title == null ? string.Empty : title.Value; - //} - //catch (Exception) { this.Title = string.Empty; } - //if (!string.IsNullOrEmpty(this.Title)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_title: {0}", this.Title == string.Empty ? "empty" : this.Title); } - //try - //{ - // var subtitle = node.Descendants(XMLTVConstants.Programs.ProgramSubTitle).FirstOrDefault(); - // this.SubTitle = subtitle == null ? string.Empty : subtitle.Value; - //} - //catch (Exception) { this.SubTitle = string.Empty; } - //if (!string.IsNullOrEmpty(this.SubTitle)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_subtitle: {0}", this.SubTitle == string.Empty ? "empty" : this.SubTitle); } - //try - //{ - // var description = node.Descendants(XMLTVConstants.Programs.ProgramDescription).FirstOrDefault(); - // this.Description = description == null ? string.Empty : description.Value; ; - //} - //catch (Exception) { this.Description = string.Empty; } - //if (!string.IsNullOrEmpty(this.Description)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_description: {0}", this.Description == string.Empty ? "empty" : this.Description); } - - //ParseExtraData(node); - - var nodes = node.DescendantsAndSelf().ToList(); + CreateHandlerForProgramMetaDataNode(node); + var nodes = node.Elements().ToList(); foreach (var sub_node in nodes) { if (this.GetInstance().IsAborting) @@ -249,6 +165,7 @@ var ctors = type.GetConstructors(flags); bool has_default_ctor = false; foreach (var ctor in ctors) { if (ctor.GetParameters().Count() == 0) { has_default_ctor = true; } } + ctors = null; if (!has_default_ctor) { continue; } raw_instance = Activator.CreateInstance(type, flags, null, new object[0], culture); if (raw_instance != null) @@ -257,47 +174,60 @@ if (handler_value != null && handler_value.ToString() == node.Name.ToString()) { handler_type = type; + handler_value = null; + raw_instance = null; + handler_prop = null; + iface = null; break; } + handler_value = null; } + raw_instance = null; } + handler_prop = null; } + iface = null; } } + t = null; + asm = null; + types = null; + classes = null; if (handler_type == null) { - StringBuilder node_builder = new StringBuilder(); - node_builder.AppendFormat("<{0} ", node.Name); - if (node.HasAttributes) { foreach (var attribute in node.Attributes()) { node_builder.AppendFormat("{0}=\"{1}\" ", attribute.Name, attribute.Value); } } - string node_text = string.Format("{0}>", node_builder.ToString().TrimEnd(new char[] { ' ' })); - xmltv_logger.Verbose.Warn.WriteLine("Ignoring unhandled extra meta-data: {0}", node_text); + try + { + raw_instance = Activator.CreateInstance(typeof(UnhandledExtraProgramMetaData), flags, null, new object[] { this, node }, culture); + } + catch (Exception ex) { throw ex; } + + if (raw_instance == null) + { + StringBuilder node_builder = new StringBuilder(); + node_builder.AppendFormat("<{0} ", node.Name); + if (node.HasAttributes) { foreach (var attribute in node.Attributes()) { node_builder.AppendFormat("{0}=\"{1}\" ", attribute.Name, attribute.Value); } } + string node_text = string.Format("{0}>", node_builder.ToString().TrimEnd(new char[] { ' ' })); + xmltv_logger.Verbose.Warn.WriteLine("Ignoring unhandled extra meta-data: {0}", node_text); + } } else { - raw_instance = Activator.CreateInstance(handler_type, flags, null, new object[] { this, node }, culture); + try + { + raw_instance = Activator.CreateInstance(handler_type, flags, null, new object[] { this, node }, culture); + } + catch (Exception ex) { throw ex; } } + raw_instance = null; + flags = 0; + culture = null; + node = null; } - #region sub-classes - #region program title - private class title : XMLTVBase - { - public title() : base(null, XMLTVConstants.Programs.ProgramTitle) { } - public title(XMLTVProgram instance, XElement node) - : base(instance, XMLTVConstants.Programs.ProgramTitle) - { - if(node == null){throw new NullReferenceException("The node instance was null");} - if (node.Value != null) - { - instance.AddProperty(XMLTVConstants.Programs.ProgramTitle, node.Value); - xmltv_logger.Verbose.Debug.WriteLine("\tprogram_title: {0}", node.Value); - } - } - } - #endregion - #region program stop/start/channel (programme) + #region sub-classes + #region programme: stop/start/channelid private class programme : XMLTVBase { public programme() : base(null, XMLTVConstants.Programs.RootElement) { } @@ -309,27 +239,52 @@ { var start = node.Attribute(XMLTVConstants.Programs.ProgramStart); var t_start = start == null ? new DateTime() : ParseDate(start.Value); - if (!t_start.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_start: {0}", start); } - instance.AddProperty(XMLTVConstants.Programs.ProgramStart, t_start); + if (!t_start.Equals(new DateTime())) + { + xmltv_logger.Verbose.Debug.WriteLine("\tprogram_start: {0}", start); + xmltv_logger.Verbose.Debug.WriteLine("\tprogram_start dt: {0}", t_start.ToString()); + } + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramStart, t_start); var stop = node.Attribute(XMLTVConstants.Programs.ProgramStop); var t_stop = stop == null ? new DateTime() : ParseDate(stop.Value); - if (!t_stop.Equals(new DateTime())) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_stop: {0}", stop); } - instance.AddProperty(XMLTVConstants.Programs.ProgramStop, t_stop); + if (!t_stop.Equals(new DateTime())) + { + xmltv_logger.Verbose.Debug.WriteLine("\tprogram_stop: {0}", stop); + xmltv_logger.Verbose.Debug.WriteLine("\tprogram_stop dt: {0}", t_stop.ToString()); + } + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramStop, t_stop); var channelid = node.Attribute(XMLTVConstants.Programs.ProgramChannelId); if (channelid != null) { if (!string.IsNullOrEmpty(channelid.Value)) { xmltv_logger.Verbose.Debug.WriteLine("\tprogram_channelid: {0}", channelid.Value); } - instance.AddProperty(XMLTVConstants.Programs.ProgramChannelId, channelid.Value); + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramChannelId, channelid.Value); } } + node = null; } } #endregion - - #region sub title + #region title + private class title : XMLTVBase + { + public title() : base(null, XMLTVConstants.Programs.ProgramTitle) { } + public title(XMLTVProgram instance, XElement node) + : base(instance, XMLTVConstants.Programs.ProgramTitle) + { + if (node == null) { throw new NullReferenceException("The node instance was null"); } + if (node.Value != null) + { + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramTitle, node.Value); + xmltv_logger.Verbose.Debug.WriteLine("\tprogram_title: {0}", node.Value); + } + node = null; + } + } + #endregion + #region sub-title private class subtitle : XMLTVBase { public subtitle() : base(null, XMLTVConstants.Programs.ProgramSubTitle) { } @@ -339,13 +294,14 @@ if (node == null) { throw new NullReferenceException("The node instance was null"); } if (node.Value != null) { - instance.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, node.Value); + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramSubTitle, node.Value); xmltv_logger.Verbose.Debug.WriteLine("\tprogram_subtitle: {0}", node.Value); } + node = null; } } #endregion - #region sub title + #region description private class description : XMLTVBase { public description() : base(null, XMLTVConstants.Programs.ProgramDescription) { } @@ -355,12 +311,37 @@ if (node == null) { throw new NullReferenceException("The node instance was null"); } if (node.Value != null) { - instance.AddProperty(XMLTVConstants.Programs.ProgramDescription, node.Value); + instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramDescription, node.Value); xmltv_logger.Verbose.Debug.WriteLine("\tprogram_description: {0}", node.Value); } + node = null; } } #endregion + + #region UnhandledExtraMetaData + private class UnhandledExtraProgramMetaData : XMLTVBase + { + public UnhandledExtraProgramMetaData() : base(null, null) { } + public UnhandledExtraProgramMetaData(XMLTVProgram instance, XElement node) + : base(instance, null) + { + if (node == null) { throw new NullReferenceException("The node instance was null"); } + xmltv_logger.Verbose.Debug.WriteLine("Parsng unhandled extra program meta-data: {0}", node.Name.ToString()); + if (this.GetInstance() != null) + { + List list = new List(); + if (!instance.MetaData.ContainsProperty(XMLTVConstants.Programs.ProgramExtraMetaData)) { instance.MetaData.AddProperty(XMLTVConstants.Programs.ProgramExtraMetaData, new List()); } + else { list = (List)instance.MetaData[XMLTVConstants.Programs.ProgramExtraMetaData]; } + ExtraMetaData data = new ExtraMetaData(node); + list.Add(data); + instance.MetaData[XMLTVConstants.Programs.ProgramExtraMetaData] = list; + data = null; + } + node = null; + } + } + #endregion #endregion } }