Merge pull request #2 from tinpan-io/dev

Dev

Author: mystery-house

README.rst

@@ -31,6 +31,8 @@ Next, add busker's URLs to your Django project's main ``urls.py`` module::
 
 (The first argument to ``path()`` can be whatever you like, but make sure ``namespace`` is set to ``'busker'``.
 
+For uploaded images to display correctly you also will need ``MEDIA_ROOT`` and ``MEDIA_URL`` configured in your ``settings.py`` module. (See <https://docs.djangoproject.com/en/3.1/howto/static-files/> for a way to tweak your project ``urls.py`` to serve media when developing locally.)
+
 Finally, in the terminal, run busker's migrations from the top level of the Django project::
 
   python manage.my migrate busker

busker/models.py

@@ -4,7 +4,6 @@
 from uuid import uuid4
 
 from django.contrib.auth.models import User
-from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -111,7 +110,7 @@ def filename(self):
         return os.path.basename(self.file.name)
 
     def __str__(self):
-        return self.file.name
+        return os.path.basename(self.file.name)
 
 
 class Batch(BuskerModel):

busker/views.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+import os
 from secrets import token_hex
 
 from django.http import HttpResponse, Http404
@@ -58,8 +59,9 @@ def form_valid(self, form):
 
 
 class DownloadView(View):
-    # TODO document requirement of 'django.core.context_processors.request' middleware
-
+    """
+    Handles the actual downloading of files.
+    """
     def get(self, request, *args, **kwargs):
         if 'busker_download_token' not in request.session \
                 or request.GET.get('t') != request.session['busker_download_token']:
@@ -68,9 +70,10 @@ def get(self, request, *args, **kwargs):
 
         file = File.objects.get(id=kwargs['file_id'])
         mime = magic.Magic(mime=True)
+        filename = os.path.basename(file.file.path)
 
         response = HttpResponse(file.file, content_type=mime.from_file(file.file.path))
-        response['Content-Disposition'] = f'attachment; filename="{file.file.name}"'
+        response['Content-Disposition'] = f'attachment; filename="{filename}"'
         response['Content-Length'] = file.file.size
         return response
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = django-busker
-version = 0.5.0
+version = 0.5.1
 description = A Django app to manage download codes for digital assets.
 long_description = file: README.rst
 url = https://github.com/tinpan-io/django-busker
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Topic :: Internet :: WWW/HTTP
     Topic :: Internet :: WWW/HTTP :: Dynamic Content
+    Topic :: Multimedia
 
 [options]
 include_package_data = true

setup.py

@@ -3,6 +3,7 @@
 setup(
     install_requires=[
         'python-magic==0.4.18',
+        'Pillow==7.2.0',
         'django-markdownfield==0.8.0',
         'django-queryset-csv==1.1.0',
         'django-imagekit==4.0.2',