Changeset 154

Timestamp:

04/27/08 01:31:31 (23 months ago)

Author:

omega

Message:

Refonte de la base de données, cette version est complètement différente de la version "officiel", elle est beaucoup plus simple, les infos ne sont plus stockés au format iCal. On perd un peu de fonctionnalités, mais on a un truc plus clean. Pour l'instant seul la commande easyadd marche.

Location:

zadolbator

Files:

• data/zadolbator/Zadolbator_schema.sql (modified) (1 diff)
• lib/zadolbator/component.rb (modified) (3 diffs)
• lib/zadolbator/easyadd_events.rb (added)
• lib/zadolbator/worker_thread.rb (modified) (2 diffs)
• zadolbator.sh (modified) (1 diff)

zadolbator/data/zadolbator/Zadolbator_schema.sql

@@ -1 +1 @@
 CREATE TABLE Users(id TEXT NOT NULL, PRIMARY KEY(id));
 
-CREATE TABLE Events(id TEXT NOT NULL, owner_id TEXT, ical TEXT, PRIMARY KEY(id));
+CREATE TABLE Events(id INTEGER PRIMARY KEY AUTOINCREMENT, owner_id TEXT, title TEXT, description TEXT, datetime DATETIME, alarm DATETIME);
 CREATE INDEX IDX_events_owner ON Events(owner_id);
 

zadolbator/lib/zadolbator/component.rb

@@ -45 +45 @@
 require 'zadolbator/common_cmds.rb'
 require 'zadolbator/add_events.rb'
+require 'zadolbator/easyadd_events.rb'
 require 'zadolbator/search_events.rb'
 require 'zadolbator/import_events.rb'
