From 7ffa47e874c08339b17df01aca4a230c3fa3a9f9 Mon Sep 17 00:00:00 2001
From: Robert Barsch <barsch@egu.eu>
Date: Tue, 2 Apr 2013 14:54:10 +0200
Subject: [PATCH 1/3] adding readonly support for stores and files

---
 fileshack/models.py                      |  7 +++++++
 fileshack/static/fileshack/js/models.js  |  4 +++-
 fileshack/static/fileshack/js/views.js   |  3 +++
 fileshack/templates/fileshack/index.html |  2 ++
 fileshack/views.py                       | 11 +++++++----
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/fileshack/models.py b/fileshack/models.py
index 53ee21f..b503735 100644
--- a/fileshack/models.py
+++ b/fileshack/models.py
@@ -41,6 +41,7 @@ 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)
+    readonly = BooleanField(_("read only"), help_text=_("Set all files to read only. Uploading or deleting files is disabled."), default=False)
     
     def __unicode__(self):
         url = self.get_absolute_url()
@@ -72,6 +73,11 @@ class Item(Model):
     modified = DateTimeField(_("modified"), auto_now=True)
     size_total = IntegerField(_("size total"), default=0)
     size = IntegerField(_("size"), default=0)
+    readonly = BooleanField(_("read only"), default=False)
+    
+    @property
+    def is_readonly(self):
+        return self.store.readonly or self.readonly
     
     def delete(self):
         dir = os.path.dirname(os.path.join(settings.MEDIA_ROOT, self.fileobject.name))
@@ -132,6 +138,7 @@ def simple(self):
             "modified": self.modified,
             "created": self.created,
             "uploaded": self.uploaded,
+            "readonly": self.is_readonly,
         }
     
     def __unicode__(self):
