Fix bug in non stop task

esi/scraper/tasks.py

@@ -8,16 +8,18 @@ from .models import Job
 def run_job(job_id):
     api = Service()
     api.update_jobs_status()
-    print('RUN spider', job_id)
+    print('RUN spider for job: {}'.format(job_id))
     job = Job.objects.get(id=job_id)
 
     # run job nonstop
     if job.status == Job.FINISHED and job.interval == Job.NON:
         print('NONSTOP')
         api.run_job(job_id)
+    else:
+        print('JOB NOT FINISHED YET')
 
     # run job with some interval
-    elif job.interval and job.interval != Job.NON:
+    if job.interval and job.interval != Job.NON:
         print('INTERVAL')
         api.run_job(job_id)
 

esi/scraper/views.py

@@ -78,7 +78,7 @@ class NewJobCreateView(CreateView):
         if query == BAD_QUERY:
             return HttpResponse('Bad request', status=400)
         job = Job.objects.create(name=name, spider=spider, query=query)
-        interval = request.POST.get('interval')
+        interval = request.POST.get('interval', '').upper()
         print('Interval', interval)
         if interval:
             every = request.POST.get('count')
@@ -127,10 +127,10 @@ class EditJobView(UpdateView):
 
 
 def schedule(interval, every):
-    DAY = 'day'
-    WEEK = 'week'
-    MONTH = 'month'
-    NON = 'nonstop'
+    DAY = 'DAY'
+    WEEK = 'WEEK'
+    MONTH = 'MONTH'
+    NON = 'NON'
     scheduler = {
         'minute': 0,
         'hour': 0,

esi/templates/edit_job.html

@@ -71,10 +71,10 @@
                     <div class="col-md-3">
                         <label class="custom-control custom-radio">
                             {% if job.interval == 'nonstop' %}
-                            <input id="radio4" name="interval" value="nonstop" type="radio"
+                            <input id="radio4" name="interval" value="non" type="radio"
                                    class="custom-control-input" checked>
                             {% endif %}
-                            <input id="radio4" name="interval" value="nonstop" type="radio"
+                            <input id="radio4" name="interval" value="non" type="radio"
                                    class="custom-control-input">
                             <span class="custom-control-indicator"></span>
                             <span class="custom-control-description">After finish</span>

esi/templates/new_job.html

@@ -58,7 +58,7 @@
                     </div>
                     <div class="col-md-3">
                         <label class="custom-control custom-radio">
-                            <input id="radio4" name="interval" value="nonstop" type="radio"
+                            <input id="radio4" name="interval" value="non" type="radio"
                                    class="custom-control-input">
                             <span class="custom-control-indicator"></span>
                             <span class="custom-control-description">After finish</span>