[Mediaportal-svn] r21222 - trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport

[<che...@de...>]

Author: chemelli_sf
Date: 2008-12-29 15:20:25 +0000 (Mon, 29 Dec 2008)
New Revision: 21222

Modified:
   trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XMLTVImport.cs
   trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.Designer.cs
   trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.cs
Log:
Fixed mantis #0001907: Time compensation in XMLTVPlugins doesn't work properly.

Modified: trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XMLTVImport.cs
===================================================================
--- trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XMLTVImport.cs	2008-12-29 00:14:36 UTC (rev 21221)
+++ trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XMLTVImport.cs	2008-12-29 15:20:25 UTC (rev 21222)
@@ -23,15 +23,12 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Text;
 using System.Threading;
 using System.Xml;
 
 using TvDatabase;
 using TvLibrary.Log;
-using TvLibrary.Implementations;
 
-using Gentle.Common;
 using Gentle.Framework;
 
 namespace TvEngine
@@ -195,12 +192,10 @@
       }*/
 
       //TVDatabase.SupressEvents = true;
-      bool useTimeZone = false;
-      int timeZoneCorrection = 0;
-      useTimeZone = layer.GetSetting("xmlTvUseTimeZone", "true").Value == "true";
+      bool useTimeZone = layer.GetSetting("xmlTvUseTimeZone", "false").Value == "true";
       int hours = Int32.Parse(layer.GetSetting("xmlTvTimeZoneHours", "0").Value);
       int mins = Int32.Parse(layer.GetSetting("xmlTvTimeZoneMins", "0").Value);
-      timeZoneCorrection = hours * 60 + mins;
+      int timeZoneCorrection = hours * 60 + mins;
 
       ArrayList Programs = new ArrayList();
       Dictionary<int, ChannelPrograms> dChannelPrograms = new Dictionary<int, ChannelPrograms>();
@@ -532,7 +527,10 @@
                     }
                   }
 
-                  // add timezone correction
+                  //
+                  // add time correction
+                  //
+
                   // correct program starttime
                   DateTime dateTimeStart = longtodate(startDate);
                   dateTimeStart = dateTimeStart.AddMinutes(timeZoneCorrection);
@@ -540,20 +538,14 @@
                   if (useTimeZone)
                   {
                     int off = GetTimeOffset(timeZoneStart);
-                    int h = off / 100;                // 220 -> 2,  -220 -> -2
-                    int m = off - (h * 100);     // 220 -> 20, -220 -> -20
+                    int h = off / 100;             // 220 -> 2,  -220 -> -2
+                    int m = off - (h * 100);       // 220 -> 20, -220 -> -20
 
-                    // convert to UTC
                     dateTimeStart = dateTimeStart.AddHours(-h);
                     dateTimeStart = dateTimeStart.AddMinutes(-m);
-
-                    // and back to local time
-                    dateTimeStart = dateTimeStart.ToLocalTime();
                   }
-
                   startDate = datetolong(dateTimeStart);
-
-
+        
                   if (nodeStop != null)
                   {
                     // correct program endtime
@@ -563,17 +555,12 @@
                     if (useTimeZone)
                     {
                       int off = GetTimeOffset(timeZoneEnd);
-                      int h = off / 100;                // 220 -> 2,  -220 -> -2
+                      int h = off / 100;           // 220 -> 2,  -220 -> -2
                       int m = off - (h * 100);     // 220 -> 20, -220 -> -20
 
-                      // convert to UTC
                       dateTimeEnd = dateTimeEnd.AddHours(-h);
                       dateTimeEnd = dateTimeEnd.AddMinutes(-m);
-
-                      // and back to local time
-                      dateTimeEnd = dateTimeEnd.ToLocalTime();
                     }
-
                     stopDate = datetolong(dateTimeEnd);
                   }
                   else stopDate = startDate;

Modified: trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.Designer.cs
===================================================================
--- trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.Designer.cs	2008-12-29 00:14:36 UTC (rev 21221)
+++ trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.Designer.cs	2008-12-29 15:20:25 UTC (rev 21222)
@@ -383,9 +383,9 @@
       this.checkBox1.AutoSize = true;
       this.checkBox1.Location = new System.Drawing.Point(9, 158);
       this.checkBox1.Name = "checkBox1";
-      this.checkBox1.Size = new System.Drawing.Size(288, 17);
+      this.checkBox1.Size = new System.Drawing.Size(265, 17);
       this.checkBox1.TabIndex = 22;
-      this.checkBox1.Text = "Apply timezone compensation when loading tvguide.xml";
+      this.checkBox1.Text = "Apply time compensation when loading tvguide.xml";
       this.checkBox1.UseVisualStyleBackColor = true;
       // 
       // buttonBrowse
@@ -892,12 +892,12 @@
       this.saveFileExport.Title = "Export the mapped guidechannels";
       this.saveFileExport.FileOk += new System.ComponentModel.CancelEventHandler(this.saveFileExport_FileOk);
       // 
-      // XmlSetup
+      // XmlTvSetup
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl1);
-      this.Name = "XmlSetup";
+      this.Name = "XmlTvSetup";
       this.Size = new System.Drawing.Size(483, 450);
       this.Load += new System.EventHandler(this.XmlSetup_Load);
       this.tabControl1.ResumeLayout(false);
@@ -1007,4 +1007,4 @@
 
 
   }
-}
\ No newline at end of file
+}

Modified: trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.cs
===================================================================
--- trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.cs	2008-12-29 00:14:36 UTC (rev 21221)
+++ trunk/TvEngine3/TVLibrary/Plugins/XmlTvImport/XmlTvSetup.cs	2008-12-29 15:20:25 UTC (rev 21222)
@@ -23,12 +23,10 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Globalization;
 using System.Drawing;
 using System.Text;
 using System.Xml;
 using System.Windows.Forms;
-using TvControl;
 using TvDatabase;
 using TvEngine;
 using TvLibrary.Log;
@@ -37,7 +35,7 @@
 
 namespace SetupTv.Sections
 {
-  public partial class XmlTvSetup : SetupTv.SectionSettings
+  public partial class XmlTvSetup : SectionSettings
   {
     public XmlTvSetup()
       : this("XmlTv")
@@ -119,7 +117,7 @@
     {
       TvBusinessLayer layer = new TvBusinessLayer();
       textBoxFolder.Text = layer.GetSetting("xmlTv", System.IO.Directory.GetCurrentDirectory()).Value;
-      checkBox1.Checked = layer.GetSetting("xmlTvUseTimeZone", "true").Value == "true";
+      checkBox1.Checked = layer.GetSetting("xmlTvUseTimeZone", "false").Value == "true";
       cbImportXML.Checked = layer.GetSetting("xmlTvImportXML", "true").Value == "true";
       cbImportLST.Checked = layer.GetSetting("xmlTvImportLST", "false").Value == "true";
       checkBoxDeleteBeforeImport.Checked = layer.GetSetting("xmlTvDeleteBeforeImport", "true").Value == "true";