fix(appserver): add timestamp to all web resources
This will force a reload of the file each time it is modified. Fixes #5335pull/43/merge
Francis Lachapelle
parent
b0509cad8e
commit
0a56b9b0c3
|
|
@ -40,10 +40,10 @@ static NSString *themesDirName = @"Themes";
|
|||
+ (NSString *)shareSubpath {
|
||||
static NSString *shareSubPath = nil;
|
||||
NSString *p;
|
||||
|
||||
|
||||
if (shareSubPath != nil)
|
||||
return shareSubPath;
|
||||
|
||||
|
||||
p = [[WOApplication application] shareDirectoryName];
|
||||
p = [@"share/" stringByAppendingString:p];
|
||||
p = [p stringByAppendingString:@"/"];
|
||||
|
|
@ -54,7 +54,7 @@ static NSString *themesDirName = @"Themes";
|
|||
+ (NSString *)gsTemplatesSubpath {
|
||||
NSString *p;
|
||||
p = [[WOApplication application] gsTemplatesDirectoryName];
|
||||
#if ! GNUSTEP_BASE_LIBRARY
|
||||
#if ! GNUSTEP_BASE_LIBRARY
|
||||
// for GNUSTEP_BASE_LIBRARY this is already there in rootPathesInGNUstep
|
||||
p = [@"Library/" stringByAppendingString:p];
|
||||
#endif
|
||||
|
|
@ -62,9 +62,9 @@ static NSString *themesDirName = @"Themes";
|
|||
}
|
||||
+ (NSString *)gsWebSubpath {
|
||||
NSString *p;
|
||||
|
||||
|
||||
p = [[WOApplication application] gsWebDirectoryName];
|
||||
#if ! GNUSTEP_BASE_LIBRARY
|
||||
#if ! GNUSTEP_BASE_LIBRARY
|
||||
// for GNUSTEP_BASE_LIBRARY this is already there in rootPathesInGNUstep
|
||||
p = [@"Library/" stringByAppendingString:p];
|
||||
#endif
|
||||
|
|
@ -84,21 +84,21 @@ static NSString *themesDirName = @"Themes";
|
|||
while ((directory = [libraryPaths nextObject]))
|
||||
[tmp addObject: directory];
|
||||
return tmp;
|
||||
#else
|
||||
#else
|
||||
NSDictionary *env;
|
||||
env = [[NSProcessInfo processInfo] environment];
|
||||
if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil)
|
||||
tmp = [env objectForKey:@"GNUSTEP_PATHLIST"];
|
||||
#endif
|
||||
|
||||
|
||||
return [tmp componentsSeparatedByString:@":"];
|
||||
}
|
||||
+ (NSArray *)rootPathesInFHS {
|
||||
return [NSArray arrayWithObjects:
|
||||
#ifdef FHS_INSTALL_ROOT
|
||||
FHS_INSTALL_ROOT,
|
||||
FHS_INSTALL_ROOT,
|
||||
#endif
|
||||
@"/usr/local/", @"/usr/", nil];
|
||||
@"/usr/local/", @"/usr/", nil];
|
||||
}
|
||||
|
||||
+ (NSArray *)findResourceDirectoryPathesWithName:(NSString *)_name
|
||||
|
|
@ -121,44 +121,44 @@ static NSString *themesDirName = @"Themes";
|
|||
while ((directory = [libraryPaths nextObject]))
|
||||
[ma addObject: [directory stringByAppendingPathComponent: _name]];
|
||||
#else
|
||||
|
||||
|
||||
e = [[self rootPathesInGNUstep] objectEnumerator];
|
||||
while ((tmp = [e nextObject]) != nil) {
|
||||
if (![tmp hasSuffix:@"/"])
|
||||
tmp = [tmp stringByAppendingString:@"/"];
|
||||
|
||||
|
||||
tmp = [tmp stringByAppendingString:_name];
|
||||
if ([ma containsObject:tmp]) continue;
|
||||
|
||||
|
||||
if (debugOn) [self logWithFormat:@"CHECK: %@", tmp];
|
||||
if (![fm fileExistsAtPath:tmp isDirectory:&isDir])
|
||||
continue;
|
||||
|
||||
|
||||
if (!isDir) continue;
|
||||
|
||||
|
||||
[ma addObject:tmp];
|
||||
}
|
||||
#endif
|
||||
|
||||
/* hack in FHS pathes */
|
||||
|
||||
|
||||
e = [[self rootPathesInFHS] objectEnumerator];
|
||||
while ((tmp = [e nextObject]) != nil) {
|
||||
tmp = [tmp stringByAppendingString:[[self class] shareSubpath]];
|
||||
tmp = [tmp stringByAppendingString:_fhs];
|
||||
if ([ma containsObject:tmp]) continue;
|
||||
if (debugOn) [self logWithFormat:@"CHECK: %@", tmp];
|
||||
|
||||
|
||||
if (![fm fileExistsAtPath:tmp isDirectory:&isDir])
|
||||
continue;
|
||||
if (!isDir) {
|
||||
[self logWithFormat:@"path is not a directory: %@", tmp];
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
[ma addObject:tmp];
|
||||
}
|
||||
|
||||
|
||||
return ma;
|
||||
}
|
||||
|
||||
|
|
@ -167,29 +167,29 @@ static NSString *themesDirName = @"Themes";
|
|||
NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
|
||||
if (isInitialized) return;
|
||||
isInitialized = YES;
|
||||
|
||||
|
||||
null = [[NSNull null] retain];
|
||||
|
||||
|
||||
if ((debugOn = [ud boolForKey:@"WEResourceManagerDebugEnabled"]))
|
||||
NSLog(@"Note: WEResourceManager debugging is enabled.");
|
||||
debugComponents = [ud boolForKey:@"WEResourceManagerComponentDebugEnabled"];
|
||||
if (debugComponents)
|
||||
NSLog(@"Note: WEResourceManager component debugging is enabled.");
|
||||
|
||||
|
||||
fm = [[NSFileManager defaultManager] retain];
|
||||
|
||||
|
||||
suffix = [[ud stringForKey:@"WOApplicationSuffix"] copy];
|
||||
prefix = [[ud stringForKey:@"WOResourcePrefix"] copy];
|
||||
|
||||
|
||||
wsPathes = [[self findResourceDirectoryPathesWithName:
|
||||
[self gsWebSubpath] fhsName:@"www/"] copy];
|
||||
[self gsWebSubpath] fhsName:@"www/"] copy];
|
||||
if (debugOn)
|
||||
NSLog(@"WebServerResources pathes: %@", wsPathes);
|
||||
|
||||
|
||||
// TODO: use appname to enable different setups, maybe some var too
|
||||
templatePathes = [[self findResourceDirectoryPathesWithName:
|
||||
[[self class] gsTemplatesSubpath]
|
||||
fhsName:@"templates/"] copy];
|
||||
[[self class] gsTemplatesSubpath]
|
||||
fhsName:@"templates/"] copy];
|
||||
if (debugOn)
|
||||
NSLog(@"template pathes: %@", templatePathes);
|
||||
if (![templatePathes isNotEmpty]) {
|
||||
|
|
@ -207,28 +207,28 @@ static NSString *themesDirName = @"Themes";
|
|||
|
||||
if (lthemes != nil)
|
||||
return lthemes;
|
||||
|
||||
|
||||
themes = [NSMutableSet setWithCapacity:16];
|
||||
fm = [NSFileManager defaultManager];
|
||||
|
||||
|
||||
e = [templatePathes objectEnumerator];
|
||||
while ((path = [e nextObject]) != nil) {
|
||||
NSArray *dl;
|
||||
|
||||
|
||||
path = [path stringByAppendingPathComponent:themesDirName];
|
||||
dl = [fm directoryContentsAtPath:path];
|
||||
|
||||
|
||||
[themes addObjectsFromArray:dl];
|
||||
}
|
||||
|
||||
|
||||
/* remove directories to be ignored */
|
||||
[themes removeObject:@".svn"];
|
||||
[themes removeObject:@"CVS"];
|
||||
|
||||
lthemes = [[[themes allObjects]
|
||||
|
||||
lthemes = [[[themes allObjects]
|
||||
sortedArrayUsingSelector:@selector(compare:)] copy];
|
||||
if ([lthemes isNotEmpty]) {
|
||||
NSLog(@"Note: located themes: %@",
|
||||
NSLog(@"Note: located themes: %@",
|
||||
[lthemes componentsJoinedByString:@", "]);
|
||||
}
|
||||
else
|
||||
|
|
@ -241,13 +241,13 @@ static NSString *themesDirName = @"Themes";
|
|||
if ([WOApplication isCachingEnabled]) {
|
||||
self->keyToComponentPath =
|
||||
[[NSMutableDictionary alloc] initWithCapacity:128];
|
||||
|
||||
|
||||
self->keyToPath = [[NSMutableDictionary alloc] initWithCapacity:1024];
|
||||
self->keyToURL = [[NSMutableDictionary alloc] initWithCapacity:1024];
|
||||
}
|
||||
else
|
||||
[self logWithFormat:@"Note: component path caching is disabled!"];
|
||||
|
||||
|
||||
self->labelManager = [[WEStringTableManager alloc] init];
|
||||
self->cachedKey = [[WEResourceKey alloc] initCachedKey];
|
||||
}
|
||||
|
|
@ -285,29 +285,29 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
if (debugOn) NSLog(@"cache disabled.");
|
||||
return nil; /* caching disabled */
|
||||
}
|
||||
|
||||
|
||||
/* setup cache key (THREAD) */
|
||||
_key->hashValue = 0; /* reset, calculate on next access */
|
||||
_key->name = _n;
|
||||
_key->frameworkName = _fw;
|
||||
_key->language = _l;
|
||||
|
||||
|
||||
return [_cache objectForKey:_key];
|
||||
}
|
||||
|
||||
- (void)cacheValue:(id)_value inCache:(NSMutableDictionary *)_cache {
|
||||
WEResourceKey *k;
|
||||
|
||||
|
||||
if (_cache == nil) return; /* caching disabled */
|
||||
|
||||
|
||||
/* we need to dup, because the cachedKey does not retain! */
|
||||
k = [self->cachedKey duplicate];
|
||||
|
||||
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@"cache key %@(#%d): %@", k, [self->keyToPath count],
|
||||
_value];
|
||||
}
|
||||
|
||||
|
||||
[_cache setObject:(_value ? _value : (id)null) forKey:k];
|
||||
[k release]; k = nil;
|
||||
}
|
||||
|
|
@ -319,23 +319,23 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
language:(NSString *)_language
|
||||
{
|
||||
NSString *path;
|
||||
|
||||
|
||||
path = [_frameworkName isNotEmpty]
|
||||
? [_p stringByAppendingPathComponent:_frameworkName]
|
||||
: _p;
|
||||
|
||||
|
||||
/* check language */
|
||||
if (_language != nil) {
|
||||
path = [path stringByAppendingPathComponent:_language];
|
||||
path = [path stringByAppendingPathExtension:@"lproj"];
|
||||
}
|
||||
|
||||
|
||||
path = [path stringByAppendingPathComponent:_name];
|
||||
if (debugOn) [self debugWithFormat:@" check path: '%@'", path];
|
||||
|
||||
|
||||
if (![fm fileExistsAtPath:path])
|
||||
return nil;
|
||||
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
@ -345,11 +345,11 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
{
|
||||
NSEnumerator *e;
|
||||
NSString *path;
|
||||
|
||||
|
||||
e = [_p objectEnumerator];
|
||||
while ((path = [e nextObject]) != nil) {
|
||||
path = [self _weCheckPath:path forResourceNamed:_name
|
||||
inFramework:_frameworkName language:_language];
|
||||
inFramework:_frameworkName language:_language];
|
||||
if (path != nil) {
|
||||
if (debugOn) [self debugWithFormat:@"FOUND: '%@'", path];
|
||||
return path;
|
||||
|
|
@ -365,20 +365,20 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
{
|
||||
// TODO: a lot of DUP code with _urlForResourceNamed, needs some refacturing
|
||||
NSString *path;
|
||||
|
||||
|
||||
if (debugOn) [self debugWithFormat:@"lookup resource '%@'", _name];
|
||||
|
||||
|
||||
/* check cache */
|
||||
|
||||
|
||||
path = checkCache(self->keyToPath, self->cachedKey, _name, _fwName, _lang);
|
||||
if (path != nil) {
|
||||
if (debugOn) [self debugWithFormat:@" found in cache: %@", path];
|
||||
return [path isNotNull] ? path : (NSString *)nil;
|
||||
}
|
||||
|
||||
|
||||
/* check for framework resources (webserver resources + framework) */
|
||||
|
||||
if (debugOn)
|
||||
if (debugOn)
|
||||
[self debugWithFormat:@"check framework resources ..."];
|
||||
path = [self _weCheckPathes:_pathes forResourceNamed:_name
|
||||
inFramework:_fwName language:_lang];
|
||||
|
|
@ -386,9 +386,9 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self cacheValue:path inCache:self->keyToPath];
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
/* check in basepath of webserver resources */
|
||||
|
||||
|
||||
// TODO: where is the difference, same call like above?
|
||||
if (debugOn) [self debugWithFormat:@"check global resources ..."];
|
||||
path = [self _weCheckPathes:_pathes forResourceNamed:_name
|
||||
|
|
@ -397,9 +397,9 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self cacheValue:path inCache:self->keyToPath];
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
/* finished processing */
|
||||
if (debugOn)
|
||||
if (debugOn)
|
||||
[self debugWithFormat:@"NOT FOUND: %@ (%@)", _name, self->cachedKey];
|
||||
return nil;
|
||||
}
|
||||
|
|
@ -415,15 +415,15 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
language:(NSString *)_lang
|
||||
{
|
||||
NSString *p;
|
||||
|
||||
|
||||
/* check in webserver resources */
|
||||
|
||||
|
||||
if ([self shouldLookupResourceInWebServerResources:_name]) {
|
||||
p = [self _wePathForResourceNamed:_name inFramework:_fwName
|
||||
language:_lang searchPathes:wsPathes];
|
||||
if (p != nil) return p;
|
||||
}
|
||||
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
|
@ -436,20 +436,20 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
inFramework:(NSString *)_fwName
|
||||
languages:(NSArray *)_langs
|
||||
{
|
||||
/*
|
||||
Note: this is also called by the superclass method
|
||||
/*
|
||||
Note: this is also called by the superclass method
|
||||
-pathToComponentNamed:inFramework: for each registered component
|
||||
extension.
|
||||
*/
|
||||
NSEnumerator *e;
|
||||
NSString *language;
|
||||
NSString *rpath;
|
||||
|
||||
|
||||
if (![_name isNotEmpty]) {
|
||||
[self debugWithFormat:@"got no name for resource lookup?!"];
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@"pathForResourceNamed: %@/%@ (languages: %@)",
|
||||
_name, _fwName, [_langs componentsJoinedByString:@","]];
|
||||
|
|
@ -458,42 +458,42 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
if ([self isTemplateResourceName:_name]) {
|
||||
if (debugOn) [self debugWithFormat:@" is template resource .."];
|
||||
return [self pathToComponentNamed:[_name stringByDeletingPathExtension]
|
||||
inFramework:_fwName
|
||||
languages:_langs];
|
||||
inFramework:_fwName
|
||||
languages:_langs];
|
||||
}
|
||||
|
||||
|
||||
/* check languages */
|
||||
|
||||
|
||||
e = [_langs objectEnumerator];
|
||||
while ((language = [e nextObject]) != nil) {
|
||||
NSString *rpath;
|
||||
|
||||
if (debugOn)
|
||||
|
||||
if (debugOn)
|
||||
[self logWithFormat:@" check language (%@): '%@'", _name, language];
|
||||
rpath = [self _wePathForResourceNamed:_name inFramework:_fwName
|
||||
language:language];
|
||||
language:language];
|
||||
if (rpath != nil) {
|
||||
if (debugOn) [self debugWithFormat:@" FOUND: %@", rpath];
|
||||
return rpath;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* check without language */
|
||||
|
||||
|
||||
rpath = [self _wePathForResourceNamed:_name inFramework:_fwName
|
||||
language:nil];
|
||||
language:nil];
|
||||
if (rpath != nil)
|
||||
return rpath;
|
||||
|
||||
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:
|
||||
@"did not find resource, try super lookup: '%@'", _name];
|
||||
}
|
||||
|
||||
|
||||
/* look using WOResourceManager */
|
||||
|
||||
|
||||
rpath = [super pathForResourceNamed:_name inFramework:_fwName
|
||||
languages:_langs];
|
||||
languages:_langs];
|
||||
return rpath;
|
||||
}
|
||||
|
||||
|
|
@ -504,40 +504,39 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
language:(NSString *)_lang
|
||||
applicationName:(NSString *)_appName
|
||||
{
|
||||
NSString *url;
|
||||
NSDate *lastModified;
|
||||
NSEnumerator *e;
|
||||
NSString *path;
|
||||
|
||||
NSMutableString *ms;
|
||||
NSString *path, *url;
|
||||
|
||||
if (debugOn) {
|
||||
[self logWithFormat:@"lookup URL of resource: '%@'/%@/%@",
|
||||
_name, _fwName, _lang];
|
||||
[self logWithFormat:@"lookup URL of resource: '%@'/%@/%@",
|
||||
_name, _fwName, _lang];
|
||||
}
|
||||
|
||||
|
||||
/* check cache */
|
||||
|
||||
|
||||
url = checkCache(self->keyToURL, self->cachedKey, _name, _fwName, _lang);
|
||||
if (url != nil) {
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@" found in cache: %@ (#%d)", url,
|
||||
[self debugWithFormat:@" found in cache: %@ (#%d)", url,
|
||||
[self->keyToURL count]];
|
||||
}
|
||||
return [url isNotNull] ? url : (NSString *)nil;
|
||||
}
|
||||
|
||||
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@" not found in cache: %@ (%@,#%d)",
|
||||
[self debugWithFormat:@" not found in cache: %@ (%@,#%d)",
|
||||
url, self->cachedKey, [self->keyToURL count]];
|
||||
}
|
||||
|
||||
|
||||
/* check for framework resources */
|
||||
|
||||
|
||||
if ([_fwName isNotEmpty]) {
|
||||
if (debugOn)
|
||||
if (debugOn)
|
||||
[self debugWithFormat:@"check framework: '%@'", _fwName];
|
||||
e = [wsPathes objectEnumerator];
|
||||
while ((path = [e nextObject])) {
|
||||
NSMutableString *ms;
|
||||
|
||||
path = [path stringByAppendingPathComponent:_fwName];
|
||||
|
||||
/* check language */
|
||||
|
|
@ -545,20 +544,24 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
path = [path stringByAppendingPathComponent:_lang];
|
||||
path = [path stringByAppendingPathExtension:@"lproj"];
|
||||
}
|
||||
|
||||
|
||||
path = [path stringByAppendingPathComponent:_name];
|
||||
if (debugOn) [self debugWithFormat:@" check path: '%@'", path];
|
||||
|
||||
|
||||
if (![fm fileExistsAtPath:path])
|
||||
continue;
|
||||
|
||||
|
||||
lastModified = [[fm fileAttributesAtPath: path
|
||||
traverseLink: YES]
|
||||
fileModificationDate];
|
||||
|
||||
ms = [[NSMutableString alloc] initWithCapacity:256];
|
||||
|
||||
|
||||
if (prefix) [ms appendString:prefix];
|
||||
if (![ms hasSuffix:@"/"]) [ms appendString:@"/"];
|
||||
[ms appendString:_appName];
|
||||
if (suffix) [ms appendString:suffix];
|
||||
[ms appendString:[ms hasSuffix:@"/"]
|
||||
[ms appendString:[ms hasSuffix:@"/"]
|
||||
? @"WebServerResources/" : @"/WebServerResources/"];
|
||||
[ms appendString:_fwName];
|
||||
[ms appendString:@"/"];
|
||||
|
|
@ -567,22 +570,22 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[ms appendString:@".lproj/"];
|
||||
}
|
||||
[ms appendString:_name];
|
||||
|
||||
[ms appendFormat: @"?lm=%u",
|
||||
(unsigned) [lastModified timeIntervalSince1970]];
|
||||
|
||||
url = ms;
|
||||
if (debugOn) [self debugWithFormat:@"FOUND: '%@'", url];
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* check for global resources */
|
||||
|
||||
|
||||
if (debugOn) [self debugWithFormat:@"check global WebServerResources ..."];
|
||||
e = [wsPathes objectEnumerator];
|
||||
while ((path = [e nextObject])) {
|
||||
NSMutableString *ms;
|
||||
NSString *fpath, *basepath;
|
||||
NSDate *lastModified;
|
||||
|
||||
|
||||
/* check language */
|
||||
if (_lang) {
|
||||
basepath = [path stringByAppendingPathComponent:_lang];
|
||||
|
|
@ -590,15 +593,15 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
}
|
||||
else
|
||||
basepath = path;
|
||||
|
||||
|
||||
fpath = [basepath stringByAppendingPathComponent:_name];
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:
|
||||
@" check path: '%@'\n base: %@\n name: %@\n "
|
||||
@" path: %@\n lang: %@",
|
||||
@" path: %@\n lang: %@",
|
||||
fpath, basepath, _name, path, _lang];
|
||||
}
|
||||
|
||||
|
||||
if (![fm fileExistsAtPath:fpath])
|
||||
continue;
|
||||
|
||||
|
|
@ -607,12 +610,12 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
fileModificationDate];
|
||||
|
||||
ms = [[NSMutableString alloc] initWithCapacity:256];
|
||||
|
||||
|
||||
if (prefix) [ms appendString:prefix];
|
||||
if (![ms hasSuffix:@"/"]) [ms appendString:@"/"];
|
||||
[ms appendString:_appName];
|
||||
if (suffix) [ms appendString:suffix];
|
||||
[ms appendString:[ms hasSuffix:@"/"]
|
||||
[ms appendString:[ms hasSuffix:@"/"]
|
||||
? @"WebServerResources/" : @"/WebServerResources/"];
|
||||
if (_lang) {
|
||||
[ms appendString:_lang];
|
||||
|
|
@ -621,22 +624,22 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[ms appendString:_name];
|
||||
[ms appendFormat: @"?lm=%u",
|
||||
(unsigned) [lastModified timeIntervalSince1970]];
|
||||
|
||||
|
||||
url = ms;
|
||||
if (debugOn) [self debugWithFormat:@"FOUND: '%@'", url];
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/* finished processing */
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@"NOT FOUND: %@ (%@,#%d)", _name, self->cachedKey,
|
||||
[self->keyToURL count]];
|
||||
}
|
||||
|
||||
|
||||
done:
|
||||
[self cacheValue:url inCache:self->keyToURL];
|
||||
[url autorelease];
|
||||
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
|
|
@ -649,36 +652,36 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
NSString *language;
|
||||
NSString *url;
|
||||
NSString *appName;
|
||||
|
||||
|
||||
if (![_name isNotEmpty]) {
|
||||
if (debugOn) [self logWithFormat:@"got no name for resource URL lookup?!"];
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
||||
if (debugOn) [self debugWithFormat:@"urlForResourceNamed: %@", _name];
|
||||
|
||||
|
||||
if (_langs == nil) {
|
||||
_langs = [_request browserLanguages];
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@"using browser languages: %@",
|
||||
[self debugWithFormat:@"using browser languages: %@",
|
||||
[_langs componentsJoinedByString:@", "]];
|
||||
}
|
||||
}
|
||||
else if (debugOn) {
|
||||
[self debugWithFormat:@"using given languages: %@",
|
||||
[self debugWithFormat:@"using given languages: %@",
|
||||
[_langs componentsJoinedByString:@","]];
|
||||
}
|
||||
|
||||
|
||||
appName = [_request applicationName];
|
||||
if (appName == nil)
|
||||
appName = [(WOApplication *)[WOApplication application] name];
|
||||
|
||||
|
||||
/* check languages */
|
||||
|
||||
|
||||
e = [_langs objectEnumerator];
|
||||
while ((language = [e nextObject])) {
|
||||
NSString *url;
|
||||
|
||||
|
||||
if (debugOn) [self logWithFormat:@" check language: '%@'", language];
|
||||
url = [self _urlForResourceNamed:_name
|
||||
inFramework:_fwName
|
||||
|
|
@ -689,9 +692,9 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* check without language */
|
||||
|
||||
|
||||
url = [self _urlForResourceNamed:_name
|
||||
inFramework:_fwName
|
||||
language:nil
|
||||
|
|
@ -703,7 +706,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self debugWithFormat:
|
||||
@"did not find resource in try super lookup: '%@'", _name];
|
||||
}
|
||||
|
||||
|
||||
url = [super urlForResourceNamed:_name
|
||||
inFramework:_fwName
|
||||
languages:_langs
|
||||
|
|
@ -720,46 +723,46 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
// TODO: what about languages/themes?!
|
||||
NSEnumerator *e;
|
||||
NSString *path;
|
||||
|
||||
|
||||
if (debugComponents) {
|
||||
[self logWithFormat:@"lookup component in std pathes: %@|%@|%@",
|
||||
_name, _framework, _theme];
|
||||
}
|
||||
|
||||
if ([_theme isNotNull] && [_theme length] == 0)
|
||||
|
||||
if ([_theme isNotNull] && [_theme length] == 0)
|
||||
_theme = nil;
|
||||
if ([_framework isNotNull] && [_framework length] == 0)
|
||||
if ([_framework isNotNull] && [_framework length] == 0)
|
||||
_framework = nil;
|
||||
|
||||
|
||||
e = [templatePathes objectEnumerator];
|
||||
while ((path = [e nextObject]) != nil) {
|
||||
NSString *pe;
|
||||
|
||||
|
||||
if (_theme != nil) {
|
||||
// TODO: should be lower case for FHS? or use a different path?
|
||||
path = [path stringByAppendingPathComponent:themesDirName];
|
||||
path = [path stringByAppendingPathComponent:_theme];
|
||||
}
|
||||
|
||||
|
||||
if (_framework != nil) {
|
||||
NSString *pureName;
|
||||
|
||||
|
||||
pureName = [_framework lastPathComponent];
|
||||
pureName = [pureName stringByDeletingPathExtension];
|
||||
path = [path stringByAppendingPathComponent:pureName];
|
||||
}
|
||||
|
||||
|
||||
path = [path stringByAppendingPathComponent:_name];
|
||||
|
||||
|
||||
pe = [path stringByAppendingPathExtension:@"wox"];
|
||||
if (debugComponents) [self logWithFormat:@"CHECK %@", pe];
|
||||
|
||||
|
||||
if ([fm fileExistsAtPath:pe])
|
||||
return pe;
|
||||
|
||||
pe = [path stringByAppendingPathExtension:@"html"];
|
||||
if ([fm fileExistsAtPath:pe]) {
|
||||
/*
|
||||
/*
|
||||
Note: we are passing in the path of the HTML template, this is some
|
||||
kind of hack to make the wrapper template builder look for the
|
||||
$name.html/$name.wod in there.
|
||||
|
|
@ -767,7 +770,7 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
return pe;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return nil;
|
||||
}
|
||||
- (NSString *)lookupComponentInStandardPathes:(NSString *)_name
|
||||
|
|
@ -775,18 +778,18 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
{
|
||||
NSString *path;
|
||||
NSString *theme;
|
||||
|
||||
|
||||
if (debugComponents) {
|
||||
[self logWithFormat:@"lookup component in std pathes(langs): %@|%@",
|
||||
_name, _framework];
|
||||
}
|
||||
|
||||
|
||||
/* extract theme from language array (we do not support nested themes ATM) */
|
||||
|
||||
|
||||
theme = nil;
|
||||
if ([_langs count] > 1) {
|
||||
NSRange r;
|
||||
|
||||
|
||||
theme = [_langs objectAtIndex:0];
|
||||
r = [theme rangeOfString:@"_"];
|
||||
theme = (r.length > 0)
|
||||
|
|
@ -797,26 +800,26 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
theme = nil;
|
||||
|
||||
/* check theme dirs */
|
||||
|
||||
|
||||
if (theme != nil) {
|
||||
path = [self lookupComponentInStandardPathes:_name inFramework:_framework
|
||||
theme:theme];
|
||||
theme:theme];
|
||||
if (path != nil)
|
||||
return path;
|
||||
}
|
||||
|
||||
/* check base dirs */
|
||||
|
||||
|
||||
path = [self lookupComponentInStandardPathes:_name inFramework:_framework
|
||||
theme:nil];
|
||||
theme:nil];
|
||||
if (path != nil)
|
||||
return path;
|
||||
|
||||
|
||||
/* check without framework subdir */
|
||||
|
||||
if ([_framework isNotEmpty]) {
|
||||
path = [self lookupComponentInStandardPathes:_name inFramework:nil
|
||||
theme:nil];
|
||||
theme:nil];
|
||||
if (path != nil)
|
||||
return path;
|
||||
}
|
||||
|
|
@ -833,35 +836,35 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
|
||||
if (debugComponents)
|
||||
[self logWithFormat:@"lookup component using bundle manager: %@", _name];
|
||||
|
||||
|
||||
bundle = [[self bundleManager]
|
||||
bundleProvidingResource:_name
|
||||
ofType:@"WOComponents"];
|
||||
if (bundle == nil) {
|
||||
[self debugWithFormat:@"did not find a bundle providing component: %@",
|
||||
[self debugWithFormat:@"did not find a bundle providing component: %@",
|
||||
_name];
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
||||
if (debugOn) {
|
||||
[self debugWithFormat:@"bundle %@ for component %@",
|
||||
[[bundle bundlePath] lastPathComponent], _name];
|
||||
}
|
||||
|
||||
|
||||
[bundle load];
|
||||
|
||||
|
||||
fm = [NSFileManager defaultManager];
|
||||
wrapper = [_name stringByAppendingPathExtension:@"wo"];
|
||||
|
||||
|
||||
path = [[bundle bundlePath] stringByAppendingPathComponent:@"Resources"];
|
||||
path = [path stringByAppendingPathComponent:wrapper];
|
||||
if ([fm fileExistsAtPath:path])
|
||||
return path;
|
||||
|
||||
|
||||
path = [[bundle bundlePath] stringByAppendingPathComponent:wrapper];
|
||||
if ([fm fileExistsAtPath:path])
|
||||
return path;
|
||||
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
|
|
@ -875,18 +878,18 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self logWithFormat:@"%s: lookup component: %@|%@",
|
||||
__PRETTY_FUNCTION__, _name, _fw];
|
||||
}
|
||||
|
||||
|
||||
/* first check cache */
|
||||
|
||||
|
||||
path = checkCache(self->keyToComponentPath, self->cachedKey, _name, _fw,
|
||||
[_langs isNotEmpty]
|
||||
? [_langs objectAtIndex:0] : (id)@"English");
|
||||
[_langs isNotEmpty]
|
||||
? [_langs objectAtIndex:0] : (id)@"English");
|
||||
if (path != nil) {
|
||||
if (debugComponents)
|
||||
[self logWithFormat:@" use cached location: %@", path];
|
||||
return [path isNotNull] ? path : (NSString *)nil;
|
||||
}
|
||||
|
||||
|
||||
/* look in FHS locations */
|
||||
|
||||
path = [self lookupComponentInStandardPathes:_name inFramework:_fw
|
||||
|
|
@ -896,9 +899,9 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self logWithFormat:@" found in standard pathes: %@", path];
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/* try to find component by standard NGObjWeb method */
|
||||
|
||||
|
||||
if (debugComponents)
|
||||
[self logWithFormat:@"lookup component using WOResourceManager ..."];
|
||||
path = [super pathToComponentNamed:_name inFramework:_fw languages:_langs];
|
||||
|
|
@ -907,15 +910,15 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
[self logWithFormat:@" found using WOResourceManager: %@", path];
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/* find component using NGBundleManager */
|
||||
|
||||
|
||||
if ((path = [self lookupComponentPathUsingBundleManager:_name]) != nil) {
|
||||
if (debugComponents)
|
||||
[self logWithFormat:@" found using bundle manager: %@", path];
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
||||
/* did not find component */
|
||||
done:
|
||||
[self cacheValue:path inCache:self->keyToComponentPath];
|
||||
|
|
@ -933,14 +936,14 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
languages:(NSArray *)_languages
|
||||
{
|
||||
id table;
|
||||
|
||||
|
||||
table = [self->labelManager
|
||||
stringTableWithName:_tableName inFramework:_framework
|
||||
stringTableWithName:_tableName inFramework:_framework
|
||||
languages:_languages];
|
||||
if (table != nil) return table;
|
||||
|
||||
|
||||
return [super stringTableWithName:_tableName inFramework:_framework
|
||||
languages:_languages];
|
||||
languages:_languages];
|
||||
}
|
||||
|
||||
- (NSString *)stringForKey:(NSString *)_key
|
||||
|
|
@ -950,18 +953,18 @@ checkCache(NSDictionary *_cache, WEResourceKey *_key,
|
|||
languages:(NSArray *)_languages
|
||||
{
|
||||
NSString *s;
|
||||
|
||||
s = [self->labelManager
|
||||
|
||||
s = [self->labelManager
|
||||
stringForKey:_key inTableNamed:_tableName
|
||||
withDefaultValue:_defaultValue languages:_languages];
|
||||
if (s != nil) return s;
|
||||
|
||||
|
||||
s = [super stringForKey:_key inTableNamed:_tableName
|
||||
withDefaultValue:_defaultValue
|
||||
inFramework:_framework
|
||||
languages:_languages];
|
||||
if (s != nil) return s;
|
||||
|
||||
|
||||
return s != nil ? s : _defaultValue;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue