Migration to Python 3 and Django 3.1

Author: peterkuma

LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2012 Peter Kuma
-   
+Copyright (c) 2012-2020 Peter Kuma
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

fileshack/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'fileshack.apps.Fileshack'

fileshack/admin.py

@@ -1,4 +1,4 @@
-from models import *
+from .models import *
 from django.contrib import admin
 
 class StoreAdmin(admin.ModelAdmin):

fileshack/apps.py

@@ -0,0 +1,16 @@
+from django.apps import AppConfig
+from django.db.models import signals
+
+def create_default_store(sender, app_config, verbosity, **kwargs):
+    # Only create the default sites in databases where Django created the table.
+    if verbosity >= 2:
+        print("Creating default Store object")
+    from .models import Store
+    Store().save()
+
+class Fileshack(AppConfig):
+    name = 'fileshack'
+    verbose_name = 'Fileshack'
+
+    def ready(self):
+        signals.post_migrate.connect(create_default_store, sender=self)

fileshack/management.py

@@ -1,15 +1,15 @@
-# Copyright (c) 2012 Peter Kuma
+# Copyright (c) 2012-2020 Peter Kuma
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,7 +22,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.storage import default_storage
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import os
 from random import choice
@@ -41,18 +41,18 @@ class Store(Model):
     protect_files = BooleanField(_("protect files"), help_text=_("Protect files by a random string, so that they cannot be downloaded by guessing their name."), default=True)
     allow_watch = BooleanField(_("allow watch"), help_text=_('Allow users to subscribe to receive e-mail updates. Requires cron (see <a href="http://fileshack.sourceforge.net/doc/#store-watching">documentation</a>).'), default=False)
     watch_delay = PositiveIntegerField(_("watch delay"), help_text=_("Minimum delay between two notifications in minutes. Only applies when <strong>Allow watch</strong> is enabled."), default=360)
-    
+
     def __unicode__(self):
         url = self.get_absolute_url()
         if url.startswith("/"):
             url = url[1:]
         return "default" if url == "" else url
-        
+
     def get_absolute_url(self):
         url = reverse("fileshack:index", kwargs=dict(store_path=self.path))
         if url.endswith("//"): url = url[:-1] # Ugly hack.
         return url
-        
+
     def total(self):
         if self.items.count() == 0: return 0
         return self.items.all().aggregate(Sum("size"))["size__sum"]
@@ -65,14 +65,18 @@ def item_upload_to(instance, filename):
     return os.path.join(instance.store.media, key, filename)
 
 class Item(Model):
-    store = ForeignKey(Store, verbose_name=_("store"), related_name="items")
+    store = ForeignKey(Store,
+        verbose_name=_("store"),
+        related_name="items",
+        on_delete=CASCADE
+    )
     fileobject = FileField(_("file"), upload_to=item_upload_to)
     created = DateTimeField(_("created"), auto_now_add=True)
     uploaded = DateTimeField(_("uploaded"), auto_now_add=True)
     modified = DateTimeField(_("modified"), auto_now=True)
     size_total = IntegerField(_("size total"), default=0)
     size = IntegerField(_("size"), default=0)
-    
+
     def delete(self):
         dir = os.path.dirname(os.path.join(settings.MEDIA_ROOT, self.fileobject.name))
         try: self.fileobject.delete()
@@ -81,7 +85,7 @@ def delete(self):
         except OSError: pass
         return Model.delete(self)
 
-    def status(self):   
+    def status(self):
         if self.size < self.size_total and dt.now(self.modified.tzinfo) - self.modified > timedelta(seconds=10):
             return 'STALE'
         elif self.size < self.size_total:
@@ -108,7 +112,7 @@ def name(self):
             return os.path.basename(self.fileobject.name)
         except (OSError,ValueError):
             return None
-    
+
     def size_human(self):
         size = self.size()
         for u in ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"):
@@ -120,7 +124,7 @@ def size_human(self):
             return u"%.0f %s" % (size, unit)
         else:
             return u"%.1f %s" % (size, unit)
