Changeset 792

Timestamp:

01/29/08 22:07:22 (8 months ago)

Author:

durin42

Message:

Initial version of an improved component management tab. I've done enough to
get the code Ken wrote working with our setup, but we need to add some smarts
so the components can compute their status (eg should upgrade, remove, etc).

Files:

• trunk/CPFPerianPrefPaneController.h (modified) (3 diffs)
• trunk/CPFPerianPrefPaneController.m (modified) (6 diffs)
• trunk/ECQTComponent.h (added)
• trunk/ECQTComponent.m (added)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/PerianPrefPane.nib/classes.nib (modified) (1 diff)
• trunk/PerianPrefPane.nib/info.nib (modified) (1 diff)
• trunk/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)
• trunk/Release/Read Me.rtf (modified) (4 diffs)

trunk/CPFPerianPrefPaneController.h

@@ -84 +84 @@
-        NSMutableString                                         *errorString;
-        
-        NSArray                                                         *componentReplacementInfo;
-        
-        NSURL                                                           *perianForumURL;
-        NSURL                                                           *perianDonateURL;
@@ -111 +109 @@
-
-//Component List
-
+//
-
-//About
@@ -119 +117 @@
-
-@end
+
+NSArray* GetComponentsInFolder(NSString* folder);

trunk/CPFPerianPrefPaneController.m

