haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

Move file extension and type map generation from urls.py to utils.py.

Browse Source
This commit is contained in:
xiez
2012-07-19 22:34:11 +08:00
parent c651cca9ce
commit ab930da830
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
urls.py
View File

@@ -17,7 +17,6 @@ from seahub.views import root, peers, myhome, \
from seahub.notifications.views import notification_list from seahub.notifications.views import notification_list
from seahub.share.views import share_admin from seahub.share.views import share_admin
from seahub.group.views import group_list from seahub.group.views import group_list
from seahub.utils import gen_fileext_type_map
# Uncomment the next two lines to enable the admin: # Uncomment the next two lines to enable the admin:
#from django.contrib import admin #from django.contrib import admin
@@ -110,6 +109,3 @@ if settings.DEBUG:
(r'^%s/(?P<path>.*)$' % (media_url), 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), (r'^%s/(?P<path>.*)$' % (media_url), 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
) )
# Add file extension and type to dictionary at django startup,
# this function should be called only once.
FILEEXT_TYPE_MAP = gen_fileext_type_map()

2
utils.py
View File

@@ -237,7 +237,6 @@ def valid_previewed_file(filename):
Check whether file can preview on web Check whether file can preview on web
""" """
from urls import FILEEXT_TYPE_MAP
fileExt = os.path.splitext(filename)[1][1:] fileExt = os.path.splitext(filename)[1][1:]
return FILEEXT_TYPE_MAP.get(fileExt) return FILEEXT_TYPE_MAP.get(fileExt)
@@ -267,3 +266,4 @@ def gen_fileext_type_map():
d[fileext] = filetype d[fileext] = filetype
return d return d
FILEEXT_TYPE_MAP = gen_fileext_type_map()