Czytanie plików PNG a nie JPG w galerii.

[redakcja.git] / apps / explorer / models.py

diff --git a/apps/explorer/models.py b/apps/explorer/models.py
index 10491f6..e104cda 100644 (file)
--- a/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 import os
 
 from django.db import models
@@ -5,44 +6,66 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
+import toolbar.models
 
-class PanelSettings(models.Model):
-    user = models.ForeignKey(User)
-    left_panel = models.CharField(blank=True,  max_length=80)
-    right_panel = models.CharField(blank=True,  max_length=80)
+from explorer import fields
 
+class EditorSettings(models.Model):
+    """Ustawienia edytora dla użytkownika.
+    
+    Pole settings zawiera obiekt JSON o  kluczach:
+     - panels - lista otwartych paneli i ich proporcje
+     - recentFiles - lista otwartych plików i ustawienia dla nich
+    
+    Przykład:
+    {
+        'panels': [
+            {'name': 'htmleditor',
+            'ratio': 0.5},
+            {'name': 'gallery', 'ratio': 0.5}
+        ],
+        'recentFiles': [
+            {
+                'fileId': 'mickiewicz_pan_tadeusz.xml',
+                'panels': [
+                    {'name': 'htmleditor', 'ratio': 0.4},
+                    {'name': 'gallery', 'ratio': 0.6}
+                ]
+            }
+        ]
+    }
+    """
+    user = models.ForeignKey(User, unique=True)
+    settings = fields.JSONField()
+    
     class Meta:
-        ordering = ['user__name']
-        verbose_name, verbose_name_plural = _("panel settings"), _("panel settings")
+        verbose_name, verbose_name_plural = _("editor settings"), _("editor settings")
 
     def __unicode__(self):
-        return u"Panel settings for %s" % self.user.name
-
+        return u"Editor settings for %s" % self.user.username
 
-class PullRequest(models.Model):
-    comitter = models.ForeignKey(User) # the user who request the pull 
-    file = models.CharField(max_length=256) # the file to request
-    source_rev = models.CharField(max_length=40) # revision number of the commiter
+class EditorPanel(models.Model):
+    id = models.CharField(max_length=24, primary_key=True)
+    display_name = models.CharField(max_length=128)
 
-    comment = models.TextField() # addtional comments to the request
+    toolbar_groups = models.ManyToManyField(toolbar.models.ButtonGroup, blank=True)
+    toolbar_extra = models.ForeignKey(toolbar.models.ButtonGroup, null=True, blank=True,
+        unique=True, related_name='main_editor_panels')
 
-    # revision number in which the changes were merged (if any)
-    merged_rev = models.CharField(max_length=40, null=True) 
-    
     def __unicode__(self):
-        return u"Pull request from %s, source: %s %s, status: %s." % \
-            (self.commiter, self.file, self.source_rev, \
-                (("merged into "+self.merged_rev) if self.merged_rev else "pending") )
+        return self.display_name
+  
 
-    
-def get_image_folders():
-    return sorted(fn for fn in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR)) if not fn.startswith('.'))
+# Yes, this is intentionally unnormalized !
+class GalleryForDocument(models.Model):
+    name = models.CharField(max_length=100, blank=True)
 
+    # document associated with the gallery
+    document = models.CharField(max_length=255, unique=True)
+        
+    # directory containing scans under MEDIA_ROOT/
+    subpath = models.CharField(max_length=255)
 
-def get_images_from_folder(folder):
-    return sorted(settings.MEDIA_URL + settings.IMAGE_DIR + '/' + folder + '/' + fn for fn 
-            in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
-            if not fn.startswith('.'))
+    def __unicode__(self):
+        return u"%s:%s" % (self.subpath, self.document)
 
-def user_branch(user):
-    return 'personal_'+user.username