add item and collection code regex parameters, set FILE_UPLOAD_TEMP_DIR inside media

diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py
index 67eb775177f405b71b12e038841efc3b034bd52c..d86be7123fdadf3eab8926b76f336c2cec7dd914 100644 (file)
--- a/app/sandbox/settings.py
+++ b/app/sandbox/settings.py
@@ -194,6 +194,8 @@ TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RR
 TELEMETA_CACHE_DIR = os.path.join(MEDIA_ROOT, 'cache')
 TELEMETA_EXPORT_CACHE_DIR = os.path.join(MEDIA_ROOT, 'export')
 TELEMETA_DATA_CACHE_DIR = os.path.join(TELEMETA_CACHE_DIR, 'data')
+FILE_UPLOAD_TEMP_DIR = os.path.join(MEDIA_ROOT, 'tmp')
+FILE_UPLOAD_PERMISSIONS = 0644
 
 TELEMETA_DOWNLOAD_ENABLED = True
 TELEMETA_STREAMING_FORMATS = ('mp3', 'ogg')
@@ -201,6 +203,10 @@ TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'ogg', 'flac')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51
 
 TELEMETA_STRICT_CODE = False
+COLLECTION_PUBLISHED_CODE_REGEX = '*'
+COLLECTION_UNPUBLISHED_CODE_REGEX = '*'
+ITEM_PUBLISHED_CODE_REGEX = COLLECTION_PUBLISHED_CODE_REGEX + ''
+ITEM_UNPUBLISHED_CODE_REGEX = COLLECTION_UNPUBLISHED_CODE_REGEX + ''
 
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False

diff --git a/telemeta/models/item.py b/telemeta/models/item.py
index da1c3e0b83ae3a14ff530e5cad7fa964914dc950..b774ec3de30455d717700c27a98eb350f7dd899e 100644 (file)
--- a/telemeta/models/item.py
+++ b/telemeta/models/item.py
@@ -48,10 +48,6 @@ from telemeta.models.enum import *
 item_published_code_regex = getattr(settings, 'ITEM_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
 item_unpublished_code_regex = getattr(settings, 'ITEM_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*')
 
-# CREM
-# item_published_code_regex    = collection_published_code_regex + '(?:_[0-9]{2,3}){1,2}'
-# item_unpublished_code_regex  = collection_unpublished_code_regex + '_[0-9]{2,3}(?:_[0-9]{2,3}){0,2}'
-
 item_code_regex = '(?:%s|%s)' % (item_published_code_regex, item_unpublished_code_regex)
 
 ITEM_PUBLIC_ACCESS_CHOICES = (('none', _('none')), ('metadata', _('metadata')),

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index badd05858cd525280d90c2715402c96fa08eb700..0ea75b39b0a3fce12bf9b65be7234ab1aaaa419d 100644 (file)
--- a/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@ -100,6 +100,7 @@ class TelemetaBaseMixin(object):
 
     cache_data = TelemetaCache(settings.TELEMETA_DATA_CACHE_DIR)
     cache_export = TelemetaCache(settings.TELEMETA_EXPORT_CACHE_DIR)
+    cache_tmp = TelemetaCache(settings.FILE_UPLOAD_TEMP_DIR)
 
 
 class FixedFileWrapper(FileWrapper):

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 586d9bf1859c0b763ae088947997bff32a40049d..d0d7e5a99278905d5cb5cff917c0c6c314927d2c 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -181,8 +181,6 @@ class ItemView(ItemBaseMixin):
         media = get_object_or_404(MediaItemRelated, item=item, id=media_id)
         if media.file:
             response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type)
-            filename = media.file.path.split(os.sep)[-1]
-            response = StreamingHttpResponse(stream_from_file(media.file.path), content_type=media.mime_type)
         else:
             raise Http404
         return response