diff --git a/fileshack/static/fileshack/js/models.js b/fileshack/static/fileshack/js/models.js
index 6ee9567..80e32f5 100644
--- a/fileshack/static/fileshack/js/models.js
+++ b/fileshack/static/fileshack/js/models.js
@@ -72,7 +72,8 @@ var Item = new Class({
         status: 'READY', // 'READY', 'UPLOADING', 'STALE'.
         created: new Date(),
         uploaded: new Date(),
-        modified: new Date()
+        modified: new Date(),
+        readonly: false,
     },
     
     initialize: function(attributes) {
@@ -98,6 +99,7 @@ var Item = new Class({
 	this.modified = new Date().parse(json.modified);
 	this.uploaded = new Date().parse(json.uploaded);
 	this.created = new Date().parse(json.created);
+	this.readonly = json.readonly;
 	
 	this.fireEvent('change');
     },
diff --git a/fileshack/static/fileshack/js/views.js b/fileshack/static/fileshack/js/views.js
index a048e36..a0d77c1 100644
--- a/fileshack/static/fileshack/js/views.js
+++ b/fileshack/static/fileshack/js/views.js
@@ -101,6 +101,9 @@ var ItemView = new Class({
 		this.progressbar.value = 1;
 	    updateProgress(this.progressbar);
 	}
+	if (this.model.readonly)
+	    this.deletebtn.hide();
+
 	var percentage = 0;
 	if (this.model.size > 0 && this.model.size_total > 0)
 	    percentage = Math.round((this.model.size * 100)/this.model.size_total);
diff --git a/fileshack/templates/fileshack/index.html b/fileshack/templates/fileshack/index.html
index 2dafbfa..1f47e62 100644
--- a/fileshack/templates/fileshack/index.html
+++ b/fileshack/templates/fileshack/index.html
@@ -59,6 +59,7 @@
 {% block content %}
     <div id="subcontainer">
 	<iframe src="iframe/" id="iframe" style="display: none"></iframe>
+	{% if not store.readonly %}
 	<form id="dropbox" action="/upload/" method="post" enctype="multipart/form-data">
 	    <span id="dropbox-text">{% trans "Drop your item in here or click" %}</span>
 	    <span id="dropbox-text-nodragndrop" style="display: none">{% trans "Click here to upload a file" %}</span>
@@ -68,6 +69,7 @@
 	    </div>
 	    <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
 	</form>
+	{% endif %}
 	<div id="list">
 	    <div id="bootstrap" style="display: none">
 		{{ bootstrap|escape }}
diff --git a/fileshack/views.py b/fileshack/views.py
index ad2fd61..d4f18a3 100644
--- a/fileshack/views.py
+++ b/fileshack/views.py
@@ -154,7 +154,7 @@ def iframe(request, store):
         c = RequestContext(request)
         return HttpResponse(t.render(c))  
     
-    if not request.FILES.has_key("file"):
+    if not request.FILES.has_key("file") or store.readonly is True:
         return HttpResponseForbidden()
     f = request.FILES["file"]
     
@@ -192,7 +192,8 @@ def iframe(request, store):
 @require_store
 @require_login
 def upload(request, store, id):
-    if request.method != "POST" or not request.FILES.has_key("file"):
+    if request.method != "POST" or not request.FILES.has_key("file") or \
+       store.readonly is True:
         data = {
             "status": "failed",
             "error_label": "Upload failed",
@@ -318,7 +319,8 @@ def upload(request, store, id):
 @require_store
 @require_login
 def simple_upload(request, store):
-    if request.method != "POST" or not request.FILES.has_key("file"):
+    if request.method != "POST" or not request.FILES.has_key("file") or \
+       store.readonly is True:
         return HttpResponseRedirect(store.get_absolute_url())
     
     #if store.item_limit and f.size > store.item_limit*1024*1024:
@@ -340,8 +342,9 @@ def delete(request, store, item_id):
         return HttpResponseForbidden()
         
     item = get_object_or_404(Item, pk=item_id, store=store)
+    if item.is_readonly:
+        return HttpResponseForbidden()
     item.delete()
-    
     return HttpResponse("Item has been deleted")
 
 @never_cache

From 67b47c4233392198eaf12f875dbf99c61f50a626 Mon Sep 17 00:00:00 2001
From: Robert Barsch <barsch@egu.eu>
Date: Tue, 2 Apr 2013 17:51:54 +0200
Subject: [PATCH 2/3] Fixes wrong file size after uploading files via Django
 backend

---
 fileshack/__init__.py |  3 +++
 fileshack/admin.py    |  2 +-
 fileshack/models.py   |  2 ++
 fileshack/signals.py  | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 fileshack/signals.py

diff --git a/fileshack/__init__.py b/fileshack/__init__.py
index e69de29..df1dec8 100644
--- a/fileshack/__init__.py
+++ b/fileshack/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import signals
\ No newline at end of file
diff --git a/fileshack/admin.py b/fileshack/admin.py
index 7ccbc33..cbc1256 100644
--- a/fileshack/admin.py
+++ b/fileshack/admin.py
@@ -5,7 +5,7 @@ class StoreAdmin(admin.ModelAdmin):
     list_display = ("__unicode__",)
 
 class ItemAdmin(admin.ModelAdmin):
-    pass
+    readonly_fields = ('created', 'size_total', 'size')
 
 admin.site.register(Store, StoreAdmin)
 admin.site.register(Item, ItemAdmin)
diff --git a/fileshack/models.py b/fileshack/models.py
index b503735..b806961 100644
--- a/fileshack/models.py
+++ b/fileshack/models.py
@@ -146,6 +146,8 @@ def __unicode__(self):
 
     class Meta:
         ordering = [('created')]
+        verbose_name = _("file")
+        verbose_name_plural = ("files")
 
 class User(Model):
     email = EmailField(_("e-mail"), max_length=254, unique=True)
diff --git a/fileshack/signals.py b/fileshack/signals.py
new file mode 100644
index 0000000..3535af1
--- /dev/null
+++ b/fileshack/signals.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from django.db.models.signals import pre_save
+from models import Item
+
+
+def set_file_size(sender, instance, **kwargs):  # @UnusedVariable
+    """
+    Automatic set file sizes after uploading.
+    """
+    if instance.fileobject._file is None:
+        # skip front-end uploads
+        return
+    # set sizes
+    instance.size = instance.fileobject._file.size
+    instance.size_total = instance.fileobject._file.size
+
+pre_save.connect(set_file_size, Item)

From 0b0e0279d2b5b13e6472c7b527b62be04faf066a Mon Sep 17 00:00:00 2001
From: FrancoAA <franco.alarcon@gmail.com>
Date: Wed, 2 Oct 2013 20:24:43 -0300
Subject: [PATCH 3/3] login/logout problem fixed

---
 fileshack/views.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fileshack/views.py b/fileshack/views.py
index d4f18a3..b8ceb46 100644
--- a/fileshack/views.py
+++ b/fileshack/views.py
@@ -100,6 +100,9 @@ def login_wrapper(request, *args, **kwargs):
 def logout(request, store):
     try:
         request.session["fileshack_stores"].remove(store.id)
+        # FIX: we should call session.save() because django session system doesn't track
+        # the changes made inside of the list
+        request.session.save()
     except (KeyError, ValueError):
         pass
     request.session.save()
@@ -117,7 +120,10 @@ def index(request, store):
                 if not request.session.has_key("fileshack_stores"):
                     request.session["fileshack_stores"] = [store.id]
                 else:
-                   request.session["fileshack_stores"].append(store.id)
+                    request.session["fileshack_stores"].append(store.id)
+                    # FIX: we should call session.save() because django session system doesn't track
+                    # the changes made inside of the list
+                    request.session.save()
                 return HttpResponseRedirect(store.get_absolute_url())
             else:
                 t = loader.get_template("fileshack/accesscode.html")