renamed extention

Author: ThHanke

.github/workflows/pypi.yml

@@ -51,7 +51,7 @@ jobs:
       #
       # ALTERNATIVE: if your GitHub Release name is the PyPI project version string
       # ALTERNATIVE: exactly, uncomment the following line instead:
-      url: https://pypi.org/project/${GITHUB_REPOSITORY#*/}-addon/${{ github.event.release.name }}
+      url: https://pypi.org/project/${GITHUB_REPOSITORY#*/}/${{ github.event.release.name }}
 
     steps:
       - name: Retrieve release distributions
@@ -88,7 +88,7 @@ jobs:
 
     environment:
       name: testpypi
-      url: https://test.pypi.org/p/${GITHUB_REPOSITORY#*/}-addon
+      url: https://test.pypi.org/p/${GITHUB_REPOSITORY#*/}
 
     permissions:
       id-token: write  # IMPORTANT: mandatory for trusted publishing

.github/workflows/test.yml

@@ -68,7 +68,7 @@ jobs:
       run: |
         ckan -c test.ini db init
     - name: Run tests
-      run: pytest --ckan-ini=test.ini --cov=ckanext.multiuploader --disable-warnings ckanext/multiuploader || ([ $? = 5 ] && exit 0 || exit $?)
+      run: pytest --ckan-ini=test.ini --cov=ckanext.multiuploadform --disable-warnings ckanext/multiuploadform || ([ $? = 5 ] && exit 0 || exit $?)
     - name: Upload coverage report to codecov
       uses: codecov/codecov-action@v1
       with:

MANIFEST.in

@@ -1,4 +1,4 @@
 include README.rst
 include LICENSE
 include requirements.txt
-recursive-include ckanext/multiuploader *.html *.json *.js *.less *.css *.mo
+recursive-include ckanext/multiuploadform *.html *.json *.js *.less *.css *.mo

README.md