@@ -78 +79 @@
     @cmd_procs = {
                    AddEventsCmd.cmd_name => AddEventsCmd.new,
+                   EasyAddEventsCmd.cmd_name => EasyAddEventsCmd.new,
                    ImportEventsCmd.cmd_name => ImportEventsCmd.new,
                    ModifyEventsCmd.cmd_name => ModifyEventsCmd.new,
@@ -190 +192 @@
       end
     end
+    puts iq
+    puts "####"
     iq.to, iq.from = iq.from, iq.to
     send(iq)

zadolbator/lib/zadolbator/worker_thread.rb

@@ -23 +23 @@
       @component = comp
       @occurs = []
-      @next_fill_date = DateTime.now
+      @next_fill_date = Time.now
       @current_date = @next_fill_date
       @occurs_lock = Mutex.new
+      refill_occurences
     end
 
     def send_reminder(info)
+      puts "SENDING REMINDER #{info.inspect}"
       e = Storage::Event.find(info[:uid])
-      e.users.each { |user|
-        @component.log.debug("Sending reminder #{info[:uid]} to #{user.id}")
-        msg = Jabber::Message.new.set_from(@component.jabber_conf['jid']).set_to(user.id)
-        cals = Icalendar::parse(e.ical)
-        # We know only one calendar and one event should be present
-        event = cals.first.events.first
+      @component.log.debug("Sending reminder #{info[:uid]} to #{e.owner.id}")
+      msg = Jabber::Message.new.set_from(@component.jabber_conf['jid']).set_to(e.owner.id)
 
-        if @component.reminder_conf['allow_ruby_script'] and (ruby_script = event.properties['x-ruby_script']) != nil
-          @component.log.debug("Script: #{ruby_script}")
-          begin
-            safe_level = @component.reminder_conf['ruby_script_safe']
-            safe_level = 3 if safe_level == nil
-            ruby_res = eval "$SAFE = #{safe_level}; #{ruby_script}"
-          rescue => ex
-            @component.log.error(ex)
-          end
-        end
-
-        msg.body = "#{event.dtstart} - #{event.summary}\n#{info[:desc]}\n#{ruby_res}\n\n\n#{e.ical}"
-        @component.send(msg)
-      }
+      msg.body = "#{e.datetime} - #{e.title}\n#{e.description}"
+      puts msg.inspect
+      @component.send(msg)
     end
 
     # Fill occurences for all events until 'date_end'
     def fill_occurences(date_start)
-      date_end = date_start + @component.reminder_conf['queue_interval'] / (24.0 * 3600)
+      date_end = date_start + @component.reminder_conf['queue_interval']
+      puts date_end.strftime("%c")
       @occurs.clear
-      Storage::Event.find(:all).each { |e|
-        cals = Icalendar::parse(e.ical)
-        @component.log.debug(e.ical)
-        event = cals.first.events.first
-
-        event.alarms.each { |alarm|
-          # If events are repeated - put their durations into array.
-          # At least first item is always filled.
-          durs = [0]
-          if alarm.duration?
-            dur = Vpim::Icalendar::decode_duration(alarm.duration)
-            alarm.repeat.times { |i| durs << (i + 1) * dur }
-          end
-
-          @component.log.debug("Durations: #{durs.inspect}")
-
-          rel = alarm.trigger.ical_params['RELATED']
-          raise "RELATED=END option is not supported yet" if rel and rel.first == 'END'
-
-          @component.log.debug(alarm.trigger.ical_params['VALUE'])
-
-          if alarm.trigger.ical_params['VALUE'] and alarm.trigger.ical_params['VALUE'].first == 'DATE-TIME'
-            # The easy one: start date is supplied directly
-            @component.log.debug("Alarm date: #{alarm.trigger}")
-            durs.each { |dur|
-              cur_occ = DateTime.parse(alarm.trigger) + dur / (24.0 * 3600)
-              @component.log.debug("Actual occ: #{cur_occ}")
-              @occurs << {:time => cur_occ, :uid => e.id, :desc => alarm.description} if date_start <= cur_occ and cur_occ <= date_end
-            }
-          else
-            trig_dur = Vpim::Icalendar::decode_duration(alarm.trigger)
-            @component.log.debug("Trigger duration: #{trig_dur}, start time: #{event.dtstart}")
+      Storage::Event.find(:all, :conditions => {:alarm => date_start..(date_start+@component.reminder_conf['queue_interval']) } ).each { |e|
         
-            # Vpim does not work in DateTime (btw, why???), but uses Time instead -
-            # thus, it cannot handle years before 1970. To overcome that, we replace here
-            # all years before 1970 by 1970, hoping that recurrence is not more than yearly,
-            # so this replacement, being done for calculations only, does not break things.
-            if event.dtstart.year < 1970
-              # Is there any better way to just replace a year in date???
-              start = DateTime.civil(1970, event.dtstart.month(), event.dtstart.day(),
-                                     event.dtstart.hour(), event.dtstart.min(), event.dtstart.sec(),
-                                     event.dtstart.offset(), event.dtstart.start())
-            else
-              start = event.dtstart
-            end
-
-            # We know only one calendar should be present
-            rrule = Vpim::Rrule.new(Time.parse(start.strftime("%c")), event.recurrence_rules.first)
-            @component.log.debug("date_end: #{date_end}, durs.min: #{durs.min}, trig_dur: #{trig_dur}")
-            rrule.each(Time.parse(date_end.strftime("%c")) - durs.min - trig_dur) { |occ|
-              @component.log.debug("Occ: #{occ}")
-              durs.each { |dur|
-                cur_occ = DateTime.parse((occ + dur + trig_dur).iso8601)
-                @component.log.debug("Actual occ: #{cur_occ}")
-                @occurs << {:time => cur_occ, :uid => e.id, :desc => alarm.description} if date_start <= cur_occ and cur_occ <= date_end
-              }
-            }
-          end
-        }
+              @occurs << {:time => e.alarm, :uid => e.id}
       }
       @occurs.sort_by { |occ| occ[:time] }
@@ -125 +57 @@
       while true
         @occurs_lock.synchronize {
-          now = DateTime.now
+          now = Time.now
           @component.log.debug("Current time: #{now}")
           if not @occurs.empty?
             @component.log.debug("First time: #{@occurs.first[:time]}")
+            puts "TEST"
+            puts @occurs.first[:time].to_s < now.to_s
+            puts @occurs.empty?
+            puts "BEGIN WHILE"
             while not @occurs.empty? and @occurs.first[:time] <= now
+              puts "*******"
               send_reminder(@occurs.shift)
             end
+            puts "END WHILE"
           end
           fill_occurences(now) if @next_fill_date <= now
           @current_date = now
         }
+        puts "####"
+        puts @component.reminder_conf['check_interval']
         sleep(@component.reminder_conf['check_interval'])
+        puts "$$$$"
       end
     end

zadolbator/zadolbator.sh

@@ -2 +2 @@
 #helper to launch zadolbator without installing it
 
-ruby -Ilib bin/zadolbator.rb -c zadolbator.yaml -l zadolbator.log
+ruby -Ilib bin/zadolbator.rb -c zadolbator.yaml -l zadolbator.log --log-level DEBUG