Change type of persistent ids from NSString to opaque

Author: znek

IFSiTunesLibrary.h

@@ -63,7 +63,7 @@
 
 /* helpers */
 
-- (IFSiTunesTrack *)trackWithID:(NSString *)_trackID;
+- (IFSiTunesTrack *)trackWithID:(id)_trackID;
 
 /* burn folder helpers */
 

IFSiTunesLibrary.m

@@ -31,13 +31,15 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 */
 
 #import "common.h"
-#import "IFSiTunesLibrary.h"
 #import <AppKit/AppKit.h>
+#import "IFSiTunesLibrary.h"
+
+#import "NSObject+FUSEOFS.h"
 #import "NSString+Extensions.h"
+
 #import "IFSiTunesPlaylist.h"
 #import "IFSM3UPlaylist.h"
 #import "IFSiTunesTrack.h"
-#import "NSObject+FUSEOFS.h"
 #import "IFSFormatter.h"
 #import "FUSEOFSMemoryContainer.h"
 #ifndef GNU_GUI_LIBRARY
@@ -169,24 +171,18 @@ - (void)dealloc {
 /* setup */
 
 - (void)reload {
-  NSData        *plist;
-  NSDictionary  *lib;
-  NSArray       *playlists;
-  NSDictionary  *tracks;
-  NSArray       *trackIDs;
-  NSUInteger    i, count;
-
   if (doDebug)
     NSLog(@"%s", __PRETTY_FUNCTION__);
 
   [self->plMap    removeAllObjects];
   [self->m3uMap   removeAllObjects];
   [self->trackMap removeAllObjects];
 
-  plist = [NSData dataWithContentsOfFile:[self libraryPath]];
+  NSData *plist = [NSData dataWithContentsOfFile:[self libraryPath]];
   NSAssert1(plist != nil, @"Couldn't read contents of %@!",
                           [self libraryPath]);
 
+  NSDictionary  *lib;
 #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101000
   lib = [NSPropertyListSerialization propertyListFromData:plist
                                      mutabilityOption:NSPropertyListImmutable
@@ -205,10 +201,10 @@ - (void)reload {
   self->name = [[NSString stringWithFormat:@"iTunes (v%@)",
                           [lib objectForKey:@"Application Version"]] copy];
 
-  tracks    = [lib objectForKey:@"Tracks"];
-  trackIDs  = [tracks allKeys];
-  count     = [trackIDs count];
-  for (i = 0; i < count; i++) {
+  NSDictionary *tracks   = [lib objectForKey:@"Tracks"];
+  NSArray      *trackIDs = [tracks allKeys];
+  NSUInteger   count     = [trackIDs count];
+  for (NSUInteger i = 0; i < count; i++) {
     NSString     *trackID;
     NSDictionary *rep;
     IFSiTunesTrack  *track;
@@ -221,50 +217,39 @@ - (void)reload {
     [track release];
   }
 
-  NSMutableDictionary *idPlMap;
-  playlists = [lib objectForKey:@"Playlists"];
-  count     = [playlists count];
-  idPlMap   = [[NSMutableDictionary alloc] initWithCapacity:count];
+  NSArray *playlists = [lib objectForKey:@"Playlists"];
+  count = [playlists count];
+  NSMutableDictionary *idPlMap = [[NSMutableDictionary alloc]
+                                                       initWithCapacity:count];
 
-  for (i = 0; i < count; i++) {
-    NSDictionary   *plRep;
-    IFSiTunesPlaylist *pl;
-    NSString       *plId;
-  
-    plRep = [playlists objectAtIndex:i];
-    pl    = [[IFSiTunesPlaylist alloc] initWithLibraryRepresentation:plRep
-                                    lib:self];
+  for (NSUInteger i = 0; i < count; i++) {
+    NSDictionary *plRep = [playlists objectAtIndex:i];
+    IFSiTunesPlaylist *pl = [[IFSiTunesPlaylist alloc]
+                                                initWithLibraryRepresentation:plRep
+                                                lib:self];
 
     // only record top-level playlist, if playlist isn't a folder itself
     if (![pl parentId]) {
       [self->plMap setItem:pl
                    forName:[self burnFolderNameFromFolderName:[pl name]]];
     }
 
-    plId = [pl persistentId];
+    id plId = [pl persistentId];
     if (plId)
       [idPlMap setObject:pl forKey:plId];
     [pl release];
   }
 
   // connect children to their parents
   if ([idPlMap count]) {
-    NSArray *ids;
-    
-    ids   = [idPlMap allKeys];
+    NSArray *ids = [idPlMap allKeys];
     count = [ids count];
-    for (i = 0; i < count; i++) {
-      NSString       *plId;
-      IFSiTunesPlaylist *pl;
-      NSString       *parentId;
-
-      plId     = [ids objectAtIndex:i];
-      pl       = [idPlMap objectForKey:plId];
-      parentId = [pl parentId];
+    for (NSUInteger i = 0; i < count; i++) {
+      id plId = [ids objectAtIndex:i];
+      IFSiTunesPlaylist *pl = [idPlMap objectForKey:plId];
+      id parentId = [pl parentId];
       if (parentId) {
-        IFSiTunesPlaylist *parent;
-        
-        parent = [idPlMap objectForKey:parentId];
+        IFSiTunesPlaylist *parent = [idPlMap objectForKey:parentId];
         if (parent) {
           [parent addChild:pl
                   withName:[self burnFolderNameFromFolderName:[pl name]]];
@@ -282,8 +267,8 @@ - (void)reload {
         continue;
 
       IFSM3UPlaylist *m3uPl = [[IFSM3UPlaylist alloc]
-                                                     initWithPlaylist:pl
-                                                     useRelativePaths:NO];
+                                               initWithPlaylist:pl
+                                               useRelativePaths:NO];
       [self->m3uMap setItem:m3uPl forName:[m3uPl fileName]];
       [m3uPl release];
     }
@@ -460,7 +445,7 @@ - (IFSiTunesPlaylist *)playlistNamed:(NSString *)_plName {
 }
 
 
-- (IFSiTunesTrack *)trackWithID:(NSString *)_trackID {
+- (IFSiTunesTrack *)trackWithID:(id)_trackID {
   return [self->trackMap objectForKey:_trackID];
 }
 

IFSiTunesPlaylist.h

@@ -49,8 +49,8 @@
 
 @interface IFSiTunesPlaylist : NSObject
 {
-  NSString *persistentId;
-  NSString *parentId;
+  id persistentId;
+  id parentId;
   NSString *name;
   NSMutableArray *savedTracks;
   NSMutableArray *tracks;
@@ -68,8 +68,8 @@
 - (NSDate *)modificationDate;
 
 - (NSString *)name;
-- (NSString *)persistentId;
-- (NSString *)parentId;
+- (id)persistentId;
+- (id)parentId;
 - (NSArray *)tracks;
 
 - (NSUInteger)count;

IFSiTunesPlaylist.m

@@ -243,10 +243,10 @@ - (NSDate *)modificationDate {
   return self->modificationDate;
 }
 
-- (NSString *)persistentId {
+- (id)persistentId {
   return self->persistentId;
 }
-- (NSString *)parentId {
+- (id)parentId {
   return self->parentId;
 }