file upload is almost working

Author: Patrick Sandiford

project/urls.py

@@ -4,17 +4,18 @@
 from django.contrib.auth import views as auth_views
 
 from welcome.views import index, health
-from swift_browser.views import container, containers, create_container, delete_container
+from swift_browser.views import container, containers, create_container, delete_container, upload
 
 urlpatterns = [
     url(r'^$', containers, name='containers'),
     url(r'^accounts/login/$', auth_views.login, name='login'),
     url(r'^logout/$', auth_views.logout, {'next_page': '/accounts/login'}, name='logout'),
     url(r'^health$', health),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^container/create/$', create_container, name='create_container'),
-    url(r'^container/delete/$', delete_container, name='delete_container'),
-    url(r'^container/view/$', container, name='container'),
+    url(r'^create_container/$', create_container, name='create_container'),
+    url(r'^delete_container/$', delete_container, name='delete_container'),
+    url(r'^view_container/$', container, name='container'),
+    url(r'^upload/$', upload, name='upload'),
 ]
 
 if settings.DEBUG:

swift_browser/forms.py

@@ -36,22 +36,6 @@ def validate(self, value):
         super().validate(value)
 
 
-class SubDirectoryField(forms.CharField):
-    """
-    A Subdirectory field is an object name with '/' characters to delimit
-    the path
-    """
-    def __init__(self, *args, **kwargs):
-        kwargs['max_length'] = 1024
-        super().__init__(**kwargs)
-
-    def to_python(self, value):
-        return super().to_python(value)
-
-    def validate(self, value):
-        super().validate(value)
-
-
 class CreateContainerForm(forms.Form):
     """ Simple form for container creation """
     container = ContainerNameField(label='Container Name')
@@ -66,8 +50,3 @@ class UploadFileForm(forms.Form):
     object_name = ObjectNameField(label='Object Name')
     container = ContainerNameField(label='Container')
 
-class ViewContainerForm(forms.Form):
-    """ Form used to view the contents of a container """
-    container = ContainerNameField(widget=forms.HiddenInput())
-    subdir = SubDirectoryField(required=False, widget=forms.HiddenInput())
-

swift_browser/templates/container.html

@@ -34,7 +34,7 @@
                     </button>
 
                     <ul class="dropdown-menu">
-                        <li>Upload</li>
+                        <li><a href="{% url 'upload' %}?container={{container}}&subdir={{upload_subdir}}">Upload</a></li>
                         <li class="divider" />
                         <li>Create Pseudofolder </li>
                     </ul>
@@ -76,7 +76,7 @@
         <tbody>
             <tr>
                 <th colspan="5" class="center">
-                    <strong><center>There are no objects in this container yet. Upload new objects by clicking the red button.<center></strong>
+                    <strong><center>There are no objects in this container yet. Upload new objects by clicking the plus button.<center></strong>
                 </th>
             </tr>
         </tbody>

swift_browser/templates/upload_file.html

@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+{% load bootstrap3 %}
+{% block content %}
+
+<div class="container">
+
+        <ul class="breadcrumb">
+            <li><a href="{% url 'containers' %}">Containers</a></li> 
+            <li>
+                <a href="{% url 'container' %}?container={{container}}">{{container}}</a>
+            </li>
+
+            {% for path_entry in path %}
+                <li>
+                    <a href="{% url 'container' %}?container={{container}}&subdir={{path_entry.subdir}}">{{path_entry.path_element}}</a>
+                </li>
+            {% endfor %}
+
+       </ul> 
+
+<form method="POST" action="{% url 'upload' %}" enctype="multipart/form-data">
+    {% csrf_token %}
+    {% bootstrap_form form%}
+    {% bootstrap_button 'Upload' icon='upload' button_type='submit' %}
+</form>
+
+    {% block jsadd %}
+    <script type="text/javascript">
+        $('input[id=id_file]').change(function() {
+            var file_name = $(this)[0].files[0].name;
+            var path = '{{subdir}}' + file_name;
+            $('input[id=id_object_name]').val(path);
+        });
+    </script>
+    {% endblock %}
+
+{% endblock %}
+