@@ -1 +1 @@
-#import "CPFPerianPrefPaneController.h"
-#import "UpdateCheckerAppDelegate.h"
+#import "ECQTComponent.h"
-#include <sys/stat.h>
-
@@ -228 +229 @@
-                else
-                        userInstalled = YES;
-
-#warning TODO(durin42) Should filter out components that aren't installed from this list.
-                componentReplacementInfo = [[NSArray alloc] initWithContentsOfFile:[[[self bundle] resourcePath] stringByAppendingPathComponent:ComponentInfoPlist]];
-        }
-        
@@ -362 +360 @@
-        
-        /* A52 Prefs */
-int
-
+unsigned
+ 
-        {
-                /* sanity checks */
@@ -409 +407 @@
-                AuthorizationFree(auth, 0);
-        [errorString release];
-        [componentReplacementInfo release];
-        [super dealloc];
-}
@@ -698 +695 @@
-}
-
-#pragma mark Component Version List
-- (NSArray *)installedComponentsForUser:(BOOL)user
-{
-        NSString *path = [self basePathForType:ComponentTypeQuickTime user:user];
-        NSArray *installedComponents = [[NSFileManager defaultManager] directoryContentsAtPath:path];
-        NSMutableArray *retArray = [[NSMutableArray alloc] initWithCapacity:[installedComponents count]]; 
-        NSEnumerator *componentEnum = [installedComponents objectEnumerator];
-        NSString *component;
-        while ((component = [componentEnum nextObject])) {
-                if ([[component pathExtension] isEqualToString:@"component"])
-                        [retArray addObject:component];
-        }
-        return [retArray autorelease];
-}
-
-- (NSDictionary *)componentInfoForComponent:(NSString *)component userInstalled:(BOOL)user
-{
-        NSString *compName = component;
-        if ([[component pathExtension] isEqualToString:@"component"])
-                compName = [component stringByDeletingPathExtension];
-        NSMutableDictionary *componentInfo = [[NSMutableDictionary alloc] initWithObjectsAndKeys:compName, @"name", NULL];
-        NSBundle *componentBundle = [NSBundle bundleWithPath:[[self basePathForType:ComponentTypeQuickTime 
-                                                                                                                                                   user:user] stringByAppendingPathComponent:component]];
-        NSDictionary *infoDictionary = nil;
-        if (componentBundle)
-                infoDictionary = [componentBundle infoDictionary];
-        if (infoDictionary && [infoDictionary objectForKey:BundleIdentifierKey]) {
-                NSString *componentVersion = [infoDictionary objectForKey:BundleVersionKey];
-                if (componentVersion)
-                        [componentInfo setObject:componentVersion forKey:@"version"];
-                else
-                        [componentInfo setObject:@"Unknown" forKey:@"version"];
-                [componentInfo setObject:(user ? @"User" : @"System") forKey:@"installType"];
-                [componentInfo setObject:[self checkComponentStatusByBundleIdentifier:[componentBundle bundleIdentifier]] forKey:@"status"];
-                [componentInfo setObject:[componentBundle bundleIdentifier] forKey:@"bundleID"];
-        } else {
-                [componentInfo setObject:@"Unknown" forKey:@"version"];
-                [componentInfo setObject:(user ? @"User" : @"System") forKey:@"installType"];
-                NSString *bundleIdent = [NSString stringWithFormat:PERIAN_NO_BUNDLE_ID_FORMAT,compName];
-                [componentInfo setObject:[self checkComponentStatusByBundleIdentifier:bundleIdent] forKey:@"status"];
-                [componentInfo setObject:bundleIdent forKey:@"bundleID"];
-        }
-        return [componentInfo autorelease];
-}
-
-- (NSArray *)installedComponents
-{
-        NSArray *userComponents = [self installedComponentsForUser:YES];
-        NSArray *systemComponents = [self installedComponentsForUser:NO];
-        unsigned numComponents = [userComponents count] + [systemComponents count];
-        NSMutableArray *components = [[NSMutableArray alloc] initWithCapacity:numComponents];
-        NSEnumerator *compEnum = [userComponents objectEnumerator];
-        NSString *compName;
-        while ((compName = [compEnum nextObject]))
-                [components addObject:[self componentInfoForComponent:compName userInstalled:YES]];
-        
-        compEnum = [systemComponents objectEnumerator];
-        while ((compName = [compEnum nextObject]))
-                [components addObject:[self componentInfoForComponent:compName userInstalled:NO]];
-        return [components autorelease];
-}
-
-- (NSString *)checkComponentStatusByBundleIdentifier:(NSString *)bundleID
-{
-        NSString *status = @"OK";
-        NSEnumerator *infoEnum = [componentReplacementInfo objectEnumerator];
-        NSDictionary *infoDict;
-        while ((infoDict = [infoEnum nextObject])) {
-                NSEnumerator *stringsEnum = [[infoDict objectForKey:ObsoletesKey] objectEnumerator];
-                NSString *obsoletedID;
-                while ((obsoletedID = [stringsEnum nextObject]))
-                        if ([obsoletedID isEqualToString:bundleID])
-                                status = [NSString stringWithFormat:@"Obsoleted by %@",[infoDict objectForKey:HumanReadableNameKey]];
-        }
-        return status;
-}
-
-#pragma mark Check Updates
-- (IBAction)updateCheck:(id)sender 
@@ -919 +839 @@
-}
-
+#pragma mark Component Manager
+- (NSArray *)installedComponents
+{
+        NSMutableArray *mComps = [[NSMutableArray alloc] init];
+        
+        NSMutableArray* allComps = [NSMutableArray array];
+        
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"/Library/Components")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"/Library/QuickTime")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"~/Library/QuickTime")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"~/Library/Components")];
+        
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"/Library/Components (Disabled)")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"/Library/QuickTime (Disabled)")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"~/Library/QuickTime (Disabled)")];
+        [allComps addObjectsFromArray:  GetComponentsInFolder(@"~/Library/Components (Disabled)")];
+
+        unsigned x= 0;
+        for (x = 0; x < [allComps count]; x++)
+        {       
+                NSString* comp = [allComps objectAtIndex:x];
+                ECQTComponent* compobj = [ECQTComponent componentWithPath:comp];
+                if (compobj && [compobj name])
+                        [mComps addObject:compobj];
+        }
+        return [mComps autorelease];
+}
+
-@end
+
+NSArray* GetComponentsInFolder(NSString* folder)
+{
+        folder = [folder stringByExpandingTildeInPath];
+        NSFileManager* fm = [NSFileManager defaultManager];
+        NSArray* contents = [fm directoryContentsAtPath:folder];
+        NSMutableArray* newContents = [NSMutableArray array];
+        unsigned x;
+        for (x = 0; x < [contents count]; x++)
+        {
+                NSString* comp = [contents objectAtIndex:x];
+                
+                [newContents addObject:[folder stringByAppendingPathComponent:comp]];
+        }
+        return newContents;
+}

