[#2510] Uploader class selection centralised

ckan/lib/uploader.py

@@ -2,10 +2,11 @@
 import cgi
 import pylons
 import datetime
-import ckan.lib.munge as munge
 import logging
-import ckan.logic as logic
 
+import ckan.lib.munge as munge
+import ckan.logic as logic
+import ckan.plugins as plugins
 
 config = pylons.config
 log = logging.getLogger(__name__)
@@ -15,6 +16,19 @@
 _max_image_size = None
 
 
+def get_uploader(data_dict):
+    '''Queries IUploader plugins and returns an uploader instance.'''
+    upload = None
+    for plugin in plugins.PluginImplementations(plugins.IUploader):
+        upload = plugin.get_uploader(data_dict)
+
+    # default uploader
+    if upload is None:
+        upload = ResourceUpload(data_dict)
+
+    return upload
+
+
 def get_storage_path():
     '''Function to cache storage path'''
     global _storage_path

ckan/logic/action/create.py

@@ -295,13 +295,7 @@ def resource_create(context, data_dict):
     if not 'resources' in pkg_dict:
         pkg_dict['resources'] = []
 
-    upload = None
-    for plugin in plugins.PluginImplementations(plugins.IUploader):
-        upload = plugin.get_uploader(data_dict)
-
-    # default uploader
-    if upload is None:
-        upload = uploader.ResourceUpload(data_dict)
+    upload = uploader.get_uploader(data_dict)
 
     pkg_dict['resources'].append(data_dict)
 

ckan/logic/action/update.py

@@ -148,13 +148,7 @@ def resource_update(context, data_dict):
     for plugin in plugins.PluginImplementations(plugins.IResourceController):
         plugin.before_update(context, pkg_dict['resources'][n], data_dict)
 
-    upload = None
-    for plugin in plugins.PluginImplementations(plugins.IUploader):
-        upload = plugin.get_uploader(data_dict)
-
-    # default uploader
-    if upload is None:
-        upload = uploader.ResourceUpload(data_dict)
+    upload = uploader.get_uploader(data_dict)
 
     pkg_dict['resources'][n] = data_dict