Merge branch 'release/v0.3'

aeszter · aeszter · commit 9f56213e3109 · 2018-04-17T17:08:29.000+02:00
diff --git a/seminar.gpr b/seminar.gpr
@@ -4,7 +4,6 @@ project Seminar is
 
    for Object_Dir use "obj";
    for Exec_Dir use ".";
-   for Main use ("seminar-main.adb");
    type Build_Kind is
       ("static", "relocatable", "static-pic");
    Xmlada_Build : Build_Kind := external ("XMLADA_BUILD");
@@ -26,17 +25,21 @@ project Seminar is
                case Florist_Build is
 
                   when "default" =>
+                     for Main use ("debug.adb", "seminar-main.adb");
                      for Source_Dirs use ("src/**", "../tools/XMLAda/xmlada-3.2.1-src/**", "../tools/adacgi-1.6");
                end case;
 
             when "relocatable" =>
+               for Main use ("seminar-main.adb");
                for Source_Dirs use ("src");
          end case;
 
       when "relocatable" =>
+         for Main use ("seminar-main.adb");
          for Source_Dirs use ("src");
 
       when "static-pic" =>
+         for Main use ("seminar-main.adb");
          for Source_Dirs use ("src");
    end case;
 
diff --git a/src/debug.adb b/src/debug.adb
@@ -0,0 +1,39 @@
+with Ada.Text_IO;
+with GNAT.Calendar;
+with Ada.Calendar;
+with GNAT.Calendar.Time_IO;
+with Ada.Calendar.Time_Zones;
+use Ada.Calendar;
+
+
+procedure Debug is
+   Year, Month, Day, Hour, Minute, Second : Natural;
+   Sub_Second, Seconds : Duration;
+begin
+   Ada.Text_IO.Put_Line (GNAT.Calendar.Time_IO.Image (Ada.Calendar.Clock, "%c"));
+   GNAT.Calendar.Split (Ada.Calendar.Clock,
+                        Year,
+                        Month,
+                        Day,
+                        Hour,
+                        Minute,
+                        Second,
+                        Sub_Second);
+   Ada.Text_IO.Put_Line ("Split: " & Hour'Img & ":" & Minute'Img);
+   GNAT.Calendar.Split_At_Locale (Ada.Calendar.Clock,
+                                  Year,
+                                  Month,
+                                  Day,
+                                  Hour,
+                                  Minute,
+                                  Second,
+                                  Sub_Second);
+   Ada.Text_IO.Put_Line ("Split_At_Locale: " & Hour'Img & ":" & Minute'Img);
+   Ada.Calendar.Split (Ada.Calendar.Clock, Year, Month, Day, Seconds);
+   Second := Integer (Seconds);
+   Hour := Second / 3_600;
+   Minute := (Second - Hour * 3_600) / 60;
+   Ada.Text_IO.Put_Line ("Ada.Calendar.Split: " & Integer'Image (Hour) & ":" & Integer'Image (Minute));
+   Ada.Text_IO.Put_Line ("TZ Offset (Clock): " & Integer'Image (Integer (Ada.Calendar.Time_Zones.UTC_Time_Offset (Ada.Calendar.Clock))));
+   Ada.Text_IO.Put_Line ("TZ Offset (Clock-30d): " & Integer'Image (Integer (Ada.Calendar.Time_Zones.UTC_Time_Offset (Ada.Calendar.Clock - Duration (3_600*24*30)))));
+end Debug;
diff --git a/src/events.adb b/src/events.adb
@@ -30,6 +30,9 @@ package body Events is
    function To_String (Prefix : String;
                        T       : Ada.Calendar.Time;
                        All_Day : Boolean) return String;
+   function To_String (Prefix : String;
+                       T       : Local_Time;
+                       All_Day : Boolean) return String;
 
    function Get_Value (Fields : Named_Node_Map;
                        Name   : String) return String;
@@ -267,6 +270,20 @@ package body Events is
       end if;
    end To_String;
 
+   function To_String (Prefix : String;
+                       T       : Local_Time;
+                       All_Day : Boolean) return String is
+      The_Time : constant Ada.Calendar.Time := Ada.Calendar.Time (T);
+   begin
+      if All_Day then
+         return Prefix & ";TZID=" & Utils.Get_Timezone & ";VALUE=DATE:"
+           & GNAT.Calendar.Time_IO.Image (The_Time, "%Y%m%d");
+      else
+         return Prefix & ";TZID=" & Utils.Get_Timezone & ":"
+           & GNAT.Calendar.Time_IO.Image (The_Time, "%Y%m%dT%H%M%S");
+      end if;
+   end To_String;
+
    function To_String (I : Interval) return String is
    begin
       return Interval'Image (I);
@@ -350,8 +367,10 @@ package body Events is
          Write ("UID:" & Item.UID);
          Write ("STATUS:CONFIRMED");
          Write (To_String ("LAST-MODIFIED", Item.Last_Modified, False));
-         Write (To_String ("DTSTART", Item.Event_Date, Item.Is_All_Day));
-         Write (To_String ("DTEND", Item.Event_Date + Item.Event_Duration,
+         Write (To_String ("DTSTART", UTC_To_Local (Item.Event_Date),
+                       Item.Is_All_Day));
+         Write (To_String ("DTEND",
+                UTC_To_Local (Item.Event_Date + Item.Event_Duration),
                        Item.Is_All_Day));
          Write_Recurrence (Item);
          Write_Exceptions (Item);
diff --git a/src/seminar-main.adb b/src/seminar-main.adb
@@ -13,6 +13,7 @@ with CGI;
 
 with Convert;
 with Pipe_Streams; use Pipe_Streams;
+with Utils;
 
 procedure Seminar.Main is
    use Ada.Command_Line;
@@ -22,7 +23,7 @@ procedure Seminar.Main is
    procedure Append (Source : in out POSIX.POSIX_String_List;
                      New_Item : Unbounded_String);
 
-   Version : constant String := "v0.2";
+   Version : constant String := "v0.3";
    Config_File         : Ada.Text_IO.File_Type;
    Wget_Command        : Pipe_Stream;
    Reader              : DOM.Readers.Tree_Reader;
@@ -85,6 +86,8 @@ begin
                URL := To_Unbounded_String (Value);
             elsif Name = "request" then
                Request := To_Unbounded_String (Value);
+            elsif Name = "timezone" then
+               Utils.Timezone := To_Unbounded_String (Value);
             else
                raise Config_Error with
                  "Unknown name """ & Name & """";
diff --git a/src/utils.adb b/src/utils.adb
@@ -3,6 +3,7 @@ with Ada.Characters;
 with Ada.Characters.Latin_1;
 with GNAT.Calendar;
 with GNAT.Calendar.Time_IO;
+with Ada.Calendar.Time_Zones;
 
 package body Utils is
 
@@ -27,6 +28,11 @@ package body Utils is
       return Result (1 .. K);
    end Clean_Text;
 
+   function Get_Timezone return String is
+   begin
+      return Ada.Strings.Unbounded.To_String (Timezone);
+   end Get_Timezone;
+
    function Shift (S : String) return String is
       Result : constant String (1 .. S'Length) := S;
    begin
@@ -84,6 +90,13 @@ package body Utils is
       return Result (1 .. R - 1);
    end Unescape;
 
+   function UTC_To_Local (T : Ada.Calendar.Time) return Local_Time is
+      use Ada.Calendar;
+   begin
+      return Local_Time (T
+                    + 60 * Duration (Time_Zones.UTC_Time_Offset (T)));
+   end UTC_To_Local;
+
    procedure Warn (Text : String) is
       use Ada.Text_IO;
    begin
diff --git a/src/utils.ads b/src/utils.ads
@@ -1,10 +1,16 @@
 with Ada.Calendar;
+with Ada.Strings.Unbounded;
 
 package Utils is
+   type Local_Time is new Ada.Calendar.Time;
+   Timezone : Ada.Strings.Unbounded.Unbounded_String;
+
    function Shift (S : String) return String;
    function Unescape (S : String) return String;
    procedure Warn (Text : String);
    function Clean_Text (Source : String) return String;
    function To_Time (Source : String) return Ada.Calendar.Time;
    function To_String (N : Natural) return String;
+   function UTC_To_Local (T : Ada.Calendar.Time) return Local_Time;
+   function Get_Timezone return String;
 end Utils;