trunk/Perian.xcodeproj/project.pbxproj

@@ -75 +75 @@
-                11207C730C2F4A4E002A0FF0 /* ComponentInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 11207C720C2F4A4E002A0FF0 /* ComponentInfo.plist */; };
-                112E0C820A6436BA00DB4C29 /* FFusionCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = F560DF0003D61D0101ABA332 /* FFusionCodec.c */; };
+                113077FF0D50139500ECDECC /* ECQTComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 113077FD0D50139500ECDECC /* ECQTComponent.m */; };
-                113F589A0A6B091600509987 /* Codecprintf.c in Sources */ = {isa = PBXBuildFile; fileRef = 113F58990A6B091600509987 /* Codecprintf.c */; };
-                11629EE10B51E482006591C8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 11629EE00B51E482006591C8 /* main.m */; };
@@ -440 +441 @@
-                089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-                11207C720C2F4A4E002A0FF0 /* ComponentInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = ComponentInfo.plist; path = Plists/ComponentInfo.plist; sourceTree = "<group>"; };
+                113077FD0D50139500ECDECC /* ECQTComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ECQTComponent.m; sourceTree = "<group>"; };
+                113077FE0D50139500ECDECC /* ECQTComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECQTComponent.h; sourceTree = "<group>"; };
-                113F58980A6B091600509987 /* Codecprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Codecprintf.h; sourceTree = "<group>"; };
-                113F58990A6B091600509987 /* Codecprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Codecprintf.c; sourceTree = "<group>"; };
@@ -1115 +1118 @@
-                        isa = PBXGroup;
-                        children = (
+                                113077FD0D50139500ECDECC /* ECQTComponent.m */,
+                                113077FE0D50139500ECDECC /* ECQTComponent.h */,
-                                83D1D6E00B4C81F200E09EC9 /* CPFPerianPrefPaneController.h */,
-                                83D1D6E10B4C81F200E09EC9 /* CPFPerianPrefPaneController.m */,
@@ -1692 +1697 @@
-                        files = (
-                                83D1D6E20B4C81F200E09EC9 /* CPFPerianPrefPaneController.m in Sources */,
+                                113077FF0D50139500ECDECC /* ECQTComponent.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/PerianPrefPane.nib/classes.nib

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/PerianPrefPane.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-        <key>IBDocumentLocation</key>
-        <string>112 62 356 240 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-
+
+
+
+
+
-        <key>IBOpenObjects</key>
-        <array>
-5
+133
-        </array>
-        <key>IBSystem Version</key>
-
+
+
+
-</dict>
-</plist>

trunk/Release/Read Me.rtf

@@ -1 @@
-mac\ansicpg10000\cocoartf824\cocoasubrtf420
-77 Helvetica-Bold;\f1\fswiss\fcharset77
+ansi\ansicpg1252\cocoartf949
+0
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww16040\viewh15820\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\f0\b\fs24 \cf0 About
-f1\
+
-Perian aims at providing a single package to provide all your playback needs.  It is a collection of QuickTime components incorporating several libraries:\
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
+9
-\
-The code is available under the LGPL. The project site is located at <http://trac.perian.org/> and the project subversion repository is located at <http://svn.perian.org/>.\
@@ -41 +40 @@
-\
-
-f0\
-f1\
+
+
-To use Perian, open the disk image, and double click on the Perian.prefPane icon.  It will automatically install and update all of its components.\
-\
-
-f0\
-f1\
+
+
-Graham Booker - Dev and hosting\
-David Conrad - Dev\
@@ -56 +55 @@
-\
-
-f0\
-f1\
-8er\'99me Cornet and his FFusion project for giving me the idea and code to start from Christoph N\'8a
+
+
+e9r\'f4me Cornet and his FFusion project for giving me the idea and code to start from Christoph N\'e4
-FFMPEG project for providing such a rich library.\
-81
+c5
-Adrian Thurston for the Ragel parser generator.\
-Matroska for their library.\
@@ -66 +65 @@
-\cf0 Bryan Bortz for the icon.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-
-
+
-\
-\
-
-f0\
+
-\
-
-f1\
+
-                       Version 2.1, February 1999\
-\