Changeset 652

Show
Ignore:
Timestamp:
08/02/08 21:17:43 (4 months ago)
Author:
gbooker
Message:

Fix the broken browser caching; helps with many things

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/Browser/SapphireBrowser.m

    r636 r652  
    309309         
    310310        /*Check our cache*/ 
    311         NSString *name = [_names objectAtIndex:row]; 
    312         id cached = [items objectForKey:name]; 
     311        NSString *lookupName = [_names objectAtIndex:row]; 
     312        id cached = [items objectForKey:lookupName]; 
    313313        if(cached != nil) 
    314314                return cached; 
    …… 
    324324        { 
    325325                result = [SapphireFrontRowCompat textMenuItemForScene:scene folder:YES]; 
    326                 id <SapphireDirectory> meta = [metaData metaDataForDirectory:name]; 
     326                id <SapphireDirectory> meta = [metaData metaDataForDirectory:lookupName]; 
    327327                watched = ![meta containsFileMatchingPredicate:[SapphireApplianceController unwatchedPredicate]]; 
    328328                favorite = [meta containsFileMatchingPredicate:[SapphireApplianceController favoritePredicate]]; 
    …… 
    332332        { 
    333333                result = [SapphireFrontRowCompat textMenuItemForScene:scene folder:NO]; 
    334                 SapphireFileMetaData *meta = [metaData metaDataForFile:name]; 
     334                SapphireFileMetaData *meta = [metaData metaDataForFile:lookupName]; 
    335335                if(meta != nil) 
    336336                { 
    …… 
    410410        else if(fileCls==FILE_CLASS_AUDIO)[SapphireFrontRowCompat setLeftIcon:[theme gem:GREEN_GEM_KEY] forMenu:result]; 
    411411        else [SapphireFrontRowCompat setLeftIcon:[theme gem:RED_GEM_KEY] forMenu:result]; 
    412                         
     412         
    413413        // add text 
    414         if(displayName)name= displayName ; 
     414        NSString *name; 
     415        if(displayName) 
     416                name = displayName; 
     417        else 
     418                name = lookupName; 
    415419        name=[@"  " stringByAppendingString: name] ; 
    416420        [SapphireFrontRowCompat setTitle:name forMenu:result]; 
    417         [items setObject:result forKey:name]; 
     421        [items setObject:result forKey:lookupName]; 
    418422                                 
    419423        return ( result ) ;