@@ -1,6 +1,6 @@
-[![Tests](https://github.com/Mat-O-Lab/ckanext-multiuploader/actions/workflows/test.yml/badge.svg)](https://github.com/Mat-O-Lab/ckanext-multiuploader/actions/workflows/test.yml)
+[![Tests](https://github.com/Mat-O-Lab/ckanext-multiuploadform/actions/workflows/test.yml/badge.svg)](https://github.com/Mat-O-Lab/ckanext-multiuploadform/actions/workflows/test.yml)
 
-# ckanext-multiuploader-addon
+# ckanext-multiuploadform
 
 This CKAN extension helps users to upload multiple resources at once with drag&drop. It adds an extra form for uploadig multiple files and leaves the vanilla one untouched. 
 
@@ -31,9 +31,9 @@ To install the extension:
 ```
 2. Use pip to install package
 ```bash
-pip install ckanext-multiuploader-addon
+pip install ckanext-multiuploadform
 ```
-3. Add `multiuploader` to the `ckan.plugins` setting in your CKAN
+3. Add `multiuploadform` to the `ckan.plugins` setting in your CKAN
    config file (by default the config file is located at
    `/etc/ckan/default/ckan.ini`).
 
@@ -51,11 +51,11 @@ ckan.max_resource_size
 
 ## Developer installation
 
-To install ckanext-multiuploader-addon for development, activate your CKAN virtualenv and
+To install ckanext-multiuploadform for development, activate your CKAN virtualenv and
 do:
 ```bash
-git clone https://github.com/Mat-O-Lab/ckanext-multiuploader.git
-cd ckanext-multiuploader
+git clone https://github.com/Mat-O-Lab/ckanext-multiuploadform.git
+cd ckanext-multiuploadform
 python setup.py develop
 pip install -r dev-requirements.txt
 ```
@@ -68,4 +68,4 @@ pytest --ckan-ini=test.ini
 ```
 
 # Acknowledgments
-The authors would like to thank the developers of the original project https://github.com/TIBHannover/ckanext-multiuploader.
+The authors would like to thank the developers of the original project https://github.com/TIBHannover/ckanext-multiuploadform.

ckanext/multiuploader/controllers.py

@@ -2,7 +2,7 @@
 
 from flask import request
 import ckan.lib.helpers as h
-from ckanext.multiuploader.lib import Helper
+from ckanext.multiuploadform.lib import Helper
 import ckan.plugins.toolkit as toolkit
 log = __import__("logging").getLogger(__name__)
 

ckanext/multiuploader/plugin.py

@@ -2,11 +2,11 @@
 
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as toolkit
-from ckanext.multiuploader.controllers import UploadController
-from ckanext.multiuploader import views
+from ckanext.multiuploadform.controllers import UploadController
+from ckanext.multiuploadform import views
 
 
-class MultiuploaderPlugin(plugins.SingletonPlugin):
+class multiuploadformPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IConfigurer)
     plugins.implements(plugins.IBlueprint)
     plugins.implements(plugins.ITemplateHelpers)
@@ -16,8 +16,8 @@ class MultiuploaderPlugin(plugins.SingletonPlugin):
     def update_config(self, config_):
         toolkit.add_template_directory(config_, "templates")
         toolkit.add_public_directory(config_, "public")
-        toolkit.add_resource("fanstatic", "multiuploader")
-        toolkit.add_resource("public/statics", "ckanext-multiuploader")
+        toolkit.add_resource("fanstatic", "multiuploadform")
+        toolkit.add_resource("public/statics", "ckanext-multiuploadform")
 
     # IBlueprint
 

ckanext/multiuploader/public/statics/webassets.yml

@@ -1,11 +1,11 @@
 my-css:
-  output: ckanext-multiuploader/%(version)s_my.css
+  output: ckanext-multiuploadform/%(version)s_my.css
   contents:
     - multi_uploader.css
 
 
 my-js:  
-  output: ckanext-multiuploader/%(version)s_my.js
+  output: ckanext-multiuploadform/%(version)s_my.js
   extra:
     preload:
       - base/main

ckanext/multiuploader/templates/multiuploader/snippets/multiupload_form.html

@@ -1,13 +1,13 @@
-{% asset 'ckanext-multiuploader/my-css' %}
-{% asset 'ckanext-multiuploader/my-js' %}
+{% asset 'ckanext-multiuploadform/my-css' %}
+{% asset 'ckanext-multiuploadform/my-js' %}
 
 
 {% import 'macros/form.html' as form %}
 
 {% set data = data or {} %}
 {% set errors = errors or {} %}
-{% set action = h.url_for('multiuploader.upload_resources', _external=True) %}
-{% set cancelUrl = h.url_for('multiuploader.delete_uploaded_resources', _external=True) %}
+{% set action = h.url_for('multiuploadform.upload_resources', _external=True) %}
+{% set cancelUrl = h.url_for('multiuploadform.delete_uploaded_resources', _external=True) %}
 
 <input type="hidden" value="{{action}}" id="dest_url">
 <input type="hidden" value="{{cancelUrl}}" id="cancel_upload_url">
@@ -19,7 +19,7 @@
 <div class="alert alert-danger" id="file-danger-size">
     {{_('Please check your file(s) size. Each file has to be less than ' ) + h.get_max_upload_size() + ' GB'}}
 </div>
-{% snippet 'multiuploader/snippets/progress_bar_modal.html' %}
+{% snippet 'multiuploadform/snippets/progress_bar_modal.html' %}
 
 <form id="resource-edit" class="dataset-form dataset-resource-form" method="post" action=""
     data-module="basic-form resource-form" enctype="multipart/form-data">
@@ -122,7 +122,7 @@
 
         {% if stage %}
         {% block save_button %}
-        <button id="ckanext_multiuploader_finish" class="btn btn-primary" name="Csave" value="go-metadata"
+        <button id="ckanext_multiuploadform_finish" class="btn btn-primary" name="Csave" value="go-metadata"
             type="submit">{% block save_button_text %}{{ _('Finish') }}{% endblock %}</button>
         {% endblock %}
         {% else %}

ckanext/multiuploader/templates/package/new_resource.html

@@ -10,7 +10,7 @@
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
         {{ h.build_nav_icon('resource.new', _('Add single'), id=pkg.name, icon='plus') }}
-        {{ h.build_nav_icon('multiuploader.resource_view', _('Multi Upload'), id=pkg.name, icon='upload') }}
+        {{ h.build_nav_icon('multiuploadform.resource_view', _('Multi Upload'), id=pkg.name, icon='upload') }}
         {% endblock %}
     </ul>
 </header>

ckanext/multiuploader/templates/package/new_resource_not_draft.html

@@ -2,7 +2,7 @@
 
 {% block content_primary_nav %}
 {{ super() }}
-{{ h.build_nav_icon('multiuploader.resource_view', _('Multi Upload'), id=pkg.name, icon='upload') }}
+{{ h.build_nav_icon('multiuploadform.resource_view', _('Multi Upload'), id=pkg.name, icon='upload') }}
 <script>
     document.addEventListener('DOMContentLoaded', function () {
         // Replace the button with id "replace-button" after the content is loaded