Feature/80 new upload widget

.github/workflows/test.yml

@@ -58,9 +58,10 @@ jobs:
       run: |
         ckan -c test.ini db init
     - name: Run tests
-      run: pytest --ckan-ini=test.ini --cov=ckanext.validation --cov-report=xml --cov-append --disable-warnings ckanext/validation/tests -vv
+      #      run: pytest --ckan-ini=test.ini --cov=ckanext.validation --cov-report=xml --cov-append --disable-warnings ckanext/validation/tests -vv
+      run: pytest --ckan-ini=test.ini --disable-warnings ckanext/validation/tests -vv
 
-    - name: Upload coverage report to codecov
-      uses: codecov/codecov-action@v1
-      with:
-        file: ./coverage.xml
+        #- name: Upload coverage report to codecov
+        #  uses: codecov/codecov-action@v1
+        #  with:
+        #    file: ./coverage.xml

ckanext/validation/blueprints.py

@@ -2,7 +2,21 @@
 
 from flask import Blueprint
 
-from ckantoolkit import c, NotAuthorized, ObjectNotFound, abort, _, render, get_action
+from ckan.lib.navl.dictization_functions import unflatten
+from ckan.logic import tuplize_dict, clean_dict, parse_params
+from ckanext.validation.logic import is_tabular
+
+from ckantoolkit import (
+    c, g,
+    NotAuthorized,
+    ObjectNotFound,
+    abort,
+    _,
+    render,
+    get_action,
+    request,
+)
+import ckantoolkit as t
 
 validation = Blueprint("validation", __name__)
 
@@ -40,6 +54,69 @@ def read(id, resource_id):
 
         abort(404, _(u"No validation report exists for this resource"))
 
+def _get_data():
+    data = clean_dict(
+	    unflatten(tuplize_dict(parse_params(request.form)))
+    )
+    data.update(clean_dict(
+	    unflatten(tuplize_dict(parse_params(request.files)))
+    ))
+    return data
+
+
+def resource_file_create(id):
+
+    # Get data from the request
+    data_dict = _get_data()
+
+    # Call resource_create
+    context = {
+        'user': g.user,
+    }
+
+    data_dict["package_id"] = id
+    resource = get_action("resource_create")(context, data_dict)
+
+    # If it's tabular (local OR remote), infer and store schema
+    if is_tabular(filename=resource['url']):
+        update_resource_schema = get_action('resource_table_schema_infer')(
+            context, {'resource_id': resource['id'], 'store_schema': True}
+        )
+        resource['schema'] = update_resource_schema['schema']
+
+    # Return resource
+    return resource
+
+
+def resource_file_update(id, resource_id):
+    # Get data from the request
+    data_dict = _get_data()
+
+    # Call resource_create
+    context = {
+        'user': g.user,
+    }
+    data_dict["package_id"] = id
+    resource = get_action("resource_update")(context, data_dict)
+
+    # If it's tabular (local OR remote), infer and store schema
+    if is_tabular(resource['url']):
+        resource_id = resource['id']
+        update_resource_schema = get_action('resource_table_schema_infer')(
+            context, {'resource_id': resource_id, 'store_schema': True}
+        )
+        resource['schema'] = update_resource_schema['schema']
+
+    # Return resource
+    return resource
+
+validation.add_url_rule(
+    "/dataset/<id>/resource/<resource_id>/file", view_func=resource_file_update, methods=["POST"]
+)
+
+validation.add_url_rule(
+    "/dataset/<id>/resource/file", view_func=resource_file_create, methods=["POST"]
+)
 
 validation.add_url_rule(
     "/dataset/<id>/resource/<resource_id>/validation", view_func=read

ckanext/validation/examples/ckan_default_schema.json

@@ -86,7 +86,8 @@
     {
       "field_name": "url",
       "label": "URL",
-      "preset": "resource_url_upload"
+      "preset": "resource_url_upload",
+      "form_snippet": "ckan_uploader.html"
     },
     {
       "field_name": "name",

ckanext/validation/helpers.py

@@ -1,9 +1,10 @@
 # encoding: utf-8
-import json
-
 from ckan.lib.helpers import url_for_static
-from ckantoolkit import url_for, _, config, asbool, literal, h
+from ckan import model
+from ckantoolkit import url_for, _, config, asbool, literal, h, request
 
+import json
+import re
 
 def get_validation_badge(resource, in_listing=False):
 
@@ -96,6 +97,32 @@ def bootstrap_version():
     else:
         return '2'
 
+def get_package_id_from_resource_url():
+    match = re.match("/dataset/(.*)/resource/", request.path)
+    if match:
+        return model.Package.get(match.group(1)).id
+    else:
+        return ''
+
+def get_resource_id_from_resource_url():
+    match = re.match("/dataset/(.*)/resource/(.*)/edit", request.path)
+    if match:
+        return model.Resource.get(match.group(2)).id
+    else:
+        return ''
+
+def get_url_type():
+    match = re.match("/dataset/(.*)/resource/(.*)/edit", request.path)
+    if match:
+        return model.Resource.get(match.group(2)).url_type
+
+def get_current_url():
+    match = re.match("/dataset/(.*)/resource/(.*)/edit", request.path)
+    if match:
+        return model.Resource.get(match.group(2)).url
+    else:
+        return ''
+
 
 def use_webassets():
     return int(h.ckan_version().split('.')[1]) >= 9