forked from Botanical/BotanJS
Do not rebuild .c.* files if cache exists
This commit is contained in:
parent
a7c8c4dc84
commit
39b6d34376
@ -44,7 +44,7 @@ class Resolver:
|
|||||||
|
|
||||||
parent = self.parentMap[ elem ]
|
parent = self.parentMap[ elem ]
|
||||||
|
|
||||||
if parent != None:
|
if parent is not None:
|
||||||
return self.resource( parent )
|
return self.resource( parent )
|
||||||
|
|
||||||
def locate( self, key ):
|
def locate( self, key ):
|
||||||
@ -190,10 +190,6 @@ class BotanClassResolver:
|
|||||||
cssGroup.sort( key = lambda x : x[ "src" ] )
|
cssGroup.sort( key = lambda x : x[ "src" ] )
|
||||||
cssList.extend( cssGroup )
|
cssList.extend( cssGroup )
|
||||||
|
|
||||||
for k in cssList:
|
|
||||||
print( k[ "src" ] )
|
|
||||||
|
|
||||||
|
|
||||||
def getCache( self, fileList, cName, mode ):
|
def getCache( self, fileList, cName, mode ):
|
||||||
if self.CR == None:
|
if self.CR == None:
|
||||||
return None
|
return None
|
||||||
@ -208,10 +204,14 @@ class BotanClassResolver:
|
|||||||
# Compressed file
|
# Compressed file
|
||||||
cFile = os.path.join( self.CR, cFHash )
|
cFile = os.path.join( self.CR, cFHash )
|
||||||
|
|
||||||
if self.flagCompress and self.useCache( cFile ):
|
cCached = self.useCache( cFile )
|
||||||
|
|
||||||
|
if self.flagCompress and cCached:
|
||||||
return self.BotanCache( cFile, cFHash, self.returnDynamic )
|
return self.BotanCache( cFile, cFHash, self.returnDynamic )
|
||||||
|
|
||||||
elif self.useCache( oFile ):
|
if self.useCache( oFile ):
|
||||||
|
|
||||||
|
if not cCached:
|
||||||
self.JWork.saveCache(
|
self.JWork.saveCache(
|
||||||
oFile
|
oFile
|
||||||
# Content is None to initiate a compression
|
# Content is None to initiate a compression
|
||||||
@ -222,6 +222,8 @@ class BotanClassResolver:
|
|||||||
|
|
||||||
return self.BotanCache( oFile, oFHash, False )
|
return self.BotanCache( oFile, oFHash, False )
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
def useCache( self, f ):
|
def useCache( self, f ):
|
||||||
return os.path.exists( f )
|
return os.path.exists( f )
|
||||||
|
|
||||||
@ -233,7 +235,7 @@ class BotanClassResolver:
|
|||||||
|
|
||||||
cacheFile = self.getCache( cList, md5, "js" )
|
cacheFile = self.getCache( cList, md5, "js" )
|
||||||
|
|
||||||
if cacheFile != None:
|
if cacheFile is not None:
|
||||||
return cacheFile;
|
return cacheFile;
|
||||||
|
|
||||||
# The root file
|
# The root file
|
||||||
@ -279,7 +281,7 @@ class BotanClassResolver:
|
|||||||
md5 = [ None ]
|
md5 = [ None ]
|
||||||
cacheFile = self.getCache( cList, md5, "css" )
|
cacheFile = self.getCache( cList, md5, "css" )
|
||||||
|
|
||||||
if cacheFile != None:
|
if cacheFile is not None:
|
||||||
return cacheFile;
|
return cacheFile;
|
||||||
|
|
||||||
struct = "/* @ */"
|
struct = "/* @ */"
|
||||||
|
Loading…
Reference in New Issue
Block a user