getnikola · Oct 16, 2015 · Oct 17, 2015
diff --git a/nikolausers/settings.py b/nikolausers/settings.py
@@ -111,7 +111,10 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
 STATIC_URL = '/static/'
+STATIC_ROOT = '/srv/users.getnikola.com/static'
+
 
 LOGGING = {
     'version': 1,

diff --git a/sites/checker.py b/sites/checker.py
@@ -1,51 +1,19 @@
 import requests
-from django.utils.html import format_html, mark_safe
 
-CHECK_SUCCESS = mark_safe("""
-<p class="text-success">
-<i class="fa fa-check" style="font-size: 2em;"></i>
-This is a Nikola site.</p>""")
+def gencheck(url):
+    if not url.endswith('/rss.xml'):
+        return {"type": "error", "data": "This is not a random web proxy."}
+    r = requests.get(url)
+    patterns = [b'<generator>https://getnikola.com/</generator>',         # v7.6.1
+                b'<generator>http://getnikola.com/</generator>',          # v7.0.0
+                b'<generator>Nikola <http://getnikola.com/></generator>', # v6.3.0
+                b'<generator>nikola</generator>']                         # v6.2.1
+    result = -1
+    for i, p in enumerate(patterns):
+        if p in r.content:
+            result = i
 
-CHECK_FAILURE = mark_safe("""
-<p class="text-danger">
-<i class="fa fa-times" style="font-size: 2em;"></i>
-This is not a Nikola site.</p>""")
-
-CHECK_UNKNOWN = """
-<p class="text-warning">
-<i class="fa fa-warning" style="font-size: 2em;"></i>
-The check has failed. {0}</p>"""
-
-CHECK_ERROR_NODATA = [mark_safe("""
-<p class="text-warning">
-<i class="fa fa-warning" style="font-size: 2em;"></i>
-No URL provided or the form is invalid.</p>""")]
-
-
-def gencheck(homeurl):
-    yield format_html('<p>Checking site: <strong>{0}</strong>.</p>', homeurl)
-    burl = homeurl.split('index.html')[0]
-    if not burl.endswith('/'):
-        burl += '/'
-    if homeurl != burl:
-        yield format_html('<p>Base determined as <strong>{0}</strong>.</p>', burl)
-    rssurl = burl + 'rss.xml'
-    try:
-        r = requests.get(rssurl)
-        nsite = False
-        patterns = [b'<generator>https://getnikola.com/</generator>',         # v7.6.1
-                    b'<generator>http://getnikola.com/</generator>',          # v7.0.0
-                    b'<generator>Nikola <http://getnikola.com/></generator>', # v6.3.0
-                    b'<generator>nikola</generator>']                         # v6.2.1
-        for i in patterns:
-            if i in r.content:
-                nsite = True
-
-        if nsite:
-            yield CHECK_SUCCESS
-        elif r.status_code not in [200, 404]:
-            yield format_html(CHECK_UNKNOWN, 'HTTP Error {0}.'.format(r.status_code))
-        else:
-            yield CHECK_FAILURE
-    except NameError as e:
-        yield format_html(CHECK_UNKNOWN, 'An unhandled exception occurred: ' + str(e))
+    if r.status_code != 200:
+        return {"type": "error", "data": 'HTTP Error {0}.'.format(r.status_code)}
+    else:
+        return {"type": "result", "data": result}
diff --git a/sites/urls.py b/sites/urls.py
@@ -7,6 +7,7 @@
     url(r'^edit/?$', views.edit, name='edit'),
     url(r'^remove/?$', views.remove, name='remove'),
     url(r'^check/?$', views.check, name='check'),
+    url(r'^api/check$', views.api_check, name='api_check'),
     url(r'^tos/?$', views.tos, name='tos'),
     url(r'^lang/?$', views.langlist, name='langlist'),
     url(r'^lang/(?P<language_code>[a-z]{2,5})/?$', views.lang, name='lang'),

diff --git a/sites/views.py b/sites/views.py
@@ -2,10 +2,10 @@
 from django.shortcuts import render
 from django.core.mail import send_mail
 from django.utils.html import format_html
-from django.http import HttpResponseNotFound
+from django.http import JsonResponse, HttpResponseNotFound
 from .models import Site, Language
-from .checker import gencheck, CHECK_ERROR_NODATA
-from .forms import AddForm, CheckForm
+from .checker import gencheck
+from .forms import AddForm
 
 MENU = (
     ('/', 'Users Home', 'home'),
@@ -162,20 +162,19 @@ def check(request):
         'menu': MENU,
         'title': 'Check a Site',
         'page': 'check',
-        'data': [],
     }
 
-    if request.method == 'POST':
-        form = CheckForm(request.POST)
-        if form.is_valid():
-            context['data'] = gencheck(form.cleaned_data['url'])
-            context['url'] = form.cleaned_data['url']
-        else:
-            context['data'] = CHECK_ERROR_NODATA
-
     return render(request, 'check.html', context)
 
 
+def api_check(request):
+    """Check API."""
+    if 'url' in request.GET:
+        return JsonResponse(gencheck(request.GET['url']))
+    else:
+        return JsonResponse({"type": "error", "data": "No URL specified. Please remember this is not a random web proxy."})
+
+
 def tos(request):
     """Terms of Service view."""
     context = {