Adding crontab with seconds

Author: AArayeshi

JobToolkit.Core.Standard/CronExpression.cs

@@ -13,19 +13,40 @@ public class CronExpression
 
         public CronExpression(string exp)
         {
-            NCrontab.Advanced.CrontabSchedule.Parse(exp);
             Expression = exp;
         }
-        
+
+        public DateTimeOffset GetNextTime()
+        {
+            return GetNextTime(DateTimeOffset.Now);
+        }
+
         public DateTimeOffset GetNextTime(DateTimeOffset after)
         {
-            return NCrontab.Advanced.CrontabSchedule.Parse(Expression).GetNextOccurrence(after.DateTime);
+            var tokens = Expression?.Split(new char[] { ' ' });
+            if (tokens.Length == 5)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression).GetNextOccurrence(after.DateTime);
+            else if (tokens.Length == 6)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression, NCrontab.Advanced.Enumerations.CronStringFormat.WithSeconds).GetNextOccurrence(after.DateTime);
+            else if (tokens.Length == 7)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression, NCrontab.Advanced.Enumerations.CronStringFormat.WithSecondsAndYears).GetNextOccurrence(after.DateTime);
+            else
+                throw new ApplicationException("invalid Crontab expression.");
+
             //NCrontab.CrontabSchedule.Parse("").GetNextOccurrence()
         }
 
         public DateTimeOffset GetNextTime(DateTimeOffset after, DateTimeOffset before)
         {
-            return NCrontab.Advanced.CrontabSchedule.Parse(Expression).GetNextOccurrence(after.DateTime, before.DateTime);
+            var tokens = Expression?.Split(new char[] { ' ' });
+            if (tokens.Length == 5)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression).GetNextOccurrence(after.DateTime, before.DateTime);
+            else if (tokens.Length == 6)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression, NCrontab.Advanced.Enumerations.CronStringFormat.WithSeconds).GetNextOccurrence(after.DateTime, before.DateTime);
+            else if (tokens.Length == 7)
+                return NCrontab.Advanced.CrontabSchedule.Parse(Expression, NCrontab.Advanced.Enumerations.CronStringFormat.WithSecondsAndYears).GetNextOccurrence(after.DateTime, before.DateTime);
+            else
+                throw new ApplicationException("invalid Crontab expression.");
         }
 
         public static CronExpression Parse(string exp)
@@ -49,6 +70,23 @@ public override string ToString()
             return Expression;
         }
 
+        /// <summary>
+        /// Returns cron expression that fires every Second.
+        /// </summary>
+        public static string Secondly()
+        {
+            return "* * * * * *";
+        }
+
+        /// <summary>
+        /// Returns cron expression that fires every minute at the specified second.
+        /// </summary>
+        /// <param name="second">The second in which the schedule will be activated (0-59).</param>
+        public static string Minutely(int second)
+        {
+            return String.Format("{0} * * * * *", second);
+        }
+
         /// <summary>
         /// Returns cron expression that fires every minute.
         /// </summary>

JobToolkit.Core.Standard/Job.cs

@@ -64,6 +64,11 @@ public Job(JobTask task, DateTimeOffset scheduleTime, CronExpression cron, DateT
             this.CreateTime = DateTimeOffset.Now;
         }
 
+        public DateTimeOffset? GetNextScheduleTime()
+        {
+            return GetNextScheduleTime(DateTimeOffset.Now);
+        }
+
         public DateTimeOffset? GetNextScheduleTime(DateTimeOffset after)
         {
             DateTimeOffset? nextTime = null;

JobToolkit.Core.Standard/JobServer.cs

@@ -86,7 +86,8 @@ private Task StartMainTaskAsync(CancellationToken cancellationToken)
                         IList<Job> jobs = Repository.GetAll(criteria);
                         if (jobs.Count <= 0)
                         {
-                            System.Threading.Thread.Sleep(200);
+                            Task.Delay(200).GetAwaiter().GetResult();
+                            //System.Threading.Thread.Sleep(200);
                             continue;
                         }
 

JobToolkit.Core.Standard/JobToolkit.Core.Standard.csproj

@@ -15,7 +15,7 @@
     <RepositoryType>GIT</RepositoryType>
     <PackageTags>csharp dotnet ASP.NET job dotnetcore job-scheduler background-jobs Long-Running Scheduler</PackageTags>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <RootNamespace>JobToolkit.Core</RootNamespace>
     <AssemblyName>JobToolkit.Core</AssemblyName>
   </PropertyGroup>

JobToolkit.NetCore.ConsoleApp/App_Data/MyDatabase.sqlite

@@ -68,7 +68,7 @@ static void Main(string[] args)
             Job retJob2 = jobManager.Get(job2.Id);
             //retJob2.DoAction();
 
-            Job job3 = jobManager.Schedule(() => Console.WriteLine("Exprission job {0} executed.", 3), DateTimeOffset.Now, "* * * * *", null);
+            Job job3 = jobManager.Schedule(() => Console.WriteLine("Exprission job {0} executed.", 3), DateTimeOffset.Now, "*/30 * * * * *", null);
             Job retJob3 = jobManager.Get(job3.Id);
             //retJob3.DoAction();
 

JobToolkit.NetCore.ConsoleApp/App_Data/MyDatabase.sqlite-journal

@@ -22,7 +22,7 @@ Features
     - Custom storage support by writing custom repositories such as (MySql, PostGre Sql and ... )
 - Easy instalation and configuration
 - Supports any type of projects (Web, Win, Console, Win Service and ...)
-- Supports DotNet Framework, DotNet Core and Xamarin projects
+- Supports DotNet Framework, DotNet Core and Xamarin Forms projects
 - Allow Sepration between job producer and job executer on diffrent application or servers (Multiple producers and one executer)
 
 Usage