Merge pull request #2 from WebPlatformForEmbedded/timer

introduced flag to indicate abosulte or relative

Author: pwielders

Launcher.cpp

@@ -68,7 +68,7 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
 
 /* virtual */ const string Launcher::Initialize(PluginHost::IShell* service)
 {
-    Time relativeTime;
+    Time time;
     Time interval;
     string message;
     Config config;
@@ -83,8 +83,8 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
 
     if (config.ScheduleTime.IsSet() == true) {
 
-        relativeTime = Time(config.ScheduleTime.RelativeTime.Value());
-        if (relativeTime.IsValid() != true) {
+        time = Time(config.ScheduleTime.Time.Value());
+        if (time.IsValid() != true) {
             SYSLOG(Trace::Warning, (_T("Time format is wrong")));
         }
 
@@ -100,9 +100,9 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
             // Well if we where able to parse the parameters (if needed) we are ready to start it..
             _observer.Register(&_notification);
 
-            if (relativeTime.IsValid() == true) {
+            if (time.IsValid() == true) {
                 Core::Time scheduledTime(Core::Time::Now());
-                uint64_t timeValueToTrigger = ((relativeTime.Hour() * 60 + relativeTime.Minute()) * 60 + relativeTime.Second()) * 1000;
+                uint64_t timeValueToTrigger = ((time.Hour() * 60 + time.Minute()) * 60 + time.Second()) * 1000;
                 scheduledTime.Add(timeValueToTrigger);
 
                 PluginHost::WorkerPool::Instance().Schedule(scheduledTime, _activity);

Launcher.h

@@ -300,22 +300,22 @@ class Launcher : public PluginHost::IPlugin {
         public:
             Schedule()
                 : Core::JSON::Container()
-                , RelativeTime()
+                , Time()
                 , Interval() {
-                Add(_T("relativetime"), &RelativeTime);
+                Add(_T("time"), &Time);
                 Add(_T("interval"), &Interval);
             }
             Schedule(const Schedule& copy)
                 : Core::JSON::Container()
-                , RelativeTime(copy.RelativeTime)
+                , Time(copy.Time)
                 , Interval(copy.Interval) {
-                Add(_T("relativetime"), &RelativeTime);
+                Add(_T("time"), &Time);
                 Add(_T("interval"), &Interval);
             }
             ~Schedule() {
             }
         public:
-            Core::JSON::String RelativeTime;
+            Core::JSON::String Time;
             Core::JSON::String Interval;
         };
 

README.md

@@ -69,11 +69,15 @@ Plugin to "Launch" linux applications and scripts
        { "option": "-h"}
       ],
      "schedule": {
-       "relativetime": "06:04.10"
+       "absoulute": false,
+       "time": "06:04.10"
      }
    }
    ```
-Note: If relative time value is "00:00.00"/invalid format/not set, the launcher will ignore the given time and launch the application at the launcher activation time itself.
+
+Note:
+1. If field "absolute" is false or not set, it will treat the time as relative
+2. If relative time value is "00:00.00"/invalid format/not set, the launcher will ignore the given time and launch the application at the launcher activation time itself.
 
 ### How to schedule an application/script to run in an interval
 
@@ -86,7 +90,8 @@ Note: If relative time value is "00:00.00"/invalid format/not set, the launcher
        { "option": "-h"}
       ],
       "schedule": {
-        "relativetime": "06:04.10",
+        "absoulute": false,
+        "time": "06:04.10",
         "interval": "00:40.10"
       }
    }