[upload,api][xs]: remove use of ${filename} (see comments in file) an…

…d fix up routing for api.

ckanext/storage/__init__.py

@@ -13,9 +13,9 @@ class Storage(SingletonPlugin):
     def after_map(self, route_map):
         c = "ckanext.storage.controller:StorageAPIController"
         route_map.connect('storage_api', "/api/storage", controller=c, action="index")
-        route_map.connect("/api/storage/metadata/{label}", controller=c, action="set_metadata",
+        route_map.connect("/api/storage/metadata/{label:.*}", controller=c, action="set_metadata",
                           conditions={"method": ["PUT", "POST"]})
-        route_map.connect("/api/storage/metadata/{label}", controller=c, action="get_metadata",
+        route_map.connect("/api/storage/metadata/{label:.*}", controller=c, action="get_metadata",
                           conditions={"method": ["GET"]})
         route_map.connect('storage_api_auth_request',
                 "/api/storage/auth/request/{label:.*}",

ckanext/storage/controller.py

@@ -261,7 +261,11 @@ def index(self):
             h.flash_error('Not authorized to upload files.')
             abort(401)
 
-        label = key_prefix + request.params.get('filepath', str(uuid.uuid4())) #  + '/$filename'
+        label = key_prefix + request.params.get('filepath', str(uuid.uuid4()))
+        # would be nice to use filename of file
+        # problem is 'we' don't know this at this point and cannot add it to
+        # success_action_redirect and hence cannnot display to user afterwards
+        # + '/${filename}'
         content_length_range = int(
                 config.get('ckanext.upload.max_content_length',
                     50000000))