-
- {% if file.is_image %}
- 
- {% else %}
- {{ file.thumb }}
+
+
+ {% if file.visible_filename %}
+ {{ file.visible_filename }}
{% endif %}
diff --git a/ckeditor/utils.py b/ckeditor/utils.py
index c37361a..5fb965e 100644
--- a/ckeditor/utils.py
+++ b/ckeditor/utils.py
@@ -1,12 +1,26 @@
import mimetypes
import os.path
import random
+import re
import string
+from django.conf import settings
from django.core.files.storage import default_storage
from django.template.defaultfilters import slugify
+# Non-image file icons, matched from top to bottom
+fileicons_path = '{}/file-icons/'.format(getattr(settings, 'CKEDITOR_FILEICONS_PATH', '/static/ckeditor'))
+CKEDITOR_FILEICONS = getattr(settings, 'CKEDITOR_FILEICONS', [
+ ('\.pdf$', fileicons_path + 'pdf.png'),
+ ('\.doc$|\.docx$|\.odt$', fileicons_path + 'doc.png'),
+ ('\.txt$', fileicons_path + 'txt.png'),
+ ('\.ppt$', fileicons_path + 'ppt.png'),
+ ('\.xls$', fileicons_path + 'xls.png'),
+ ('.*', fileicons_path + 'file.png'), # Default
+])
+
+
class NotAnImageException(Exception):
pass
@@ -27,6 +41,15 @@ def get_random_string():
return ''.join(random.sample(string.ascii_lowercase*6, 6))
+def get_icon_filename(file_name):
+ """
+ Return the path to a file icon that matches the file name.
+ """
+ for regex, iconpath in CKEDITOR_FILEICONS:
+ if re.search(regex, file_name, re.I):
+ return iconpath
+
+
def get_thumb_filename(file_name):
"""
Generate thumb filename by adding _thumb to end of
diff --git a/ckeditor/views.py b/ckeditor/views.py
index 7c283c4..19c1e95 100644
--- a/ckeditor/views.py
+++ b/ckeditor/views.py
@@ -1,5 +1,6 @@
from datetime import datetime
import os
+import sys
from django.conf import settings
from django.core.files.storage import default_storage
@@ -48,11 +49,7 @@ class ImageUploadView(generic.View):
try:
backend.image_verify(upload)
except utils.NotAnImageException:
- return HttpResponse("""
- """.format(request.GET['CKEditorFuncNum']))
+ pass
# Open output file in which to store upload.
upload_filename = get_upload_filename(upload.name, request.user)
@@ -120,13 +117,21 @@ def get_files_browse_urls(user=None):
for filename in get_image_files(user=user):
src = utils.get_media_url(filename)
if getattr(settings, 'CKEDITOR_IMAGE_BACKEND', None):
- thumb = utils.get_media_url(utils.get_thumb_filename(filename))
+ if is_image(src):
+ thumb = utils.get_media_url(utils.get_thumb_filename(filename))
+ visible_filename = None
+ else:
+ thumb = utils.get_icon_filename(filename)
+ visible_filename = os.path.split(filename)[1]
+ if len(visible_filename) > 20:
+ visible_filename = visible_filename[0:19] + '...'
else:
thumb = src
files.append({
'thumb': thumb,
'src': src,
- 'is_image': is_image(src)
+ 'is_image': is_image(src),
+ 'visible_filename': visible_filename,
})
return files