dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-use original paths

Browse Source
This commit is contained in:
Ruud
2014-04-09 19:54:01 +02:00
parent 6ea49405f4
commit 85163443e3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/_base/clientscript.py
+10 -7
View File
@@ -55,6 +55,7 @@ class ClientScript(Plugin):
watcher = None watcher = None
original_paths = {'style': {}, 'script': {}}
paths = {'style': {}, 'script': {}} paths = {'style': {}, 'script': {}}
comment = { comment = {
'style': '/*** %s:%d ***/\n', 'style': '/*** %s:%d ***/\n',
@@ -116,7 +117,7 @@ class ClientScript(Plugin):
for file_type in ['style', 'script']: for file_type in ['style', 'script']:
ext = 'js' if file_type is 'script' else 'css' ext = 'js' if file_type is 'script' else 'css'
positions = self.paths.get(file_type, {}) positions = self.original_paths.get(file_type, {})
for position in positions: for position in positions:
files = positions.get(position) files = positions.get(position)
self._compile(file_type, files, position, position + '.' + ext) self._compile(file_type, files, position, position + '.' + ext)
@@ -132,7 +133,7 @@ class ClientScript(Plugin):
raw = [] raw = []
new_paths = [] new_paths = []
for x in paths: for x in paths:
file_path, urls = x file_path, url_path = x
f = open(file_path, 'r').read() f = open(file_path, 'r').read()
@@ -147,14 +148,12 @@ class ClientScript(Plugin):
if Env.get('dev'): if Env.get('dev'):
self.watcher.watch(file_path, self.compile) self.watcher.watch(file_path, self.compile)
url_path = urls.get('original_url')
compiled_file_name = position + '_%s.css' % url_path.replace('/', '_').split('.scss')[0] compiled_file_name = position + '_%s.css' % url_path.replace('/', '_').split('.scss')[0]
compiled_file_path = os.path.join(minified_dir, compiled_file_name) compiled_file_path = os.path.join(minified_dir, compiled_file_name)
self.createFile(compiled_file_path, f.strip()) self.createFile(compiled_file_path, f.strip())
# Remove scss path # Remove scss path
urls['url'] = 'minified/%s?%s' % (compiled_file_name, tryInt(time.time())) x = (file_path, 'minified/%s?%s' % (compiled_file_name, tryInt(time.time())))
new_paths.append((file_path, urls))
if not Env.get('dev'): if not Env.get('dev'):
@@ -190,7 +189,7 @@ class ClientScript(Plugin):
def get(self, type, location = 'head'): def get(self, type, location = 'head'):
paths = self.paths[type][location] paths = self.paths[type][location]
return [x[1].get('url', x[1].get('original_url')) for x in paths] return [x[1] for x in paths]
def registerStyle(self, api_path, file_path, position = 'head'): def registerStyle(self, api_path, file_path, position = 'head'):
self.register(api_path, file_path, 'style', position) self.register(api_path, file_path, 'style', position)
@@ -202,9 +201,13 @@ class ClientScript(Plugin):
api_path = '%s?%s' % (api_path, tryInt(os.path.getmtime(file_path))) api_path = '%s?%s' % (api_path, tryInt(os.path.getmtime(file_path)))
if not self.original_paths[type].get(location):
self.original_paths[type][location] = []
self.original_paths[type][location].append((file_path, api_path))
if not self.paths[type].get(location): if not self.paths[type].get(location):
self.paths[type][location] = [] self.paths[type][location] = []
self.paths[type][location].append((file_path, {'original_url': api_path})) self.paths[type][location].append((file_path, api_path))
prefix_properties = ['border-radius', 'transform', 'transition', 'box-shadow'] prefix_properties = ['border-radius', 'transform', 'transition', 'box-shadow']
prefix_tags = ['ms', 'moz', 'webkit'] prefix_tags = ['ms', 'moz', 'webkit']