* Author(s)
* Stephane Delcroix <stephane@delcroix.org>
*
+ * Copyright 2011 Xamarin Inc.
+ *
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
string daylightDisplayName;
public string DaylightName {
get {
- if (disableDaylightSavingTime)
- return String.Empty;
- return daylightDisplayName;
+ return supportsDaylightSavingTime
+ ? daylightDisplayName
+ : string.Empty;
}
}
if (local == null) {
#if MONODROID
local = ZoneInfoDB.Default;
+#elif MONOTOUCH
+ using (Stream stream = GetMonoTouchDefault ()) {
+ local = BuildFromStream ("Local", stream);
+ }
#elif LIBC
try {
local = FindSystemTimeZoneByFileName ("Local", "/etc/localtime");
}
}
#else
- throw new TimeZoneNotFoundException ();
+ if (IsWindows && LocalZoneKey != null) {
+ string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
+ name = TrimSpecial (name);
+ if (name != null)
+ local = TimeZoneInfo.FindSystemTimeZoneById (name);
+ }
+
+ if (local == null)
+ throw new TimeZoneNotFoundException ();
#endif
}
return local;
get { return standardDisplayName; }
}
- bool disableDaylightSavingTime;
+ bool supportsDaylightSavingTime;
public bool SupportsDaylightSavingTime {
- get { return !disableDaylightSavingTime; }
+ get { return supportsDaylightSavingTime; }
}
static TimeZoneInfo utc;
}
}
#if LIBC
- static string timeZoneDirectory = null;
+ static string timeZoneDirectory;
static string TimeZoneDirectory {
get {
if (timeZoneDirectory == null)
private AdjustmentRule [] adjustmentRules;
#if !NET_2_1
- static RegistryKey timeZoneKey = null;
- static bool timeZoneKeySet = false;
+ /// <summary>
+ /// Determine whether windows of not (taken Stephane Delcroix's code)
+ /// </summary>
+ private static bool IsWindows
+ {
+ get {
+ int platform = (int) Environment.OSVersion.Platform;
+ return ((platform != 4) && (platform != 6) && (platform != 128));
+ }
+ }
+
+ /// <summary>
+ /// Needed to trim misc garbage in MS registry keys
+ /// </summary>
+ private static string TrimSpecial (string str)
+ {
+ var Istart = 0;
+ while (Istart < str.Length && !char.IsLetterOrDigit(str[Istart])) Istart++;
+ var Iend = str.Length - 1;
+ while (Iend > Istart && !char.IsLetterOrDigit(str[Iend])) Iend--;
+
+ return str.Substring (Istart, Iend-Istart+1);
+ }
+
+ static RegistryKey timeZoneKey;
static RegistryKey TimeZoneKey {
get {
- if (!timeZoneKeySet) {
- int p = (int) Environment.OSVersion.Platform;
- /* Only use the registry on non-Unix platforms. */
- if ((p != 4) && (p != 6) && (p != 128))
- timeZoneKey = Registry.LocalMachine.OpenSubKey (
- "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
- false);
- timeZoneKeySet = true;
- }
- return timeZoneKey;
+ if (timeZoneKey != null)
+ return timeZoneKey;
+ if (!IsWindows)
+ return null;
+
+ return timeZoneKey = Registry.LocalMachine.OpenSubKey (
+ "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
+ false);
+ }
+ }
+
+ static RegistryKey localZoneKey;
+ static RegistryKey LocalZoneKey {
+ get {
+ if (localZoneKey != null)
+ return localZoneKey;
+
+ if (!IsWindows)
+ return null;
+
+ return localZoneKey = Registry.LocalMachine.OpenSubKey (
+ "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", false);
}
}
#endif
public static DateTime ConvertTime (DateTime dateTime, TimeZoneInfo sourceTimeZone, TimeZoneInfo destinationTimeZone)
{
if (dateTime.Kind == DateTimeKind.Local && sourceTimeZone != TimeZoneInfo.Local)
- throw new ArgumentException ("Kind propery of dateTime is Local but the sourceTimeZone does not equal TimeZoneInfo.Local");
+ throw new ArgumentException ("Kind property of dateTime is Local but the sourceTimeZone does not equal TimeZoneInfo.Local");
if (dateTime.Kind == DateTimeKind.Utc && sourceTimeZone != TimeZoneInfo.Utc)
- throw new ArgumentException ("Kind propery of dateTime is Utc but the sourceTimeZone does not equal TimeZoneInfo.Utc");
+ throw new ArgumentException ("Kind property of dateTime is Utc but the sourceTimeZone does not equal TimeZoneInfo.Utc");
if (sourceTimeZone.IsInvalidTime (dateTime))
throw new ArgumentException ("dateTime parameter is an invalid time");
}
- public static DateTimeOffset ConvertTime (DateTimeOffset dateTimeOffset, TimeZoneInfo destinationTimeZone)
+ public static DateTimeOffset ConvertTime(DateTimeOffset dateTimeOffset, TimeZoneInfo destinationTimeZone)
{
- throw new NotImplementedException ();
+ if (destinationTimeZone == null)
+ throw new ArgumentNullException("destinationTimeZone");
+
+ var utcDateTime = dateTimeOffset.UtcDateTime;
+ AdjustmentRule rule = GetApplicableRule (utcDateTime);
+
+ if (rule != null && destinationTimeZone.IsDaylightSavingTime(utcDateTime)) {
+ var offset = destinationTimeZone.BaseUtcOffset + rule.DaylightDelta;
+ return new DateTimeOffset(DateTime.SpecifyKind(utcDateTime, DateTimeKind.Unspecified) + offset, offset);
+ }
+ else {
+ return new DateTimeOffset(DateTime.SpecifyKind(utcDateTime, DateTimeKind.Unspecified) + destinationTimeZone.BaseUtcOffset, destinationTimeZone.BaseUtcOffset);
+ }
}
public static DateTime ConvertTimeBySystemTimeZoneId (DateTime dateTime, string destinationTimeZoneId)
throw new ArgumentNullException ("sourceTimeZone");
if (dateTime.Kind == DateTimeKind.Utc && sourceTimeZone != TimeZoneInfo.Utc)
- throw new ArgumentException ("Kind propery of dateTime is Utc but the sourceTimeZone does not equal TimeZoneInfo.Utc");
+ throw new ArgumentException ("Kind property of dateTime is Utc but the sourceTimeZone does not equal TimeZoneInfo.Utc");
if (dateTime.Kind == DateTimeKind.Local && sourceTimeZone != TimeZoneInfo.Local)
- throw new ArgumentException ("Kind propery of dateTime is Local but the sourceTimeZone does not equal TimeZoneInfo.Local");
+ throw new ArgumentException ("Kind property of dateTime is Local but the sourceTimeZone does not equal TimeZoneInfo.Local");
if (sourceTimeZone.IsInvalidTime (dateTime))
throw new ArgumentException ("dateTime parameter is an invalid time");
return new TimeZoneInfo (id, baseUtcOffset, displayName, standardDisplayName, daylightDisplayName, adjustmentRules, disableDaylightSavingTime);
}
+#if NET_4_5
+ public override bool Equals (object obj)
+ {
+ return Equals (obj as TimeZoneInfo);
+ }
+#endif
+
public bool Equals (TimeZoneInfo other)
{
if (other == null)
}
#endif
#if MONODROID
- return ZoneInfoDB.GetTimeZone (id);
+ var timeZoneInfo = ZoneInfoDB.GetTimeZone (id);
+ if (timeZoneInfo == null)
+ throw new TimeZoneNotFoundException ();
+ return timeZoneInfo;
+#else
+ // Local requires special logic that already exists in the Local property (bug #326)
+ if (id == "Local")
+ return Local;
+#if MONOTOUCH
+ using (Stream stream = GetMonoTouchData (id)) {
+ return BuildFromStream (id, stream);
+ }
#elif LIBC
string filepath = Path.Combine (TimeZoneDirectory, id);
return FindSystemTimeZoneByFileName (id, filepath);
#else
throw new NotImplementedException ();
+#endif
#endif
}
#if LIBC
- const int BUFFER_SIZE = 16384; //Big enough for any tz file (on Oct 2008, all tz files are under 10k)
private static TimeZoneInfo FindSystemTimeZoneByFileName (string id, string filepath)
{
if (!File.Exists (filepath))
throw new TimeZoneNotFoundException ();
- byte [] buffer = new byte [BUFFER_SIZE];
- int length;
using (FileStream stream = File.OpenRead (filepath)) {
- length = stream.Read (buffer, 0, BUFFER_SIZE);
+ return BuildFromStream (id, stream);
}
-
+ }
+#endif
+#if LIBC || MONOTOUCH
+ const int BUFFER_SIZE = 16384; //Big enough for any tz file (on Oct 2008, all tz files are under 10k)
+
+ private static TimeZoneInfo BuildFromStream (string id, Stream stream)
+ {
+ byte [] buffer = new byte [BUFFER_SIZE];
+ int length = stream.Read (buffer, 0, BUFFER_SIZE);
+
if (!ValidTZFile (buffer, length))
throw new InvalidTimeZoneException ("TZ file too big for the buffer");
public AdjustmentRule [] GetAdjustmentRules ()
{
- if (disableDaylightSavingTime)
+ if (!supportsDaylightSavingTime)
return new AdjustmentRule [0];
else
return (AdjustmentRule []) adjustmentRules.Clone ();
}
//FIXME: change this to a generic Dictionary and allow caching for FindSystemTimeZoneById
- private static List<TimeZoneInfo> systemTimeZones = null;
+ private static List<TimeZoneInfo> systemTimeZones;
public static ReadOnlyCollection<TimeZoneInfo> GetSystemTimeZones ()
{
if (systemTimeZones == null) {
#endif
#if MONODROID
foreach (string id in ZoneInfoDB.GetAvailableIds ()) {
- systemTimeZones.Add (ZoneInfoDB.GetTimeZone (id));
+ var tz = ZoneInfoDB.GetTimeZone (id);
+ if (tz != null)
+ systemTimeZones.Add (tz);
}
+#elif MONOTOUCH
+ if (systemTimeZones.Count == 0) {
+ foreach (string name in GetMonoTouchNames ()) {
+ using (Stream stream = GetMonoTouchData (name)) {
+ systemTimeZones.Add (BuildFromStream (name, stream));
+ }
+ }
+ }
#elif LIBC
string[] continents = new string [] {"Africa", "America", "Antarctica", "Arctic", "Asia", "Atlantic", "Brazil", "Canada", "Chile", "Europe", "Indian", "Mexico", "Mideast", "Pacific", "US"};
foreach (string continent in continents) {
throw new ArgumentException ("id parameter shouldn't be longer than 32 characters");
#endif
+ bool supportsDaylightSavingTime = !disableDaylightSavingTime;
+
if (adjustmentRules != null && adjustmentRules.Length != 0) {
AdjustmentRule prev = null;
foreach (AdjustmentRule current in adjustmentRules) {
prev = current;
}
+ } else {
+ supportsDaylightSavingTime = false;
}
this.id = id;
this.displayName = displayName ?? id;
this.standardDisplayName = standardDisplayName ?? id;
this.daylightDisplayName = daylightDisplayName;
- this.disableDaylightSavingTime = disableDaylightSavingTime;
+ this.supportsDaylightSavingTime = supportsDaylightSavingTime;
this.adjustmentRules = adjustmentRules;
}
projects / mono.git / blobdiff