Skip to content

Commit 97ec7f9

Browse files
author
Marcel
committed
improve static resolver
1 parent b3bda22 commit 97ec7f9

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

gengine/flaskadmin.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,24 @@
1010
from wtforms import BooleanField
1111
from flask.globals import request
1212
from wtforms.form import Form
13-
import pkg_resources
13+
import pkg_resources, os
1414
from flask.helpers import send_from_directory
1515
import jinja2
1616

1717
flaskadminapp=None
1818
admin=None
1919

20-
def get_package_folder(uri):
21-
from pyramid.path import AssetResolver
22-
project,folder = uri.split(":",1)
23-
a = AssetResolver(project)
24-
resolver = a.resolve(folder)
25-
folder = resolver.abspath()
26-
return folder
20+
21+
def resole_uri(uri):
22+
from pyramid.path import PkgResourcesAssetDescriptor
23+
pkg_name,path=uri.split(":",1)
24+
a = PkgResourcesAssetDescriptor(pkg_name,path)
25+
absolute = a.abspath() #this is sometimes not absolute :-/
26+
absolute = os.path.abspath(absolute) #so we make it absolute
27+
return absolute
2728

2829
def get_static_view(folder,flaskadminapp):
29-
folder=get_package_folder(folder)
30+
folder=resole_uri(folder)
3031

3132
def send_static_file(filename):
3233
cache_timeout = flaskadminapp.get_send_file_max_age(filename)

0 commit comments

Comments
 (0)