Merge branch 'master' of github.com:fmartingr/shelfzilla

gruntfile.coffee

@@ -119,9 +119,11 @@ module.exports = (grunt) ->
     ]
 
     grunt.registerTask 'compile', [
+      "bower",
       "less", "coffee", "concat", 'uglify', "clean:development"
     ]
 
     grunt.registerTask 'build', [
+      "bower",
       "less", "coffee", "concat", "uglify", 'clean:production'
     ]

shelfzilla/apps/manga/views/series.py

@@ -38,8 +38,7 @@ class SeriesListView(SeriesView):
         elif letter == 'all':
             result = Series.objects.all()
         elif letter == 'other':
-            # result = Series.objects.filter(name__regex=r'')
-            result = []
+            result = Series.objects.exclude(name__regex=r'^[a-zA-Z]')
 
         return result
 

shelfzilla/settings/base.py

@@ -168,3 +168,42 @@ THUMBNAIL_PROCESSORS = (
 
 COVER_FOLDER_PK = 1
 COVER_FOLDER_OWNER_PK = 1
+
+STORAGES = {
+    'public': {
+        'main': {
+            'ENGINE': 'django.core.files.storage.FileSystemStorage',
+            'OPTIONS': {},
+            'UPLOAD_TO': 'shelfzilla.utils.generate_randomized',
+            'UPLOAD_TO_PREFIX': 'public',
+        },
+        'thumbnails': {
+            'ENGINE': 'django.core.files.storage.FileSystemStorage',
+            'OPTIONS': {},
+            'THUMBNAIL_OPTIONS': {
+                'base_dir': 'public_thumbnails',
+            },
+        },
+    },
+    'private': {
+        'main': {
+            'ENGINE': 'filer.storage.PrivateFileSystemStorage',
+            'OPTIONS': {
+                'location': os.path.abspath(
+                    os.path.join(MEDIA_ROOT, '../smedia/private')),
+                'base_url': '/smedia/private/',
+            },
+            'UPLOAD_TO': 'shelfzilla.utils.generate_randomized',
+            'UPLOAD_TO_PREFIX': '',
+        },
+        'thumbnails': {
+            'ENGINE': 'filer.storage.PrivateFileSystemStorage',
+            'OPTIONS': {
+                'location': os.path.abspath(
+                    os.path.join(MEDIA_ROOT, '../smedia/private_thumbnails')),
+                'base_url': '/smedia/private_thumbnails/',
+            },
+            'THUMBNAIL_OPTIONS': {},
+        },
+    },
+}

shelfzilla/settings/production.py

@@ -0,0 +1,19 @@
+import os
+import dj_database_url
+from .base import *
+
+
+DEBUG = False
+TEMPLATE_DEBUG = False
+
+DATABASES = {
+    'default': dj_database_url.parse(os.environ['APP_DATABASE_URL'])
+}
+
+STATIC_ROOT = os.environ['APP_STATIC_ROOT']
+MEDIA_ROOT = os.environ['APP_MEDIA_ROOT']
+
+SECRET_KEY = os.environ['APP_SECRET_KEY']
+
+INTERNAL_IPS = environ['APP_INTERNAL_IPS'].split(',')
+ALLOWED_HOSTS = environ['APP_ALLOWED_HOSTS'].split(',')