-    
+
     def simple(self):
         return {
             "id": self.id,
@@ -133,7 +137,7 @@ def simple(self):
             "created": self.created,
             "uploaded": self.uploaded,
         }
-    
+
     def __unicode__(self):
         return self.name()
 
@@ -163,19 +167,27 @@ class Meta:
 
 
 class Watcher(Model):
-    user = ForeignKey(User, verbose_name=_("user"), related_name="watchers")
-    store = ForeignKey(Store, verbose_name=_("store"), related_name="watchers")
+    user = ForeignKey(User,
+        verbose_name=_("user"),
+        related_name="watchers",
+        on_delete=CASCADE
+    )
+    store = ForeignKey(Store,
+        verbose_name=_("store"),
+        related_name="watchers",
+        on_delete=CASCADE
+    )
     created = DateTimeField(_("created"), auto_now_add=True)
     modified = DateTimeField(_("modified"), auto_now=True)
-    
+
     def simple(self):
         return {
             "id": self.id,
             "email": self.user.email,
             "last_notification": self.user.last_notification,
             "created": self.created,
         }
-    
+
     class Meta:
         verbose_name = _("watcher")
         verbose_name_plural = _("watchers")

fileshack/models.py

@@ -1,4 +1,4 @@
-from urlparse import urljoin
+from urllib.parse import urljoin
 from django import template
 from django.conf import settings
 

fileshack/templatetags/staticfiles.py

@@ -1,18 +1,21 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import include, url
+from fileshack.views import *
 
-urlpatterns = patterns('fileshack.views',
-    url(r'^cron/$', 'cron', name='cron'),
-    url(r'^unsubscribe/$', 'unsubscribe', name='unsubscribe'),
-    url(r'^(?P<store_path>.*)logout/$', 'logout'),
-    url(r'^(?P<store_path>.*)iframe/$', 'iframe'),
-    url(r'^(?P<store_path>.*)upload/$', 'simple_upload'),
-    url(r'^(?P<store_path>.*)upload/(?P<id>[^/]+)/$', 'upload'),
-    url(r'^(?P<store_path>.*)delete/(?P<item_id>[0-9]+)/$', 'delete'),
-    url(r'^(?P<store_path>.*)download/(?P<item_id>[0-9]+)/$', 'download', name='download'),
-    url(r'^(?P<store_path>.*)update/$', 'update'),
-    url(r'^(?P<store_path>.*)update/(?P<since>[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}:[0-9]{2}:[0-9]{2})/$', 'update'),
-    url(r'^(?P<store_path>.*)unwatch/$', 'unwatch'),
-    url(r'^(?P<store_path>.*)watch/$', 'watch'),
-    url(r'^(?P<store_path>.*)/$', 'index', name='index'),
-    url(r'^(?P<store_path>)$', 'index'),
-)
+app_name = 'fileshack'
+
+urlpatterns = [
+    url(r'^cron/$', cron, name='cron'),
+    url(r'^unsubscribe/$', unsubscribe, name='unsubscribe'),
+    url(r'^(?P<store_path>.*)logout/$', logout),
+    url(r'^(?P<store_path>.*)iframe/$', iframe),
+    url(r'^(?P<store_path>.*)upload/$', simple_upload),
+    url(r'^(?P<store_path>.*)upload/(?P<id>[^/]+)/$', upload),
+    url(r'^(?P<store_path>.*)delete/(?P<item_id>[0-9]+)/$', delete),
+    url(r'^(?P<store_path>.*)download/(?P<item_id>[0-9]+)/$', download, name='download'),
+    url(r'^(?P<store_path>.*)update/$', update),
+    url(r'^(?P<store_path>.*)update/(?P<since>[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}:[0-9]{2}:[0-9]{2})/$', update),
+    url(r'^(?P<store_path>.*)unwatch/$', unwatch),
+    url(r'^(?P<store_path>.*)watch/$', watch),
+    url(r'^(?P<store_path>.*)/$', index, name='index'),
+    url(r'^(?P<store_path>)$', index),
+]