swift_browser/views.py

@@ -8,7 +8,7 @@
 from swiftclient import client
 import logging
 
-from .forms import CreateContainerForm, UploadFileForm, ViewContainerForm
+from .forms import CreateContainerForm, UploadFileForm
 
 logger = logging.getLogger(__name__)
 
@@ -22,44 +22,6 @@ def replace_hyphens(olddict):
         newdict[key] = value
     return newdict
 
-def prefix_list(prefix):
-    prefixes = []
-
-    if prefix:
-        elements = prefix.split('/')
-        elements = filter(None, elements)
-        prefix = ""
-        for element in elements:
-            prefix += element + '/'
-            prefixes.append({'display_name': element, 'full_name': prefix})
-
-    return prefixes
-
-def pseudofolder_object_list(objects, prefix):
-    pseudofolders = []
-    objs = []
-
-    duplist = []
-
-    for obj in objects:
-        # Rackspace Cloudfiles uses application/directory
-        # Cyberduck uses application/x-directory
-        if obj.get('content_type', None) in ('application/directory',
-                                             'application/x-directory'):
-            obj['subdir'] = obj['name']
-
-        if 'subdir' in obj:
-            # make sure that there is a single slash at the end
-            # Cyberduck appends a slash to the name of a pseudofolder
-            entry = obj['subdir'].strip('/') + '/'
-            if entry != prefix and entry not in duplist:
-                duplist.append(entry)
-                pseudofolders.append((entry, obj['subdir']))
-        else:
-            objs.append(obj)
-
-    return (pseudofolders, objs)
-
 @login_required
 def containers(request):
     if 'auth_token' not in request.session.keys():
@@ -162,6 +124,7 @@ def container(request, container=None):
         return render(request, "container.html", {
             'container': container,
             'subdirs': subdirs,
+            'upload_subdir': subdir,
             'folder_objects': folder_objects,
             'account': account,
             'public': public,
@@ -221,21 +184,45 @@ def upload(request):
     auth_token = request.session['auth_token']
     storage_url = request.session['storage_url']
 
+    container = ''
+    subdir = ''
+    if 'container' in request.GET.keys():
+        container = request.GET['container']
+    if 'subdir' in request.GET.keys():
+        subdir = request.GET['subdir']
+
+    path = list()
+    if subdir:
+        current_path = ''
+        for path_element in subdir.split('/'):
+            if path_element:
+                current_path += "%s/" % (path_element)
+                path.append({ 'subdir': current_path, 'path_element': path_element })
+
     if request.method == 'POST':
-        form = UploadFileForm(request.POST)
+        form = UploadFileForm(request.POST, request.FILES)
         if form.is_valid():
-            container = form.cleaned_data['container_name']
+            container = form.cleaned_data['container']
+            object_name = form.cleaned_data['object_name']
+            upload_file = request.FILES['file']
+            logger.info("File upload for /%s/%s" % (container, object_name))
             try:
                 http_conn = (urlparse(storage_url),
                              client.HTTPConnection(storage_url, insecure=settings.SWIFT_SSL_INSECURE))
-                client.put_container(storage_url, auth_token, container, http_conn=http_conn)
-                messages.add_message(request, messages.INFO, "Container created.")
+                client.put_object(storage_url, auth_token,
+                        container, object_name, http_conn=http_conn)
+                messages.add_message(request, messages.INFO, "File uploaded.")
             except client.ClientException:
                 messages.add_message(request, messages.ERROR, "Access denied.")
 
             return redirect(containers)
     else:
-        form = CreateContainerForm()
+        form = UploadFileForm(initial={'container': container, 'object_name': subdir})
 
-    return render(request, 'create_container.html', {'form': form})
+    return render(request, 'upload_file.html', {
+            'form': form,
+            'path': path,
+            'container': container,
+            'subdir': subdir,
+        })