]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
Ghost packages suck.
[cydia.git] / Cydia.mm
index b525d61c073337abc3998727e5e298f428f7187e..8702e29a2773fe24d67728b8862a8cbb639cc632 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1,7 +1,9 @@
 /* #include Directives {{{ */
 #include <Foundation/NSURL.h>
 #include <UIKit/UIKit.h>
-#import <GraphicsServices/GraphicsServices.h>
+#include <GraphicsServices/GraphicsServices.h>
+
+#include <objc/objc.h>
 
 #include <sstream>
 #include <ext/stdio_filebuf.h>
 #include <apt-pkg/sptr.h>
 
 #include <sys/sysctl.h>
+#include <notify.h>
+
+extern "C" {
+#include <mach-o/nlist.h>
+}
+
+#include <stdio.h>
+#include <stdlib.h>
 
 #include <errno.h>
 #include <pcre.h>
         exit(-1); \
     } \
 while (false)
-/* }}} */
 
+#define _not(type) ((type) ~ (type) 0)
+/* }}} */
+/* Miscellaneous Messages {{{ */
 @interface WebView
 - (void) setApplicationNameForUserAgent:(NSString *)applicationName;
+- (id) frameLoadDelegate;
+- (void) setFrameLoadDelegate:(id)delegate;
+@end
+
+@interface NSString (Cydia)
+- (NSString *) stringByAddingPercentEscapes;
+- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
+@end
+/* }}} */
+
+#ifdef SRK_ASPEN
+#define UITable UITableView
+#endif
+
+OBJC_EXPORT const char *class_getName(Class cls);
+
+/* Reset View (UIView) {{{ */
+@interface UIView (CYResetView)
+- (void) resetViewAnimated:(BOOL)animated;
+@end
+
+@implementation UIView (CYResetView)
+
+- (void) resetViewAnimated:(BOOL)animated {
+    fprintf(stderr, "%s\n", class_getName(self->isa));
+    _assert(false);
+}
+
+@end
+/* }}} */
+/* Reset View (UITable) {{{ */
+@interface UITable (CYResetView)
+- (void) resetViewAnimated:(BOOL)animated;
+@end
+
+@implementation UITable (CYResetView)
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [self selectRow:-1 byExtendingSelection:NO withFade:animated];
+}
+
+@end
+/* }}} */
+/* Reset View (UISectionList) {{{ */
+@interface UISectionList (CYResetView)
+- (void) resetViewAnimated:(BOOL)animated;
+@end
+
+@implementation UISectionList (CYResetView)
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [[self table] resetViewAnimated:animated];
+}
+
 @end
+/* }}} */
+
+/* Perl-Compatible RegEx {{{ */
+class Pcre {
+  private:
+    pcre *code_;
+    pcre_extra *study_;
+    int capture_;
+    int *matches_;
+    const char *data_;
+
+  public:
+    Pcre(const char *regex) :
+        study_(NULL)
+    {
+        const char *error;
+        int offset;
+        code_ = pcre_compile(regex, 0, &error, &offset, NULL);
+
+        if (code_ == NULL) {
+            fprintf(stderr, "%d:%s\n", offset, error);
+            _assert(false);
+        }
+
+        pcre_fullinfo(code_, study_, PCRE_INFO_CAPTURECOUNT, &capture_);
+        matches_ = new int[(capture_ + 1) * 3];
+    }
+
+    ~Pcre() {
+        pcre_free(code_);
+        delete matches_;
+    }
+
+    NSString *operator [](size_t match) {
+        return [NSString
+            stringWithCString:(data_ + matches_[match * 2])
+            length:(matches_[match * 2 + 1] - matches_[match * 2])
+        ];
+    }
+
+    bool operator ()(const char *data, size_t size) {
+        data_ = data;
+        return pcre_exec(code_, study_, data, size, 0, 0, matches_, (capture_ + 1) * 3) >= 0;
+    }
+};
+/* }}} */
+/* CoreGraphicsServices Primitives {{{ */
+class CGColor {
+  private:
+    CGColorRef color_;
+
+  public:
+    CGColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
+        float color[] = {red, green, blue, alpha};
+        color_ = CGColorCreate(space, color);
+    }
+
+    ~CGColor() {
+        CGColorRelease(color_);
+    }
+
+    operator CGColorRef() {
+        return color_;
+    }
+};
+
+class GSFont {
+  private:
+    GSFontRef font_;
+
+  public:
+    ~GSFont() {
+        /* XXX: no GSFontRelease()? */
+        CFRelease(font_);
+    }
+};
+/* }}} */
 
 static const int PulseInterval_ = 50000;
+
+const char *Firmware_ = NULL;
 const char *Machine_ = NULL;
 const char *SerialNumber_ = NULL;
 
-@interface NSString (CydiaBypass)
-- (NSString *) stringByAddingPercentEscapes;
-@end
+unsigned Major_;
+unsigned Minor_;
+unsigned BugFix_;
+
+#define FW_LEAST(major, minor, bugfix) \
+    (major < Major_ || major == Major_ && \
+        (minor < Minor_ || minor == Minor_ && \
+            bugfix <= BugFix_))
+
+bool bootstrap_ = false;
+
+static NSMutableDictionary *Metadata_;
+static NSMutableDictionary *Packages_;
+static NSDate *now_;
+
+NSString *GetLastUpdate() {
+    NSDate *update = [Metadata_ objectForKey:@"LastUpdate"];
+
+    if (update == nil)
+        return @"Never or Unknown";
+
+    CFLocaleRef locale = CFLocaleCopyCurrent();
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    CFStringRef formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) update);
+
+    CFRelease(formatter);
+    CFRelease(locale);
+
+    return [(NSString *) formatted autorelease];
+}
 
 @protocol ProgressDelegate
 - (void) setError:(NSString *)error;
@@ -66,6 +238,32 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
+static const float TextViewOffset_ = 22;
+
+UITextView *GetTextView(NSString *value, float left, bool html) {
+    UITextView *text([[[UITextView alloc] initWithFrame:CGRectMake(left, 3, 310 - left, 1000)] autorelease]);
+    [text setEditable:NO];
+    [text setTextSize:16];
+    if (html)
+        [text setHTML:value];
+    else
+        [text setText:value];
+    [text setEnabled:NO];
+
+    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    CGColor clear(space, 0, 0, 0, 0);
+    [text setBackgroundColor:clear];
+    CGColorSpaceRelease(space);
+
+    CGRect frame = [text frame];
+    [text setFrame:frame];
+    CGRect rect = [text visibleTextRect];
+    frame.size.height = rect.size.height;
+    [text setFrame:frame];
+
+    return text;
+}
+
 /* Status Delegation {{{ */
 class Status :
     public pkgAcquireStatus
@@ -98,7 +296,13 @@ class Status :
     }
 
     virtual void Fail(pkgAcquire::ItemDesc &item) {
-        [delegate_ performSelectorOnMainThread:@selector(setStatusFail) withObject:nil waitUntilDone:YES];
+        if (
+            item.Owner->Status == pkgAcquire::Item::StatIdle ||
+            item.Owner->Status == pkgAcquire::Item::StatDone
+        )
+            return;
+
+        [delegate_ setError:[NSString stringWithCString:item.Owner->ErrorText.c_str()]];
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {
@@ -163,6 +367,8 @@ extern NSString *kUIButtonBarButtonTitleWidth;
 extern NSString *kUIButtonBarButtonType;
 /* }}} */
 /* Mime Addresses {{{ */
+Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
+
 @interface Address : NSObject {
     NSString *name_;
     NSString *email_;
@@ -200,26 +406,12 @@ extern NSString *kUIButtonBarButtonType;
 
 - (Address *) initWithString:(NSString *)string {
     if ((self = [super init]) != nil) {
-        const char *error;
-        int offset;
-        pcre *code = pcre_compile("^\"?(.*)\"? <([^>]*)>$", 0, &error, &offset, NULL);
-
-        if (code == NULL) {
-            fprintf(stderr, "%d:%s\n", offset, error);
-            _assert(false);
-        }
-
-        pcre_extra *study = NULL;
-        int capture;
-        pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
-        int matches[(capture + 1) * 3];
-
-        size_t size = [string length];
         const char *data = [string UTF8String];
+        size_t size = [string length];
 
-        if (pcre_exec(code, study, data, size, 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0) {
-            name_ = [[NSString stringWithCString:(data + matches[2]) length:(matches[3] - matches[2])] retain];
-            email_ = [[NSString stringWithCString:(data + matches[4]) length:(matches[5] - matches[4])] retain];
+        if (email_r(data, size)) {
+            name_ = [email_r[1] retain];
+            email_ = [email_r[2] retain];
         } else {
             name_ = [[NSString stringWithCString:data length:size] retain];
             email_ = nil;
@@ -278,59 +470,10 @@ inline float interpolate(float begin, float end, float fraction) {
 }
 /* }}} */
 
-/* Reset View {{{ */
-@interface ResetView : UIView {
-    UINavigationBar *navbar_;
-    bool resetting_;
-}
-
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item;
-
-- (void) dealloc;
-- (void) resetView;
-- (void) _resetView;
-- (NSString *) leftTitle;
-- (NSString *) rightTitle;
-@end
-
-@implementation ResetView
-
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
-    if ([[navbar_ navigationItems] count] == 1)
-        [self _resetView];
-}
-
-- (void) dealloc {
-    [navbar_ release];
-    [super dealloc];
-}
-
-- (void) resetView {
-    resetting_ = true;
-    if ([[navbar_ navigationItems] count] == 1)
-        [self _resetView];
-    else while ([[navbar_ navigationItems] count] != 1)
-        [navbar_ popNavigationItem];
-    resetting_ = false;
-}
-
-- (void) _resetView {
-    [navbar_ showButtonsWithLeftTitle:[self leftTitle] rightTitle:[self rightTitle]];
-}
-
-- (NSString *) leftTitle {
-    return nil;
-}
-
-- (NSString *) rightTitle {
-    return nil;
-}
-
-@end
-/* }}} */
-
 @class Package;
+@class Source;
 
+/* Database Interface {{{ */
 @interface Database : NSObject {
     pkgCacheFile cache_;
     pkgRecords *records_;
@@ -338,6 +481,10 @@ inline float interpolate(float begin, float end, float fraction) {
     pkgAcquire *fetcher_;
     FileFd *lock_;
     SPtr<pkgPackageManager> manager_;
+    pkgSourceList *list_;
+
+    NSMutableDictionary *sources_;
+    NSMutableArray *packages_;
 
     id delegate_;
     Status status_;
@@ -345,6 +492,8 @@ inline float interpolate(float begin, float end, float fraction) {
     int statusfd_;
 }
 
+- (void) dealloc;
+
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 
@@ -355,6 +504,7 @@ inline float interpolate(float begin, float end, float fraction) {
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
+- (NSArray *) packages;
 - (void) reloadData;
 
 - (void) prepare;
@@ -363,184 +513,184 @@ inline float interpolate(float begin, float end, float fraction) {
 - (void) upgrade;
 
 - (void) setDelegate:(id)delegate;
+- (Source *) getSource:(const pkgCache::PkgFileIterator &)file;
 @end
+/* }}} */
 
-/* Package Class {{{ */
-@interface Package : NSObject {
-    pkgCache::PkgIterator iterator_;
-    Database *database_;
-    pkgRecords::Parser *parser_;
-    pkgCache::VerIterator version_;
-    pkgCache::VerFileIterator file_;
+/* Reset View {{{ */
+@interface ResetView : UIView {
+    UIPushButton *configure_;
+    UIPushButton *reload_;
+    NSMutableArray *views_;
+    UINavigationBar *navbar_;
+    UITransitionView *transition_;
+    bool resetting_;
+    id delegate_;
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+- (void) dealloc;
 
-- (NSString *) name;
-- (NSString *) section;
-- (NSString *) latest;
-- (NSString *) installed;
-- (Address *) maintainer;
-- (size_t) size;
-- (NSString *) tagline;
-- (NSString *) description;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
+- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item;
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
 
-- (void) install;
-- (void) remove;
-@end
+- (id) initWithFrame:(CGRect)frame;
+- (void) setDelegate:(id)delegate;
 
-@implementation Package
+- (void) configurePushed;
+- (void) reloadPushed;
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
-    if ((self = [super init]) != nil) {
-        iterator_ = iterator;
-        database_ = database;
+- (void) pushView:(UIView *)view withTitle:(NSString *)title backButtonTitle:(NSString *)back rightButton:(NSString *)right;
+- (void) popViews:(unsigned)views;
+- (void) resetView:(BOOL)clear;
+- (void) _resetView;
+- (void) setPrompt;
+@end
 
-        version_ = version;
-        file_ = file;
-        parser_ = &[database_ records]->Lookup(file);
-    } return self;
-}
+@implementation ResetView
 
-+ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
-    for (pkgCache::VerIterator version = iterator.VersionList(); !version.end(); ++version)
-        for (pkgCache::VerFileIterator file = version.FileList(); !file.end(); ++file)
-            return [[[Package alloc]
-                initWithIterator:iterator 
-                database:database
-                version:version
-                file:file]
-            autorelease];
-    return nil;
+- (void) dealloc {
+    [configure_ release];
+    [reload_ release];
+    [transition_ release];
+    [navbar_ release];
+    [views_ release];
+    [super dealloc];
 }
 
-- (NSString *) name {
-    return [[NSString stringWithCString:iterator_.Name()] lowercaseString];
-}
+- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
+    [views_ removeLastObject];
+    UIView *view([views_ lastObject]);
+    [view resetViewAnimated:!resetting_];
 
-- (NSString *) section {
-    return [NSString stringWithCString:iterator_.Section()];
+    if (!resetting_) {
+        [transition_ transition:2 toView:view];
+        [self _resetView];
+    }
 }
 
-- (NSString *) latest {
-    return [NSString stringWithCString:version_.VerStr()];
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
 }
 
-- (NSString *) installed {
-    return iterator_.CurrentVer().end() ? nil : [NSString stringWithCString:iterator_.CurrentVer().VerStr()];
-}
+- (id) initWithFrame:(CGRect)frame {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        views_ = [[NSMutableArray arrayWithCapacity:4] retain];
 
-- (Address *) maintainer {
-    return [Address addressWithString:[NSString stringWithCString:parser_->Maintainer().c_str()]];
-}
+        struct CGRect bounds = [self bounds];
+        CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
+        CGRect navrect = {{0, 0}, navsize};
 
-- (size_t) size {
-    return version_->InstalledSize;
+        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
+        [self addSubview:navbar_];
+
+        [navbar_ setBarStyle:1];
+        [navbar_ setDelegate:self];
+
+        transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
+            bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
+        )];
+
+        //configure_ = [[UIPushButton alloc] initWithFrame:CGRectMake(15, 9, 17, 18)];
+        configure_ = [[UIPushButton alloc] initWithFrame:CGRectMake(10, 9, 17, 18)];
+        [configure_ setShowPressFeedback:YES];
+        [configure_ setImage:[UIImage applicationImageNamed:@"configure.png"]];
+        [configure_ addTarget:self action:@selector(configurePushed) forEvents:1];
+
+        //reload_ = [[UIPushButton alloc] initWithFrame:CGRectMake(288, 5, 18, 22)];
+        reload_ = [[UIPushButton alloc] initWithFrame:CGRectMake(293, 5, 18, 22)];
+        [reload_ setShowPressFeedback:YES];
+        [reload_ setImage:[UIImage applicationImageNamed:@"reload.png"]];
+        [reload_ addTarget:self action:@selector(reloadPushed) forEvents:1];
+
+        [navbar_ addSubview:configure_];
+        [navbar_ addSubview:reload_];
+
+        [self addSubview:transition_];
+    } return self;
 }
 
-- (NSString *) tagline {
-    return [NSString stringWithCString:parser_->ShortDesc().c_str()];
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
 }
 
-- (NSString *) description {
-    return [NSString stringWithCString:parser_->LongDesc().c_str()];
+- (void) configurePushed {
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:@"Sources Unimplemented"
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:self
+    ] autorelease];
+
+    [sheet setBodyText:@"This feature will be implemented soon. In the mean time, you may add sources by adding .list files to '/etc/apt/sources.list.d' or modifying '/etc/apt/sources.list'."];
+    [sheet popupAlertAnimated:YES];
 }
 
-- (NSComparisonResult) compareBySectionAndName:(Package *)package {
-    NSComparisonResult result = [[self section] compare:[package section]];
-    if (result != NSOrderedSame)
-        return result;
-    return [[self name] compare:[package name]];
+- (void) reloadPushed {
+    [delegate_ update];
 }
 
-- (void) install {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    [database_ cache]->MarkInstall(iterator_, false);
-}
+- (void) pushView:(UIView *)view withTitle:(NSString *)title backButtonTitle:(NSString *)back rightButton:(NSString *)right {
+    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:title] autorelease];
+    [navbar_ pushNavigationItem:navitem];
+    [navitem setBackButtonTitle:back];
 
-- (void) remove {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    resolver->Remove(iterator_);
-    [database_ cache]->MarkDelete(iterator_, true);
-}
+    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
 
-@end
-/* }}} */
-/* Section Class {{{ */
-@interface Section : NSObject {
-    NSString *name_;
-    size_t row_;
-    NSMutableArray *packages_;
+    [transition_ transition:([views_ count] == 0 ? 0 : 1) toView:view];
+    [views_ addObject:view];
 }
 
-- (void) dealloc;
+- (void) popViews:(unsigned)views {
+    resetting_ = true;
+    for (unsigned i(0); i != views; ++i)
+        [navbar_ popNavigationItem];
+    resetting_ = false;
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row;
-- (NSString *) name;
-- (size_t) row;
-- (void) addPackage:(Package *)package;
-@end
+    [self _resetView];
+    [transition_ transition:2 toView:[views_ lastObject]];
+}
 
-@implementation Section
+- (void) resetView:(BOOL)clear {
+    resetting_ = true;
 
-- (void) dealloc {
-    [name_ release];
-    [packages_ release];
-    [super dealloc];
-}
+    if ([views_ count] > 1) {
+        [navbar_ disableAnimation];
+        while ([views_ count] != (clear ? 1 : 2))
+            [navbar_ popNavigationItem];
+        [navbar_ enableAnimation];
+        if (!clear)
+            [navbar_ popNavigationItem];
+    }
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row {
-    if ((self = [super init]) != nil) {
-        name_ = [name retain];
-        row_ = row;
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
-    } return self;
-}
+    resetting_ = false;
 
-- (NSString *) name {
-    return name_;
+    [self _resetView];
+    [transition_ transition:(clear ? 0 : 2) toView:[views_ lastObject]];
 }
 
-- (size_t) row {
-    return row_;
+- (void) _resetView {
+    [navbar_ showButtonsWithLeftTitle:nil rightTitle:nil];
 }
 
-- (void) addPackage:(Package *)package {
-    [packages_ addObject:package];
+- (void) setPrompt {
+    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
 }
 
 @end
 /* }}} */
-
 /* Confirmation View {{{ */
 void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
     if ([packages count] == 0)
         return;
 
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    float clear[] = {0, 0, 0, 0};
-    float blue[] = {0, 0, 0.4, 1};
-
-    UITextView *text([[[UITextView alloc] initWithFrame: CGRectMake(110, 3, 200, 60)] autorelease]);
-    [text setEditable:NO];
-    [text setTextSize:16];
-    [text setBackgroundColor:CGColorCreate(space, clear)];
-    [text setTextColor:CGColorCreate(space, blue)];
-    [text setText:([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "])];
-    [text setEnabled:NO];
-
-    CGRect frame([text frame]);
-    CGSize size([text contentSize]);
-    frame.size.height = size.height;
-    [text setFrame:frame];
-
+    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 110, false);
     [fields setObject:text forKey:key];
+
+    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    CGColor blue(space, 0, 0, 0.4, 1);
+    [text setTextColor:blue];
+    CGColorSpaceRelease(space);
 }
 
 @protocol ConfirmationViewDelegate
@@ -646,8 +796,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         return proposed;
     else {
         _assert(size_t(row) < [fields_ count]);
-        fprintf(stderr, "%f\n", [[[fields_ allValues] objectAtIndex:row] contentSize].height);
-        return [[[fields_ allValues] objectAtIndex:row] contentSize].height;
+        return [[[fields_ allValues] objectAtIndex:row] visibleTextRect].size.height + TextViewOffset_;
     }
 }
 
@@ -722,23 +871,31 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
 
-        bool essential(false);
+        bool install(false);
+        bool upgrade(false);
+        bool remove(false);
 
         pkgCacheFile &cache([database_ cache]);
         for (pkgCache::PkgIterator iterator = cache->PkgBegin(); !iterator.end(); ++iterator) {
             NSString *name([NSString stringWithCString:iterator.Name()]);
-            if (cache[iterator].NewInstall())
+            bool essential((iterator->Flags & pkgCache::Flag::Essential) != 0);
+
+            if (cache[iterator].NewInstall()) {
+                if (essential)
+                    install = true;
                 [installing addObject:name];
-            else if (cache[iterator].Upgrade())
+            } else if (cache[iterator].Upgrade()) {
+                if (essential)
+                    upgrade = true;
                 [upgrading addObject:name];
-            else if (cache[iterator].Delete()) {
+            } else if (cache[iterator].Delete()) {
+                if (essential)
+                    remove = true;
                 [removing addObject:name];
-                if ((iterator->Flags & pkgCache::Flag::Essential) != 0)
-                    essential = true;
             }
         }
 
-        if (!essential)
+        if (!remove)
             essential_ = nil;
         else {
             essential_ = [[UIAlertSheet alloc]
@@ -779,1209 +936,2497 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 @end
 /* }}} */
-/* Package View {{{ */
-@interface PackageView : UIView {
-    UIPreferencesTable *table_;
-    Package *package_;
-    Database *database_;
-    NSMutableArray *cells_;
-    id delegate_;
+
+/* Source Class {{{ */
+@interface Source : NSObject {
+    NSString *description_;
+    NSString *label_;
+    NSString *origin_;
+
+    NSString *uri_;
+    NSString *distribution_;
+    NSString *type_;
+    NSString *version_;
+
+    NSString *defaultIcon_;
+
+    BOOL trusted_;
 }
 
 - (void) dealloc;
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table;
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group;
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group;
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group;
+- (Source *) initWithMetaIndex:(metaIndex *)index;
 
-- (BOOL) canSelectRow:(int)row;
-- (void) tableRowSelected:(NSNotification *)notification;
+- (BOOL) trusted;
 
-- (id) initWithFrame:(struct CGRect)frame database:(Database *)database;
-- (void) setPackage:(Package *)package;
-- (void) setDelegate:(id)delegate;
+- (NSString *) uri;
+- (NSString *) distribution;
+- (NSString *) type;
+
+- (NSString *) description;
+- (NSString *) label;
+- (NSString *) origin;
+- (NSString *) version;
+
+- (NSString *) defaultIcon;
 @end
 
-@implementation PackageView
+@implementation Source
 
 - (void) dealloc {
-    if (package_ != nil)
-        [package_ release];
-    [table_ release];
-    [database_ release];
-    [cells_ release];
-    [super dealloc];
-}
+    [uri_ release];
+    [distribution_ release];
+    [type_ release];
+
+    if (description_ != nil)
+        [description_ release];
+    if (label_ != nil)
+        [label_ release];
+    if (origin_ != nil)
+        [origin_ release];
+    if (version_ != nil)
+        [version_ release];
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 2;
+    [super dealloc];
 }
 
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return @"Specifics";
-        case 1: return @"Description";
+- (Source *) initWithMetaIndex:(metaIndex *)index {
+    if ((self = [super init]) != nil) {
+        trusted_ = index->IsTrusted();
 
-        default: _assert(false);
-    }
-}
+        uri_ = [[NSString stringWithCString:index->GetURI().c_str()] retain];
+        distribution_ = [[NSString stringWithCString:index->GetDist().c_str()] retain];
+        type_ = [[NSString stringWithCString:index->GetType()] retain];
 
-- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
-    switch (group) {
-        case 0: return 6;
-        case 1: return 1;
+        description_ = nil;
+        label_ = nil;
+        origin_ = nil;
 
-        default: _assert(false);
-    }
+        debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
+        if (dindex != NULL) {
+            std::ifstream release(dindex->MetaIndexFile("Release").c_str());
+            std::string line;
+            while (std::getline(release, line)) {
+                std::string::size_type colon(line.find(':'));
+                if (colon == std::string::npos)
+                    continue;
+
+                std::string name(line.substr(0, colon));
+                std::string value(line.substr(colon + 1));
+                while (!value.empty() && value[0] == ' ')
+                    value = value.substr(1);
+
+                if (name == "Default-Icon")
+                    defaultIcon_ = [[NSString stringWithCString:value.c_str()] retain];
+                else if (name == "Description")
+                    description_ = [[NSString stringWithCString:value.c_str()] retain];
+                else if (name == "Label")
+                    label_ = [[NSString stringWithCString:value.c_str()] retain];
+                else if (name == "Origin")
+                    origin_ = [[NSString stringWithCString:value.c_str()] retain];
+                else if (name == "Version")
+                    version_ = [[NSString stringWithCString:value.c_str()] retain];
+            }
+        }
+    } return self;
 }
 
-- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
-    UIPreferencesTableCell *cell;
-
-    switch (group) {
-        case 0: switch (row) {
-            case 0:
-                cell = [cells_ objectAtIndex:0];
-                [cell setTitle:@"Name"];
-                [cell setValue:[package_ name]];
-            break;
-
-            case 1: {
-                cell = [cells_ objectAtIndex:1];
-                [cell setTitle:@"Installed"];
-                NSString *installed([package_ installed]);
-                [cell setValue:(installed == nil ? @"n/a" : installed)];
-            } break;
-
-            case 2:
-                cell = [cells_ objectAtIndex:2];
-                [cell setTitle:@"Latest"];
-                [cell setValue:[package_ latest]];
-            break;
-
-            case 3:
-                cell = [cells_ objectAtIndex:3];
-                [cell setTitle:@"Section"];
-                [cell setValue:[package_ section]];
-            break;
+- (BOOL) trusted {
+    return trusted_;
+}
 
-            case 4:
-                cell = [cells_ objectAtIndex:4];
-                [cell setTitle:@"Size"];
-                [cell setValue:SizeString([package_ size])];
-            break;
+- (NSString *) uri {
+    return uri_;
+}
 
-            case 5:
-                cell = [cells_ objectAtIndex:5];
-                [cell setTitle:@"Maintainer"];
-                [cell setValue:[[package_ maintainer] name]];
-                [cell setShowDisclosure:YES];
-                [cell setShowSelection:YES];
-            break;
+- (NSString *) distribution {
+    return distribution_;
+}
 
-            default: _assert(false);
-        } break;
+- (NSString *) type {
+    return type_;
+}
 
-        case 1: switch (row) {
-            case 0:
-                cell = [cells_ objectAtIndex:6];
-                [cell setTitle:nil];
-                [cell setValue:[package_ tagline]];
-            break;
+- (NSString *) description {
+    return description_;
+}
 
-            case 1:
-                cell = [cells_ objectAtIndex:7];
-                [cell setTitle:@"Description"];
-                [cell setValue:[package_ description]];
-            break;
-        } break;
+- (NSString *) label {
+    return label_;
+}
 
-        default: _assert(false);
-    }
+- (NSString *) origin {
+    return origin_;
+}
 
-    return cell;
+- (NSString *) version {
+    return version_;
 }
 
-- (BOOL) canSelectRow:(int)row {
-    return YES;
+- (NSString *) defaultIcon {
+    return defaultIcon_;
 }
 
-- (void) tableRowSelected:(NSNotification *)notification {
-    switch ([table_ selectedRow]) {
-        case 5:
-            [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-                [[package_ maintainer] email],
-                [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
-            ]]];
-        break;
+@end
+/* }}} */
+/* Package Class {{{ */
+NSString *Scour(const char *field, const char *begin, const char *end) {
+    size_t i(0), l(strlen(field));
+
+    for (;;) {
+        const char *name = begin + i;
+        const char *colon = name + l;
+        const char *value = colon + 1;
+
+        if (
+            value < end &&
+            *colon == ':' &&
+            memcmp(name, field, l) == 0
+        ) {
+            while (value != end && value[0] == ' ')
+                ++value;
+            const char *line = std::find(value, end, '\n');
+            while (line != value && line[-1] == ' ')
+                --line;
+            return [NSString stringWithCString:value length:(line - value)];
+        } else {
+            begin = std::find(begin, end, '\n');
+            if (begin == end)
+                return nil;
+            ++begin;
+        }
     }
 }
 
-- (id) initWithFrame:(struct CGRect)frame database:(Database *)database {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        database_ = [database retain];
+@interface Package : NSObject {
+    pkgCache::PkgIterator iterator_;
+    Database *database_;
+    pkgCache::VerIterator version_;
+    pkgCache::VerFileIterator file_;
+    Source *source_;
 
-        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
-        [self addSubview:table_];
+    NSString *latest_;
+    NSString *installed_;
 
-        [table_ setDataSource:self];
-        [table_ setDelegate:self];
+    NSString *id_;
+    NSString *name_;
+    NSString *tagline_;
+    NSString *icon_;
+    NSString *website_;
+}
 
-        cells_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (void) dealloc;
 
-        for (unsigned i = 0; i != 8; ++i) {
-            UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
-            [cell setShowSelection:NO];
-            [cells_ addObject:cell];
-        }
-    } return self;
-}
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 
-- (void) setPackage:(Package *)package {
-    package_ = [package retain];
-    [table_ reloadData];
-}
+- (NSString *) section;
+- (Address *) maintainer;
+- (size_t) size;
+- (NSString *) description;
+- (NSString *) index;
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-}
+- (NSDate *) seen;
 
-@end
-/* }}} */
-/* Package Cell {{{ */
-@protocol PackageCellDelegate
-- (NSString *) versionWithPackage:(Package *)package;
-@end
+- (NSString *) latest;
+- (NSString *) installed;
+- (BOOL) upgradable;
+- (BOOL) essential;
+- (BOOL) broken;
 
-@interface PackageCell : UITableCell {
-    UITextLabel *name_;
-    UIRightTextLabel *version_;
-    UITextLabel *description_;
-}
+- (NSString *) id;
+- (NSString *) name;
+- (NSString *) tagline;
+- (NSString *) icon;
+- (NSString *) website;
 
-- (void) dealloc;
+- (Source *) source;
 
-- (PackageCell *) initWithPackage:(Package *)package delegate:(id)delegate;
+- (BOOL) matches:(NSString *)text;
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (NSComparisonResult) compareByName:(Package *)package;
+- (NSComparisonResult) compareBySectionAndName:(Package *)package;
+- (NSComparisonResult) compareForChanges:(Package *)package;
 
+- (void) install;
+- (void) remove;
 @end
 
-@implementation PackageCell
+@implementation Package
 
 - (void) dealloc {
-    [name_ release];
-    [version_ release];
-    [description_ release];
+    [latest_ release];
+    if (installed_ != nil)
+        [installed_ release];
+
+    [id_ release];
+    if (name_ != nil)
+        [name_ release];
+    [tagline_ release];
+    if (icon_ != nil)
+        [icon_ release];
+    if (website_ != nil)
+        [website_ release];
+
+    if (source_ != nil)
+        [source_ release];
+
     [super dealloc];
 }
 
-- (PackageCell *) initWithPackage:(Package *)package delegate:(id)delegate {
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
     if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
-
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        float clear[] = {0, 0, 0, 0};
-
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 7, 250, 25)];
-        [name_ setText:[package name]];
-        [name_ setBackgroundColor:CGColorCreate(space, clear)];
-        [name_ setFont:bold];
-
-        version_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(290, 7, 70, 25)];
-        [version_ setText:[delegate versionWithPackage:package]];
-        [version_ setBackgroundColor:CGColorCreate(space, clear)];
-        [version_ setFont:large];
+        iterator_ = iterator;
+        database_ = database;
 
-        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(13, 35, 315, 20)];
-        [description_ setText:[package tagline]];
-        [description_ setBackgroundColor:CGColorCreate(space, clear)];
-        [description_ setFont:small];
+        version_ = version;
+        file_ = file;
 
-        [self addSubview:name_];
-        [self addSubview:version_];
-        [self addSubview:description_];
+        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
 
-        CFRelease(small);
-        CFRelease(large);
-        CFRelease(bold);
-    } return self;
-}
+        const char *begin, *end;
+        parser->GetRec(begin, end);
 
-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+        latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
+        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
 
-    float black[] = {
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0};
+        id_ = [[[NSString stringWithCString:iterator_.Name()] lowercaseString] retain];
+        name_ = Scour("Name", begin, end);
+        if (name_ != nil)
+            name_ = [name_ retain];
+        tagline_ = [[NSString stringWithCString:parser->ShortDesc().c_str()] retain];
+        icon_ = Scour("Icon", begin, end);
+        if (icon_ != nil)
+            icon_ = [icon_ retain];
+        website_ = Scour("Website", begin, end);
+        if (website_ != nil)
+            website_ = [website_ retain];
 
-    float blue[] = {
-        interpolate(0.2, 1.0, fraction),
-        interpolate(0.2, 1.0, fraction),
-        interpolate(1.0, 1.0, fraction),
-    1.0};
+        source_ = [[database_ getSource:file_.File()] retain];
 
-    float gray[] = {
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-    1.0};
+        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
+        if (metadata == nil || [metadata count] == 0) {
+            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                now_, @"FirstSeen",
+            nil];
 
-    [name_ setColor:CGColorCreate(space, black)];
-    [version_ setColor:CGColorCreate(space, blue)];
-    [description_ setColor:CGColorCreate(space, gray)];
+            [Packages_ setObject:metadata forKey:id_];
+        }
+    } return self;
 }
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    for (pkgCache::VerIterator version = iterator.VersionList(); !version.end(); ++version)
+        for (pkgCache::VerFileIterator file = version.FileList(); !file.end(); ++file)
+            return [[[Package alloc]
+                initWithIterator:iterator 
+                database:database
+                version:version
+                file:file]
+            autorelease];
+    return nil;
 }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (NSString *) section {
+    const char *section = iterator_.Section();
+    return section == NULL ? nil : [[NSString stringWithCString:section] stringByReplacingCharacter:'_' withCharacter:' '];
 }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (Address *) maintainer {
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
 }
 
-@end
-/* }}} */
-/* Sources View {{{ */
-@interface SourcesView : ResetView {
-    UISectionList *list_;
-    Database *database_;
-    id delegate_;
-    NSMutableArray *sources_;
+- (size_t) size {
+    return version_->InstalledSize;
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) dealloc;
-- (id) initWithFrame:(CGRect)frame database:(Database *)database;
-- (void) setDelegate:(id)delegate;
-- (void) reloadData;
-- (NSString *) leftTitle;
-- (NSString *) rightTitle;
-@end
-
-@implementation SourcesView
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-        break;
-
-        case 1:
-            [delegate_ update];
-        break;
+- (NSString *) description {
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    NSString *description([NSString stringWithCString:parser->LongDesc().c_str()]);
+
+    NSArray *lines = [description componentsSeparatedByString:@"\n"];
+    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
+    if ([lines count] < 2)
+        return nil;
+
+    NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
+    for (size_t i(1); i != [lines count]; ++i) {
+        NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
+        [trimmed addObject:trim];
     }
-}
 
-- (void) dealloc {
-    if (sources_ != nil)
-        [sources_ release];
-    [list_ release];
-    [super dealloc];
+    return [trimmed componentsJoinedByString:@"\n"];
 }
 
-- (id) initWithFrame:(CGRect)frame database:(Database *)database {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        database_ = database;
-        sources_ = nil;
-
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
-        CGRect bounds = [self bounds];
-
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [self addSubview:navbar_];
-
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
-
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Sources"] autorelease];
-        [navbar_ pushNavigationItem:navitem];
+- (NSString *) index {
+    NSString *index = [[[self name] substringToIndex:1] uppercaseString];
+    return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
+}
 
-        list_ = [[UISectionList alloc] initWithFrame:CGRectMake(
-            0, navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+- (NSDate *) seen {
+    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+}
 
-        [list_ setDataSource:self];
-        //[list_ setShouldHideHeaderInShortLists:NO];
-    } return self;
+- (NSString *) latest {
+    return latest_;
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (NSString *) installed {
+    return installed_;
 }
 
-- (void) reloadData {
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+- (BOOL) upgradable {
+    if (NSString *installed = [self installed])
+        return [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
+    else
+        return [self essential];
+}
 
-    sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (BOOL) essential {
+    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+}
 
-    for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source) {
-        metaIndex *index(*source);
-        fprintf(stderr, "\"%s\" \"%s\" \"%s\" \"%s\"\n", index->GetURI().c_str(), index->GetDist().c_str(), index->GetType(), index->IsTrusted() ? "true" : "false");
+- (BOOL) broken {
+    return (*[database_ cache])[iterator_].InstBroken();
+}
 
-        debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
-        if (dindex == NULL)
-            continue;
-
-        fprintf(stderr, " \"%s\"\n", dindex->MetaIndexFile("Release").c_str());
-
-        std::ifstream release(dindex->MetaIndexFile("Release").c_str());
-        std::string line;
-        while (std::getline(release, line)) {
-            std::string::size_type colon(line.find(':'));
-            if (colon == std::string::npos)
-                continue;
-            std::string name(line.substr(0, colon));
-            std::string value(line.substr(colon + 1));
-            while (!value.empty() && value[0] == ' ')
-                value = value.substr(1);
-            std::cerr << "[" << name << "|" << value << "]" << std::endl;
-        }
-    }
+- (NSString *) id {
+    return id_;
+}
 
-    [self resetView];
+- (NSString *) name {
+    return name_ == nil ? id_ : name_;
 }
 
-- (NSString *) leftTitle {
-    return @"Refresh All";
+- (NSString *) tagline {
+    return tagline_;
 }
 
-- (NSString *) rightTitle {
-    return @"Edit";
+- (NSString *) icon {
+    return icon_;
 }
 
-@end
-/* }}} */
+- (NSString *) website {
+    return website_;
+}
 
-@implementation Database
+- (Source *) source {
+    return source_;
+}
 
-- (void) _readStatus:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (BOOL) matches:(NSString *)text {
+    if (text == nil)
+        return NO;
 
-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+    NSRange range;
 
-    const char *error;
-    int offset;
-    pcre *code = pcre_compile("^([^:]*):([^:]*):([^:]*):(.*)$", 0, &error, &offset, NULL);
+    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
 
-    pcre_extra *study = NULL;
-    int capture;
-    pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
-    int matches[(capture + 1) * 3];
+    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
 
-    while (std::getline(is, line)) {
-        const char *data(line.c_str());
+    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
 
-        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
+    return NO;
+}
 
-        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
-        float percent;
-        buffer >> percent;
-        [delegate_ setPercent:(percent / 100)];
+- (NSComparisonResult) compareByName:(Package *)package {
+    NSString *lhs = [self name];
+    NSString *rhs = [package name];
 
-        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
 
-        if (type == "pmerror")
-            [delegate_ setError:string];
-        else if (type == "pmstatus")
-            [delegate_ setTitle:string];
-        else if (type == "pmconffile")
-            ;
-        else _assert(false);
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
     }
 
-    [pool release];
+    return [lhs caseInsensitiveCompare:rhs];
 }
 
-- (void) _readOutput:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (NSComparisonResult) compareBySectionAndName:(Package *)package {
+    NSString *lhs = [self section];
+    NSString *rhs = [package section];
+
+    if (lhs == NULL && rhs != NULL)
+        return NSOrderedAscending;
+    else if (lhs != NULL && rhs == NULL)
+        return NSOrderedDescending;
+    else if (lhs != NULL && rhs != NULL) {
+        NSComparisonResult result = [lhs compare:rhs];
+        if (result != NSOrderedSame)
+            return result;
+    }
 
-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+    return [self compareByName:package];
+}
+
+- (NSComparisonResult) compareForChanges:(Package *)package {
+    BOOL lhs = [self upgradable];
+    BOOL rhs = [package upgradable];
+
+    if (lhs != rhs)
+        return lhs ? NSOrderedAscending : NSOrderedDescending;
+    else if (!lhs) {
+        switch ([[self seen] compare:[package seen]]) {
+            case NSOrderedAscending:
+                return NSOrderedDescending;
+            case NSOrderedSame:
+                break;
+            case NSOrderedDescending:
+                return NSOrderedAscending;
+            default:
+                _assert(false);
+        }
+    }
 
-    while (std::getline(is, line))
-        [delegate_ addOutput:[NSString stringWithCString:line.c_str()]];
+    return [self compareByName:package];
+}
 
-    [pool release];
+- (void) install {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    [database_ cache]->MarkInstall(iterator_, false);
 }
 
-- (Package *) packageWithName:(NSString *)name {
-    pkgCache::PkgIterator iterator(cache_->FindPkg([name cString]));
-    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+- (void) remove {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    resolver->Remove(iterator_);
+    [database_ cache]->MarkDelete(iterator_, true);
 }
 
-- (Database *) init {
-    if ((self = [super init]) != nil) {
-        records_ = NULL;
-        resolver_ = NULL;
-        fetcher_ = NULL;
-        lock_ = NULL;
+@end
+/* }}} */
+/* Section Class {{{ */
+@interface Section : NSObject {
+    NSString *name_;
+    size_t row_;
+    NSMutableArray *packages_;
+}
 
-        int fds[2];
+- (void) dealloc;
 
-        _assert(pipe(fds) != -1);
-        statusfd_ = fds[1];
+- (Section *) initWithName:(NSString *)name row:(size_t)row;
+- (NSString *) name;
+- (size_t) row;
+- (NSArray *) packages;
+- (size_t) count;
+- (void) addPackage:(Package *)package;
+@end
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readStatus:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
+@implementation Section
 
-        _assert(pipe(fds) != -1);
-        _assert(dup2(fds[1], 1) != -1);
-        _assert(close(fds[1]) != -1);
+- (void) dealloc {
+    [name_ release];
+    [packages_ release];
+    [super dealloc];
+}
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readOutput:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
+- (Section *) initWithName:(NSString *)name row:(size_t)row {
+    if ((self = [super init]) != nil) {
+        name_ = [name retain];
+        row_ = row;
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
     } return self;
 }
 
-- (pkgCacheFile &) cache {
-    return cache_;
+- (NSString *) name {
+    return name_;
 }
 
-- (pkgRecords *) records {
-    return records_;
+- (size_t) row {
+    return row_;
 }
 
-- (pkgProblemResolver *) resolver {
-    return resolver_;
+- (NSArray *) packages {
+    return packages_;
 }
 
-- (pkgAcquire &) fetcher {
-    return *fetcher_;
+- (size_t) count {
+    return [packages_ count];
 }
 
-- (void) reloadData {
-    _error->Discard();
-    manager_ = NULL;
-    delete lock_;
-    delete fetcher_;
-    delete resolver_;
-    delete records_;
-    cache_.Close();
-    cache_.Open(progress_, true);
-    records_ = new pkgRecords(cache_);
-    resolver_ = new pkgProblemResolver(cache_);
-    fetcher_ = new pkgAcquire(&status_);
-    lock_ = NULL;
+- (void) addPackage:(Package *)package {
+    [packages_ addObject:package];
 }
 
-- (void) prepare {
-    pkgRecords records(cache_);
-
-    lock_ = new FileFd();
-    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
-    _assert(!_error->PendingError());
+@end
+/* }}} */
 
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+/* Package View {{{ */
+@protocol PackageViewDelegate
+- (void) performPackage:(Package *)package;
+@end
 
-    manager_ = (_system->CreatePM(cache_));
-    _assert(manager_->GetArchives(fetcher_, &list, &records));
-    _assert(!_error->PendingError());
+@interface PackageView : UIView {
+    UIPreferencesTable *table_;
+    Package *package_;
+    UITextView *description_;
+    id delegate_;
 }
 
-- (void) perform {
-    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
-        return;
-
-    _system->UnLock();
-    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+- (void) dealloc;
 
-    if (result == pkgPackageManager::Failed)
-        return;
-    if (_error->PendingError())
-        return;
-    if (result != pkgPackageManager::Completed)
-        return;
-}
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table;
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group;
+- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed;
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group;
+- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group;
+
+- (BOOL) canSelectRow:(int)row;
+- (void) tableRowSelected:(NSNotification *)notification;
+
+- (Package *) package;
+
+- (id) initWithFrame:(struct CGRect)frame;
+- (void) setPackage:(Package *)package;
+- (void) setDelegate:(id)delegate;
+@end
+
+@implementation PackageView
+
+- (void) dealloc {
+    if (package_ != nil)
+        [package_ release];
+    if (description_ != nil)
+        [description_ release];
+    [table_ release];
+    [super dealloc];
+}
+
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    return 3;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    switch (group) {
+        case 0: return nil;
+        case 1: return @"Package Details";
+        case 2: return @"Source Information";
+
+        default: _assert(false);
+    }
+}
+
+- (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
+    if (group != 0 || row != 1)
+        return proposed;
+    else
+        return [description_ visibleTextRect].size.height + TextViewOffset_;
+}
+
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    switch (group) {
+        case 0: return [package_ website] == nil ? 2 : 3;
+        case 1: return 5;
+        case 2: return 3;
+
+        default: _assert(false);
+    }
+}
+
+- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
+    UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
+    [cell setShowSelection:NO];
+
+    switch (group) {
+        case 0: switch (row) {
+            case 0:
+                [cell setTitle:[package_ name]];
+                [cell setValue:[package_ latest]];
+            break;
+
+            case 1:
+                [cell addSubview:description_];
+            break;
+
+            case 2:
+                [cell setTitle:@"More Information"];
+                [cell setShowDisclosure:YES];
+                [cell setShowSelection:YES];
+            break;
+
+            default: _assert(false);
+        } break;
+
+        case 1: switch (row) {
+            case 0:
+                [cell setTitle:@"Identifier"];
+                [cell setValue:[package_ id]];
+            break;
+
+            case 1: {
+                [cell setTitle:@"Installed Version"];
+                NSString *installed([package_ installed]);
+                [cell setValue:(installed == nil ? @"n/a" : installed)];
+            } break;
+
+            case 2: {
+                [cell setTitle:@"Section"];
+                NSString *section([package_ section]);
+                [cell setValue:(section == nil ? @"n/a" : section)];
+            } break;
+
+            case 3:
+                [cell setTitle:@"Expanded Size"];
+                [cell setValue:SizeString([package_ size])];
+            break;
+
+            case 4:
+                [cell setTitle:@"Maintainer"];
+                [cell setValue:[[package_ maintainer] name]];
+                [cell setShowDisclosure:YES];
+                [cell setShowSelection:YES];
+            break;
+
+            default: _assert(false);
+        } break;
+
+        case 2: switch (row) {
+            case 0:
+                [cell setTitle:[[package_ source] label]];
+                [cell setValue:[[package_ source] version]];
+            break;
+
+            case 1:
+                [cell setValue:[[package_ source] description]];
+            break;
+
+            case 2:
+                [cell setTitle:@"Origin"];
+                [cell setValue:[[package_ source] origin]];
+            break;
+
+            default: _assert(false);
+        } break;
+
+        default: _assert(false);
+    }
+
+    return cell;
+}
+
+- (BOOL) canSelectRow:(int)row {
+    return YES;
+}
+
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [table_ selectedRow];
+    NSString *website = [package_ website];
+
+    if (row == (website == nil ? 8 : 9))
+        [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+            [[package_ maintainer] email],
+            [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
+        ]]];
+    else if (website != nil && row == 3)
+        [delegate_ openURL:[NSURL URLWithString:website]];
+}
+
+- (Package *) package {
+    return package_;
+}
+
+- (id) initWithFrame:(struct CGRect)frame {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        table_ = [[UIPreferencesTable alloc] initWithFrame:[self bounds]];
+        [self addSubview:table_];
+
+        [table_ setDataSource:self];
+        [table_ setDelegate:self];
+    } return self;
+}
+
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }
+
+    if (description_ != nil) {
+        [description_ release];
+        description_ = nil;
+    }
+
+    if (package != nil) {
+        package_ = [package retain];
+
+        NSString *description([package description]);
+        if (description == nil)
+            description = [package tagline];
+        description_ = [GetTextView(description, 12, true) retain];
+
+        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+        CGColor black(space, 0, 0, 0, 1);
+        [description_ setTextColor:black];
+        CGColorSpaceRelease(space);
+
+        [table_ reloadData];
+    }
+}
+
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+}
+
+@end
+/* }}} */
+/* Package Cell {{{ */
+@interface PackageCell : UITableCell {
+    UIImageView *icon_;
+    UITextLabel *name_;
+    UITextLabel *description_;
+    UITextLabel *source_;
+    UITextLabel *version_;
+    UIImageView *trusted_;
+    SEL versioner_;
+}
+
+- (void) dealloc;
+
+- (PackageCell *) initWithVersioner:(SEL)versioner;
+- (void) setPackage:(Package *)package;
+
+- (void) _setSelected:(float)fraction;
+- (void) setSelected:(BOOL)selected;
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
+- (void) _setSelectionFadeFraction:(float)fraction;
+
+@end
+
+@implementation PackageCell
+
+- (void) dealloc {
+    [icon_ release];
+    [name_ release];
+    [description_ release];
+    [source_ release];
+    [version_ release];
+    [trusted_ release];
+    [super dealloc];
+}
+
+- (PackageCell *) initWithVersioner:(SEL)versioner {
+    if ((self = [super init]) != nil) {
+        versioner_ = versioner;
+
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
+
+        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+        CGColor clear(space, 0, 0, 0, 0);
+
+        icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)];
+
+        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 12, 240, 25)];
+        [name_ setBackgroundColor:clear];
+        [name_ setFont:bold];
+
+        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)];
+        [description_ setBackgroundColor:clear];
+        [description_ setFont:small];
+
+        source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 72, 225, 20)];
+        [source_ setBackgroundColor:clear];
+        [source_ setFont:large];
+
+        version_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(286, 69, 70, 25)];
+        [version_ setBackgroundColor:clear];
+        [version_ setFont:large];
+
+        //trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(278, 7, 16, 16)];
+        trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+
+        [self addSubview:icon_];
+        [self addSubview:name_];
+        [self addSubview:description_];
+        [self addSubview:source_];
+        [self addSubview:version_];
+
+        CGColorSpaceRelease(space);
+
+        CFRelease(small);
+        CFRelease(large);
+        CFRelease(bold);
+    } return self;
+}
+
+- (void) setPackage:(Package *)package {
+    Source *source = [package source];
+
+    UIImage *image = nil;
+    if (NSString *icon = [package icon])
+        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (image == nil) if (NSString *icon = [source defaultIcon])
+        image = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (image == nil)
+        image = [UIImage applicationImageNamed:@"unknown.png"];
+
+    [icon_ setImage:image];
+    [icon_ zoomToScale:0.5f];
+    [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
+
+    [name_ setText:[package name]];
+    [version_ setText:[package latest]];
+    [description_ setText:[package tagline]];
+
+    NSString *label;
+    bool trusted;
+
+    if (source != nil) {
+        label = [source label];
+        trusted = [source trusted];
+    } else if ([[package id] isEqualToString:@"firmware"]) {
+        label = @"Apple";
+        trusted = false;
+    } else {
+        label = @"Unknown/Local";
+        trusted = false;
+    }
+
+    [source_ setText:[NSString stringWithFormat:@"from %@", label]];
+
+    [trusted_ removeFromSuperview];
+    if (trusted)
+        [self addSubview:trusted_];
+}
+
+- (void) _setSelected:(float)fraction {
+    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+    CGColor black(space,
+        interpolate(0.0, 1.0, fraction),
+        interpolate(0.0, 1.0, fraction),
+        interpolate(0.0, 1.0, fraction),
+    1.0);
+
+    CGColor blue(space,
+        interpolate(0.2, 1.0, fraction),
+        interpolate(0.2, 1.0, fraction),
+        interpolate(1.0, 1.0, fraction),
+    1.0);
+
+    CGColor gray(space,
+        interpolate(0.4, 1.0, fraction),
+        interpolate(0.4, 1.0, fraction),
+        interpolate(0.4, 1.0, fraction),
+    1.0);
+
+    [name_ setColor:black];
+    [description_ setColor:gray];
+    [source_ setColor:black];
+    [version_ setColor:blue];
+
+    CGColorSpaceRelease(space);
+}
+
+- (void) setSelected:(BOOL)selected {
+    [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected];
+}
+
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+    if (!fade)
+        [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected withFade:fade];
+}
+
+- (void) _setSelectionFadeFraction:(float)fraction {
+    [self _setSelected:fraction];
+    [super _setSelectionFadeFraction:fraction];
+}
+
+@end
+/* }}} */
+
+/* Database Implementation {{{ */
+@implementation Database
+
+- (void) dealloc {
+    _assert(false);
+    [super dealloc];
+}
+
+- (void) _readStatus:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    const char *error;
+    int offset;
+    pcre *code = pcre_compile("^([^:]*):([^:]*):([^:]*):(.*)$", 0, &error, &offset, NULL);
+
+    pcre_extra *study = NULL;
+    int capture;
+    pcre_fullinfo(code, study, PCRE_INFO_CAPTURECOUNT, &capture);
+    int matches[(capture + 1) * 3];
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+
+        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
+
+        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
+        float percent;
+        buffer >> percent;
+        [delegate_ setPercent:(percent / 100)];
+
+        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
+        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+
+        if (type == "pmerror")
+            [delegate_ setError:string];
+        else if (type == "pmstatus")
+            [delegate_ setTitle:string];
+        else if (type == "pmconffile")
+            ;
+        else _assert(false);
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (void) _readOutput:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
+
+    while (std::getline(is, line))
+        [delegate_ addOutput:[NSString stringWithCString:line.c_str()]];
+
+    [pool release];
+    _assert(false);
+}
+
+- (Package *) packageWithName:(NSString *)name {
+    pkgCache::PkgIterator iterator(cache_->FindPkg([name cString]));
+    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+}
+
+- (Database *) init {
+    if ((self = [super init]) != nil) {
+        records_ = NULL;
+        resolver_ = NULL;
+        fetcher_ = NULL;
+        lock_ = NULL;
+
+        sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+
+        int fds[2];
+
+        _assert(pipe(fds) != -1);
+        statusfd_ = fds[1];
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readStatus:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
+        _assert(pipe(fds) != -1);
+        _assert(dup2(fds[1], 1) != -1);
+        _assert(close(fds[1]) != -1);
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readOutput:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+    } return self;
+}
+
+- (pkgCacheFile &) cache {
+    return cache_;
+}
+
+- (pkgRecords *) records {
+    return records_;
+}
+
+- (pkgProblemResolver *) resolver {
+    return resolver_;
+}
+
+- (pkgAcquire &) fetcher {
+    return *fetcher_;
+}
+
+- (NSArray *) packages {
+    return packages_;
+}
+
+- (void) reloadData {
+    _error->Discard();
+    delete list_;
+    manager_ = NULL;
+    delete lock_;
+    delete fetcher_;
+    delete resolver_;
+    delete records_;
+    cache_.Close();
+
+    if (!cache_.Open(progress_, true)) {
+        fprintf(stderr, "repairing corrupted database...\n");
+        _error->Discard();
+        [self update];
+        _assert(cache_.Open(progress_, true));
+    }
+
+    now_ = [NSDate date];
+
+    records_ = new pkgRecords(cache_);
+    resolver_ = new pkgProblemResolver(cache_);
+    fetcher_ = new pkgAcquire(&status_);
+    lock_ = NULL;
+
+    list_ = new pkgSourceList();
+    _assert(list_->ReadMainList());
+
+    [sources_ removeAllObjects];
+    for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
+        std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
+        for (std::vector<pkgIndexFile *>::const_iterator index = indices->begin(); index != indices->end(); ++index)
+            [sources_
+                setObject:[[[Source alloc] initWithMetaIndex:*source] autorelease]
+                forKey:[NSNumber numberWithLong:reinterpret_cast<uintptr_t>(*index)]
+            ];
+    }
+
+    [packages_ removeAllObjects];
+    for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
+        if (Package *package = [Package packageWithIterator:iterator database:self])
+            if ([package source] != nil || [package installed] != nil)
+                [packages_ addObject:package];
+}
+
+- (void) prepare {
+    pkgRecords records(cache_);
+
+    lock_ = new FileFd();
+    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgSourceList list;
+    _assert(list.ReadMainList());
+
+    manager_ = (_system->CreatePM(cache_));
+    _assert(manager_->GetArchives(fetcher_, &list, &records));
+    _assert(!_error->PendingError());
+}
+
+- (void) perform {
+    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
+        return;
+
+    _system->UnLock();
+    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+
+    if (result == pkgPackageManager::Failed)
+        return;
+    if (_error->PendingError())
+        return;
+    if (result != pkgPackageManager::Completed)
+        return;
+}
 
 - (void) update {
     pkgSourceList list;
     _assert(list.ReadMainList());
 
-    FileFd lock;
-    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-    _assert(!_error->PendingError());
+    FileFd lock;
+    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher(&status_);
+    _assert(list.GetIndexes(&fetcher));
+    _assert(fetcher.Run(PulseInterval_) != pkgAcquire::Failed);
+
+    bool failed = false;
+    for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++)
+        if ((*item)->Status != pkgAcquire::Item::StatDone) {
+            (*item)->Finished();
+            failed = true;
+        }
+
+    if (!failed && _config->FindB("APT::Get::List-Cleanup", true) == true) {
+        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists")));
+        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/"));
+    }
+
+    [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
+}
+
+- (void) upgrade {
+    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+    _assert(pkgApplyStatus(cache_));
+
+    if (cache_->BrokenCount() != 0) {
+        _assert(pkgFixBroken(cache_));
+        _assert(cache_->BrokenCount() == 0);
+        _assert(pkgMinimizeUpgrade(cache_));
+    }
+
+    _assert(pkgDistUpgrade(cache_));
+}
+
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+    status_.setDelegate(delegate);
+    progress_.setDelegate(delegate);
+}
+
+- (Source *) getSource:(const pkgCache::PkgFileIterator &)file {
+    pkgIndexFile *index(NULL);
+    list_->FindIndex(file, index);
+    return [sources_ objectForKey:[NSNumber numberWithLong:reinterpret_cast<uintptr_t>(index)]];
+}
+
+@end
+/* }}} */
+
+/* Progress Data {{{ */
+@interface ProgressData : NSObject {
+    SEL selector_;
+    id target_;
+    id object_;
+}
+
+- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+
+- (SEL) selector;
+- (id) target;
+- (id) object;
+@end
+
+@implementation ProgressData
+
+- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
+    if ((self = [super init]) != nil) {
+        selector_ = selector;
+        target_ = target;
+        object_ = object;
+    } return self;
+}
+
+- (SEL) selector {
+    return selector_;
+}
+
+- (id) target {
+    return target_;
+}
+
+- (id) object {
+    return object_;
+}
+
+@end
+/* }}} */
+/* Progress View {{{ */
+@interface ProgressView : UIView <
+    ProgressDelegate
+> {
+    UIView *view_;
+    UIView *background_;
+    UITransitionView *transition_;
+    UIView *overlay_;
+    UINavigationBar *navbar_;
+    UIProgressBar *progress_;
+    UITextView *output_;
+    UITextLabel *status_;
+    id delegate_;
+}
+
+- (void) dealloc;
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+
+- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
+- (void) setContentView:(UIView *)view;
+- (void) resetView;
+
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+
+- (void) _retachThread;
+- (void) _detachNewThreadData:(ProgressData *)data;
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+
+- (void) setError:(NSString *)error;
+- (void) _setError:(NSString *)error;
+
+- (void) setTitle:(NSString *)title;
+- (void) _setTitle:(NSString *)title;
+
+- (void) setPercent:(float)percent;
+- (void) _setPercent:(NSNumber *)percent;
+
+- (void) addOutput:(NSString *)output;
+- (void) _addOutput:(NSString *)output;
+@end
+
+@protocol ProgressViewDelegate
+- (void) progressViewIsComplete:(ProgressView *)sender;
+@end
+
+@implementation ProgressView
+
+- (void) dealloc {
+    [view_ release];
+    if (background_ != nil)
+        [background_ release];
+    [transition_ release];
+    [overlay_ release];
+    [navbar_ release];
+    [progress_ release];
+    [output_ release];
+    [status_ release];
+    [super dealloc];
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (bootstrap_ && from == overlay_ && to == view_)
+        exit(0);
+}
+
+- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        delegate_ = delegate;
+
+        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+        CGColor black(space, 0.0, 0.0, 0.0, 1.0);
+        CGColor white(space, 1.0, 1.0, 1.0, 1.0);
+        CGColor clear(space, 0.0, 0.0, 0.0, 0.0);
+
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [transition_ setDelegate:self];
+
+        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+
+        if (bootstrap_)
+            [overlay_ setBackgroundColor:black];
+        else {
+            background_ = [[UIView alloc] initWithFrame:[self bounds]];
+            [background_ setBackgroundColor:black];
+            [self addSubview:background_];
+        }
+
+        [self addSubview:transition_];
+
+        CGSize navsize = [UINavigationBar defaultSize];
+        CGRect navrect = {{0, 0}, navsize};
+
+        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
+        [overlay_ addSubview:navbar_];
+
+        [navbar_ setBarStyle:1];
+        [navbar_ setDelegate:self];
+
+        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
+        [navbar_ pushNavigationItem:navitem];
+
+        CGRect bounds = [overlay_ bounds];
+        CGSize prgsize = [UIProgressBar defaultSize];
+
+        CGRect prgrect = {{
+            (bounds.size.width - prgsize.width) / 2,
+            bounds.size.height - prgsize.height - 20
+        }, prgsize};
+
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [overlay_ addSubview:progress_];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            24
+        )];
+
+        [status_ setColor:white];
+        [status_ setBackgroundColor:clear];
+
+        [status_ setCentersHorizontally:YES];
+        //[status_ setFont:font];
+
+        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
+            10,
+            navrect.size.height + 20,
+            bounds.size.width - 20,
+            bounds.size.height - navsize.height - 62 - navrect.size.height
+        )];
+
+        //[output_ setTextFont:@"Courier New"];
+        [output_ setTextSize:12];
+
+        [output_ setTextColor:white];
+        [output_ setBackgroundColor:clear];
+
+        [output_ setMarginTop:0];
+        [output_ setAllowsRubberBanding:YES];
+
+        [overlay_ addSubview:output_];
+        [overlay_ addSubview:status_];
+
+        [progress_ setStyle:0];
+
+        CGColorSpaceRelease(space);
+    } return self;
+}
+
+- (void) setContentView:(UIView *)view {
+    view_ = [view retain];
+}
+
+- (void) resetView {
+    [transition_ transition:6 toView:view_];
+}
+
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
+}
+
+- (void) _retachThread {
+    [delegate_ progressViewIsComplete:self];
+    [self resetView];
+}
+
+- (void) _detachNewThreadData:(ProgressData *)data {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    [[data target] performSelector:[data selector] withObject:[data object]];
+    [data release];
+
+    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
+
+    [pool release];
+}
+
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
+    [navbar_ popNavigationItem];
+    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:title] autorelease];
+    [navbar_ pushNavigationItem:navitem];
+
+    [status_ setText:nil];
+    [output_ setText:@""];
+    [progress_ setProgress:0];
+
+    [transition_ transition:6 toView:overlay_];
+
+    [NSThread
+        detachNewThreadSelector:@selector(_detachNewThreadData:)
+        toTarget:self
+        withObject:[[ProgressData alloc]
+            initWithSelector:selector
+            target:target
+            object:object
+        ]
+    ];
+}
+
+- (void) setError:(NSString *)error {
+    [self
+        performSelectorOnMainThread:@selector(_setError:)
+        withObject:error
+        waitUntilDone:YES
+    ];
+}
+
+- (void) _setError:(NSString *)error {
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:@"Package Error"
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:self
+    ] autorelease];
+
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];
+}
+
+- (void) setTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
+}
+
+- (void) _setTitle:(NSString *)title {
+    [status_ setText:[title stringByAppendingString:@"..."]];
+}
+
+- (void) setPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
+}
+
+- (void) _setPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];
+}
+
+- (void) addOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
+}
+
+- (void) _addOutput:(NSString *)output {
+    [output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
+    CGSize size = [output_ contentSize];
+    CGRect rect = {{0, size.height}, {size.width, 0}};
+    [output_ scrollRectToVisible:rect animated:YES];
+}
+
+@end
+/* }}} */
+
+/* Package Table {{{ */
+@protocol PackageTableDelegate
+- (void) packageTable:(id)table packageSelected:(Package *)package;
+@end
+
+@interface PackageTable : UIView {
+    SEL versioner_;
+    UISectionList *list_;
+
+    id delegate_;
+    NSArray *packages_;
+    NSMutableArray *sections_;
+}
 
-    pkgAcquire fetcher(&status_);
-    _assert(list.GetIndexes(&fetcher));
-    _assert(fetcher.Run(PulseInterval_) != pkgAcquire::Failed);
+- (void) dealloc;
 
-    bool failed = false;
-    for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++)
-        if ((*item)->Status != pkgAcquire::Item::StatDone) {
-            (*item)->Finished();
-            failed = true;
-        }
+- (int) numberOfSectionsInSectionList:(UISectionList *)list;
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
 
-    if (!failed && _config->FindB("APT::Get::List-Cleanup", true) == true) {
-        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists")));
-        _assert(fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/"));
-    }
+- (int) numberOfRowsInTable:(UITable *)table;
+- (float) table:(UITable *)table heightForRow:(int)row;
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
+- (void) tableRowSelected:(NSNotification *)notification;
+
+- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner;
+
+- (void) setDelegate:(id)delegate;
+- (void) setPackages:(NSArray *)packages;
+
+- (void) resetViewAnimated:(BOOL)animated;
+- (UITable *) table;
+@end
+
+@implementation PackageTable
+
+- (void) dealloc {
+    [list_ release];
+    [sections_ release];
+    if (packages_ != nil)
+        [packages_ release];
+    [super dealloc];
 }
 
-- (void) upgrade {
-    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
-    _assert(pkgApplyStatus(cache_));
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return [sections_ count];
+}
 
-    if (cache_->BrokenCount() != 0) {
-        _assert(pkgFixBroken(cache_));
-        _assert(cache_->BrokenCount() == 0);
-        _assert(pkgMinimizeUpgrade(cache_));
-    }
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    return [[sections_ objectAtIndex:section] name];
+}
 
-    _assert(pkgDistUpgrade(cache_));
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    return [[sections_ objectAtIndex:section] row];
+}
+
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [packages_ count];
+}
+
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 100;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil)
+        reusing = [[[PackageCell alloc] initWithVersioner:versioner_] autorelease];
+    [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
+    return reusing;
+}
+
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return NO;
+}
+
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [[notification object] selectedRow];
+    [delegate_ packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
+}
+
+- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        versioner_ = versioner;
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
+        [list_ setDataSource:self];
+
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:frame.size.width
+        ] autorelease];
+
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+        [table setReusesTableCells:YES];
 
-    //InstallPackages(cache_, true);
+        [self addSubview:list_];
+    } return self;
 }
 
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
-    status_.setDelegate(delegate);
-    progress_.setDelegate(delegate);
+}
+
+- (void) setPackages:(NSArray *)packages {
+    if (packages_ != nil)
+        [packages_ autorelease];
+    _assert(packages != nil);
+    packages_ = [packages retain];
+
+    [sections_ removeAllObjects];
+
+    Section *section = nil;
+
+    for (size_t offset(0); offset != [packages_ count]; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        NSString *name = [package index];
+
+        if (section == nil || ![[section name] isEqual:name]) {
+            section = [[[Section alloc] initWithName:name row:offset] autorelease];
+            [sections_ addObject:section];
+        }
+
+        [section addPackage:package];
+    }
+
+    [list_ reloadData];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    [[list_ table] selectRow:-1 byExtendingSelection:NO withFade:animated];
+}
+
+- (UITable *) table {
+    return [list_ table];
 }
 
 @end
+/* }}} */
 
-/* Progress Data {{{ */
-@interface ProgressData : NSObject {
-    SEL selector_;
-    id target_;
-    id object_;
+/* Section Cell {{{ */
+@interface SectionCell : UITableCell {
+    UITextLabel *name_;
+    UITextLabel *count_;
 }
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+- (void) dealloc;
+
+- (id) init;
+- (void) setSection:(Section *)section;
+
+- (void) _setSelected:(float)fraction;
+- (void) setSelected:(BOOL)selected;
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
+- (void) _setSelectionFadeFraction:(float)fraction;
 
-- (SEL) selector;
-- (id) target;
-- (id) object;
 @end
 
-@implementation ProgressData
+@implementation SectionCell
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
+- (void) dealloc {
+    [name_ release];
+    [count_ release];
+    [super dealloc];
+}
+
+- (id) init {
     if ((self = [super init]) != nil) {
-        selector_ = selector;
-        target_ = target;
-        object_ = object;
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
+
+        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+        CGColor clear(space, 0, 0, 0, 0);
+        CGColor white(space, 1, 1, 1, 1);
+
+        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)];
+        [name_ setBackgroundColor:clear];
+        [name_ setFont:bold];
+
+        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
+        [count_ setCentersHorizontally:YES];
+        [count_ setBackgroundColor:clear];
+        [count_ setFont:small];
+        [count_ setColor:white];
+
+        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
+        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+
+        [self addSubview:folder];
+        [self addSubview:name_];
+        [self addSubview:count_];
+
+        [self _setSelected:0];
+
+        CGColorSpaceRelease(space);
+
+        CFRelease(small);
+        CFRelease(bold);
     } return self;
 }
 
-- (SEL) selector {
-    return selector_;
+- (void) setSection:(Section *)section {
+    if (section == nil) {
+        [name_ setText:@"All Packages"];
+        [count_ setText:nil];
+    } else {
+        NSString *name = [section name];
+        [name_ setText:(name == nil ? @"(No Section)" : name)];
+        [count_ setText:[NSString stringWithFormat:@"%d", [section count]]];
+    }
 }
 
-- (id) target {
-    return target_;
+- (void) _setSelected:(float)fraction {
+    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+    CGColor black(space,
+        interpolate(0.0, 1.0, fraction),
+        interpolate(0.0, 1.0, fraction),
+        interpolate(0.0, 1.0, fraction),
+    1.0);
+
+    [name_ setColor:black];
+
+    CGColorSpaceRelease(space);
 }
 
-- (id) object {
-    return object_;
+- (void) setSelected:(BOOL)selected {
+    [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected];
+}
+
+- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
+    if (!fade)
+        [self _setSelected:(selected ? 1.0 : 0.0)];
+    [super setSelected:selected withFade:fade];
+}
+
+- (void) _setSelectionFadeFraction:(float)fraction {
+    [self _setSelected:fraction];
+    [super _setSelectionFadeFraction:fraction];
 }
 
 @end
 /* }}} */
-/* Progress View {{{ */
-@interface ProgressView : UIView <
-    ProgressDelegate
+/* Install View {{{ */
+@interface InstallView : ResetView <
+    PackageTableDelegate
 > {
-    UIView *view_;
-    UIView *background_;
-    UITransitionView *transition_;
-    UIView *overlay_;
-    UINavigationBar *navbar_;
-    UIProgressBar *progress_;
-    UITextView *output_;
-    UITextLabel *status_;
-    id delegate_;
-    UIAlertSheet *alert_;
+    NSArray *sections_;
+    UITable *list_;
+    PackageTable *table_;
+    PackageView *view_;
+    NSString *section_;
+    NSString *package_;
+    NSMutableArray *packages_;
 }
 
 - (void) dealloc;
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
-- (void) setContentView:(UIView *)view;
-- (void) resetView;
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+- (int) numberOfRowsInTable:(UITable *)table;
+- (float) table:(UITable *)table heightForRow:(int)row;
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
+- (void) tableRowSelected:(NSNotification *)notification;
 
-- (void) _retachThread;
-- (void) _detachNewThreadData:(ProgressData *)data;
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object;
+- (void) packageTable:(id)table packageSelected:(Package *)package;
 
-- (void) setError:(NSString *)error;
-- (void) _setError:(NSString *)error;
+- (id) initWithFrame:(CGRect)frame;
+- (void) setPackages:(NSArray *)packages;
+- (void) setDelegate:(id)delegate;
+@end
 
-- (void) setTitle:(NSString *)title;
-- (void) _setTitle:(NSString *)title;
+@implementation InstallView
 
-- (void) setPercent:(float)percent;
-- (void) _setPercent:(NSNumber *)percent;
+- (void) dealloc {
+    [packages_ release];
+    if (sections_ != nil)
+        [sections_ release];
+    if (list_ != nil)
+        [list_ release];
+    if (table_ != nil)
+        [table_ release];
+    if (view_ != nil)
+        [view_ release];
+    if (section_ != nil)
+        [section_ release];
+    if (package_ != nil)
+        [package_ release];
+    [super dealloc];
+}
 
-- (void) addOutput:(NSString *)output;
-- (void) _addOutput:(NSString *)output;
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
+    if (button == 0) {
+        [[view_ package] install];
+        [delegate_ resolve];
+        [delegate_ perform];
+    }
+}
 
-- (void) setStatusFail;
-@end
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [sections_ count] + 1;
+}
 
-@protocol ProgressViewDelegate
-- (void) progressViewIsComplete:(ProgressView *)sender;
-@end
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 45;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil)
+        reusing = [[[SectionCell alloc] init] autorelease];
+    if (row == 0)
+        [(SectionCell *)reusing setSection:nil];
+    else
+        [(SectionCell *)reusing setSection:[sections_ objectAtIndex:(row - 1)]];
+    return reusing;
+}
+
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return YES;
+}
+
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [[notification object] selectedRow];
+
+    if (row == INT_MAX) {
+        [section_ release];
+        section_ = nil;
+
+        [table_ release];
+        table_ = nil;
+    } else {
+        _assert(section_ == nil);
+        _assert(table_ == nil);
+
+        Section *section;
+        NSString *name;
+
+        if (row == 0) {
+            section = nil;
+            section_ = nil;
+            name = @"All Packages";
+        } else {
+            section = [sections_ objectAtIndex:(row - 1)];
+            name = [section name];
+            section_ = [name retain];
+        }
+
+        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
+        [table_ setDelegate:self];
+        [table_ setPackages:(section == nil ? packages_ : [section packages])];
+
+        [self pushView:table_ withTitle:name backButtonTitle:@"Packages" rightButton:nil];
+    }
+}
+
+- (void) packageTable:(id)table packageSelected:(Package *)package {
+    if (package == nil) {
+        [package_ release];
+        package_ = nil;
+
+        [view_ release];
+        view_ = nil;
+    } else {
+        _assert(package_ == nil);
+        _assert(view_ == nil);
+
+        package_ = [[package name] retain];
 
-@implementation ProgressView
+        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
+        [view_ setDelegate:delegate_];
 
-- (void) dealloc {
-    [view_ release];
-    [background_ release];
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [progress_ release];
-    [output_ release];
-    [status_ release];
-    [super dealloc];
+        [view_ setPackage:package];
+
+        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Install"];
+    }
 }
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
+- (id) initWithFrame:(CGRect)frame {
     if ((self = [super initWithFrame:frame]) != nil) {
-        delegate_ = delegate;
-        alert_ = nil;
-
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        float black[] = {0.0, 0.0, 0.0, 1.0};
-        float white[] = {1.0, 1.0, 1.0, 1.0};
-        float clear[] = {0.0, 0.0, 0.0, 0.0};
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        background_ = [[UIView alloc] initWithFrame:[self bounds]];
-        [background_ setBackgroundColor:CGColorCreate(space, black)];
-        [self addSubview:background_];
+        list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
+        [self pushView:list_ withTitle:@"Install" backButtonTitle:@"Sections" rightButton:nil];
 
-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [self addSubview:transition_];
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:frame.size.width
+        ] autorelease];
 
-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+        [list_ setDataSource:self];
+        [list_ setSeparatorStyle:1];
+        [list_ addTableColumn:column];
+        [list_ setDelegate:self];
+        [list_ setReusesTableCells:YES];
 
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
+        [transition_ transition:0 toView:list_];
+    } return self;
+}
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [overlay_ addSubview:navbar_];
+- (void) setPackages:(NSArray *)packages {
+    [packages_ removeAllObjects];
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([package installed] == nil)
+            [packages_ addObject:package];
+    }
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Running..."] autorelease];
-        [navbar_ pushNavigationItem:navitem];
+    [packages_ sortUsingSelector:@selector(compareBySectionAndName:)];
+    NSMutableArray *sections = [NSMutableArray arrayWithCapacity:16];
 
-        CGRect bounds = [overlay_ bounds];
-        CGSize prgsize = [UIProgressBar defaultSize];
+    Section *nsection = nil;
+    Package *npackage = nil;
 
-        CGRect prgrect = {{
-            (bounds.size.width - prgsize.width) / 2,
-            bounds.size.height - prgsize.height - 20
-        }, prgsize};
+    Section *section = nil;
+    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        NSString *name = [package section];
 
-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [overlay_ addSubview:progress_];
+        if (section == nil || name != nil && ![[section name] isEqual:name]) {
+            section = [[[Section alloc] initWithName:name row:offset] autorelease];
 
-        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
-            10,
-            bounds.size.height - prgsize.height - 50,
-            bounds.size.width - 20,
-            24
-        )];
+            if (name == nil || [name isEqualToString:section_])
+                nsection = section;
+            [sections addObject:section];
+        }
 
-        [status_ setColor:CGColorCreate(space, white)];
-        [status_ setBackgroundColor:CGColorCreate(space, clear)];
+        if ([[package name] isEqualToString:package_])
+            npackage = package;
+        [section addPackage:package];
+    }
 
-        [status_ setCentersHorizontally:YES];
-        //[status_ setFont:font];
+    if (sections_ != nil)
+        [sections_ release];
+    sections_ = [sections retain];
 
-        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
-            10,
-            navrect.size.height + 20,
-            bounds.size.width - 20,
-            bounds.size.height - navsize.height - 62 - navrect.size.height
-        )];
+    [packages_ sortUsingSelector:@selector(compareByName:)];
 
-        //[output_ setTextFont:@"Courier New"];
-        [output_ setTextSize:12];
+    [list_ reloadData];
 
-        [output_ setTextColor:CGColorCreate(space, white)];
-        [output_ setBackgroundColor:CGColorCreate(space, clear)];
+    unsigned views(0);
 
-        [output_ setMarginTop:0];
-        [output_ setAllowsRubberBanding:YES];
+    if (npackage != nil)
+        [view_ setPackage:npackage];
+    else if (package_ != nil)
+        ++views;
 
-        [overlay_ addSubview:output_];
-        [overlay_ addSubview:status_];
+    if (table_ != nil && section_ == nil) 
+        [table_ setPackages:packages_];
+    else if (nsection != nil)
+        [table_ setPackages:[nsection packages]];
+    else if (section_ != nil)
+        ++views;
 
-        [progress_ setStyle:0];
-    } return self;
+    if (views != 0)
+        [self popViews:views];
+    [self setPrompt];
 }
 
-- (void) setContentView:(UIView *)view {
-    view_ = view;
+- (void) setDelegate:(id)delegate {
+    if (view_ != nil)
+        [view_ setDelegate:delegate];
+    [super setDelegate:delegate];
 }
 
-- (void) resetView {
-    [transition_ transition:6 toView:view_];
+@end
+/* }}} */
+/* Changes View {{{ */
+@interface ChangesView : ResetView <
+    PackageTableDelegate
+> {
+    UISectionList *list_;
+    NSMutableArray *packages_;
+    NSMutableArray *sections_;
+    PackageView *view_;
+    NSString *package_;
+    size_t count_;
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [alert_ dismiss];
-    [alert_ release];
-    alert_ = nil;
-}
+- (void) dealloc;
 
-- (void) _retachThread {
-    [delegate_ progressViewIsComplete:self];
-    [self resetView];
-}
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
 
-- (void) _detachNewThreadData:(ProgressData *)data {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (int) numberOfSectionsInSectionList:(UISectionList *)list;
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
 
-    [[data target] performSelector:[data selector] withObject:[data object]];
-    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
+- (int) numberOfRowsInTable:(UITable *)table;
+- (float) table:(UITable *)table heightForRow:(int)row;
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing;
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
+- (void) tableRowSelected:(NSNotification *)notification;
 
-    [data release];
-    [pool release];
-}
+- (id) initWithFrame:(CGRect)frame;
+- (void) setPackages:(NSArray *)packages;
+- (void) _resetView;
+- (size_t) count;
 
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object {
-    [status_ setText:nil];
-    [output_ setText:@""];
-    [progress_ setProgress:0];
+- (void) setDelegate:(id)delegate;
+@end
 
-    [transition_ transition:6 toView:overlay_];
+@implementation ChangesView
 
-    [NSThread
-        detachNewThreadSelector:@selector(_detachNewThreadData:)
-        toTarget:self
-        withObject:[[ProgressData alloc]
-            initWithSelector:selector
-            target:target
-            object:object
-        ]
-    ];
+- (void) dealloc {
+    [list_ release];
+    [packages_ release];
+    [sections_ release];
+    if (view_ != nil)
+        [view_ release];
+    if (package_ != nil)
+        [package_ release];
+    [super dealloc];
 }
 
-- (void) setStatusFail {
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return [sections_ count];
 }
 
-- (void) setError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    return [[sections_ objectAtIndex:section] name];
 }
 
-- (void) _setError:(NSString *)error {
-    _assert(alert_ == nil);
-
-    alert_ = [[UIAlertSheet alloc]
-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ];
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    return [[sections_ objectAtIndex:section] row];
+}
 
-    [alert_ setBodyText:error];
-    [alert_ popupAlertAnimated:YES];
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [packages_ count];
 }
 
-- (void) setTitle:(NSString *)title {
-    [self
-        performSelectorOnMainThread:@selector(_setTitle:)
-        withObject:title
-        waitUntilDone:YES
-    ];
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 100;
 }
 
-- (void) _setTitle:(NSString *)title {
-    [status_ setText:[title stringByAppendingString:@"..."]];
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil)
+        reusing = [[[PackageCell alloc] initWithVersioner:NULL] autorelease];
+    [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
+    return reusing;
 }
 
-- (void) setPercent:(float)percent {
-    [self
-        performSelectorOnMainThread:@selector(_setPercent:)
-        withObject:[NSNumber numberWithFloat:percent]
-        waitUntilDone:YES
-    ];
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return NO;
 }
 
-- (void) _setPercent:(NSNumber *)percent {
-    [progress_ setProgress:[percent floatValue]];
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [[notification object] selectedRow];
+    [self packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
 }
 
-- (void) addOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
+    switch (button) {
+        case 0:
+            [[view_ package] install];
+            [delegate_ resolve];
+            [delegate_ perform];
+        break;
+
+        case 1:
+            [delegate_ upgrade];
+        break;
+    }
 }
 
-- (void) _addOutput:(NSString *)output {
-    [output_ setText:[NSString stringWithFormat:@"%@\n%@", [output_ text], output]];
-    CGSize size = [output_ contentSize];
-    CGRect rect = {{0, size.height}, {size.width, 0}};
-    [output_ scrollRectToVisible:rect animated:YES];
+- (void) packageTable:(id)table packageSelected:(Package *)package {
+    if (package == nil) {
+        [package_ release];
+        package_ = nil;
+
+        [view_ release];
+        view_ = nil;
+    } else {
+        _assert(package_ == nil);
+        _assert(view_ == nil);
+
+        package_ = [[package name] retain];
+
+        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
+        [view_ setDelegate:delegate_];
+
+        [view_ setPackage:package];
+
+        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:(
+            [package upgradable] ? @"Upgrade" : @"Install"
+        )];
+    }
 }
 
-@end
-/* }}} */
+- (id) initWithFrame:(CGRect)frame {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-@protocol PackagesViewDelegate
-- (void) perform;
-- (void) update;
-- (void) openURL:(NSString *)url;
-@end
+        list_ = [[UISectionList alloc] initWithFrame:[transition_ bounds] showSectionIndex:NO];
+        [list_ setShouldHideHeaderInShortLists:NO];
+        [list_ setDataSource:self];
+        //[list_ setSectionListStyle:1];
 
-/* PackagesView {{{ */
-@interface PackagesView : ResetView <
-    PackageCellDelegate
-> {
-    Database *database_;
-    NSMutableArray *packages_;
-    NSMutableArray *sections_;
-    id delegate_;
-    UISectionList *list_;
-    UITransitionView *transition_;
-    Package *package_;
-    NSString *pkgname_;
-    PackageView *pkgview_;
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:frame.size.width
+        ] autorelease];
+
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+        [table setReusesTableCells:YES];
+
+        [self pushView:list_ withTitle:@"Changes" backButtonTitle:nil rightButton:nil];
+    } return self;
 }
 
-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
+- (void) setPackages:(NSArray *)packages {
+    [packages_ removeAllObjects];
+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([package installed] == nil || [package upgradable])
+            [packages_ addObject:package];
+    }
 
-- (int) numberOfRowsInTable:(UITable *)table;
-- (float) table:(UITable *)table heightForRow:(int)row;
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col;
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row;
-- (void) tableRowSelected:(NSNotification*)notification;
+    [packages_ sortUsingSelector:@selector(compareForChanges:)];
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item;
+    [sections_ removeAllObjects];
 
-- (id) initWithFrame:(struct CGRect)frame database:(Database *)database;
-- (void) setDelegate:(id)delegate;
-- (void) deselect;
-- (void) reloadData:(BOOL)reset;
+    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
+    Section *section = nil;
 
-- (NSString *) title;
-- (void) perform:(Package *)package;
-- (void) addPackage:(Package *)package;
-- (NSString *) versionWithPackage:(Package *)package;
-@end
+    count_ = 0;
+    Package *npackage = nil;
+    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        if ([[package name] isEqualToString:package_])
+            npackage = package;
 
-@implementation PackagesView
+        if ([package upgradable])
+            [upgradable addPackage:package];
+        else {
+            NSDate *seen = [package seen];
+
+            NSString *name;
+            CFStringRef formatted = NULL;
+
+            if (seen == nil)
+                name = @"n/a ?";
+            else {
+                CFLocaleRef locale = CFLocaleCopyCurrent();
+                CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+                formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+                name = (NSString *) formatted;
+                CFRelease(formatter);
+                CFRelease(locale);
+            }
 
-- (int) numberOfSectionsInSectionList:(UISectionList *)list {
-    return [sections_ count];
-}
+            if (section == nil || ![[section name] isEqual:name]) {
+                section = [[[Section alloc] initWithName:name row:offset] autorelease];
+                [sections_ addObject:section];
+            }
+
+            [section addPackage:package];
+
+            if (formatted != NULL)
+                CFRelease(formatted);
+        }
+    }
+
+    count_ = [[upgradable packages] count];
+    if (count_ != 0)
+        [sections_ insertObject:upgradable atIndex:0];
+
+    [list_ reloadData];
+
+    if (npackage != nil)
+        [view_ setPackage:npackage];
+    else if (package_ != nil)
+        [self popViews:1];
 
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
-    return [[sections_ objectAtIndex:section] name];
+    [self _resetView];
+    [self setPrompt];
 }
 
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
-    return [[sections_ objectAtIndex:section] row];
+- (void) _resetView {
+    if ([views_ count] == 1)
+        [navbar_ showButtonsWithLeftTitle:(count_ == 0 ? nil : @"Upgrade All") rightTitle:nil];
 }
 
-- (int) numberOfRowsInTable:(UITable *)table {
-    return [packages_ count];
+- (size_t) count {
+    return count_;
 }
 
-- (float) table:(UITable *)table heightForRow:(int)row {
-    return 64;
+- (void) setDelegate:(id)delegate {
+    if (view_ != nil)
+        [view_ setDelegate:delegate];
+    [super setDelegate:delegate];
 }
 
-- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
-    Package *package = [packages_ objectAtIndex:row];
-    PackageCell *cell = [[[PackageCell alloc] initWithPackage:package delegate:self] autorelease];
-    return cell;
+@end
+/* }}} */
+/* Manage View {{{ */
+@interface ManageView : ResetView <
+    PackageTableDelegate
+> {
+    PackageTable *table_;
+    PackageView *view_;
+    NSString *package_;
 }
 
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return YES;
-}
+- (void) dealloc;
 
-- (void) tableRowSelected:(NSNotification*)notification {
-    int row = [[list_ table] selectedRow];
-    if (row == INT_MAX)
-        return;
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
 
-    package_ = [packages_ objectAtIndex:row];
-    pkgname_ = [[package_ name] retain];
+- (void) packageTable:(id)table packageSelected:(Package *)package;
 
-    UINavigationItem *navitem = [[UINavigationItem alloc] initWithTitle:[package_ name]];
-    [navbar_ pushNavigationItem:navitem];
+- (id) initWithFrame:(CGRect)frame;
+- (void) setPackages:(NSArray *)packages;
 
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:[self title]];
+- (void) setDelegate:(id)delegate;
+@end
 
-    [pkgview_ setPackage:package_];
-    [transition_ transition:1 toView:pkgview_];
+@implementation ManageView
+
+- (void) dealloc {
+    [table_ release];
+    if (view_ != nil)
+        [view_ release];
+    if (package_ != nil)
+        [package_ release];
+    [super dealloc];
 }
 
 - (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
     if (button == 0) {
-        [self perform:package_];
-
-        pkgProblemResolver *resolver = [database_ resolver];
-
-        resolver->InstallProtect();
-        if (!resolver->Resolve(true))
-            _error->Discard();
-
+        [[view_ package] remove];
+        [delegate_ resolve];
         [delegate_ perform];
     }
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
-    [self deselect];
-    [super navigationBar:navbar poppedItem:item];
-}
+- (void) packageTable:(id)table packageSelected:(Package *)package {
+    if (package == nil) {
+        [package_ release];
+        package_ = nil;
 
-- (id) initWithFrame:(struct CGRect)frame database:(Database *)database {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        database_ = [database retain];
+        [view_ release];
+        view_ = nil;
+    } else {
+        _assert(package_ == nil);
+        _assert(view_ == nil);
 
-        struct CGRect bounds = [self bounds];
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
+        package_ = [[package name] retain];
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [self addSubview:navbar_];
+        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
+        [view_ setDelegate:delegate_];
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+        [view_ setPackage:package];
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:[self title]] autorelease];
-        [navbar_ pushNavigationItem:navitem];
-        [navitem setBackButtonTitle:@"Packages"];
+        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Uninstall"];
+    }
+}
 
-        transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
-            bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+- (id) initWithFrame:(CGRect)frame {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
+        [table_ setDelegate:self];
 
-        [self addSubview:transition_];
+        [self pushView:table_ withTitle:@"Uninstall" backButtonTitle:@"Packages" rightButton:nil];
+    } return self;
+}
 
-        list_ = [[UISectionList alloc] initWithFrame:[transition_ bounds] showSectionIndex:NO];
-        [list_ setDataSource:self];
-        [list_ setShouldHideHeaderInShortLists:NO];
+- (void) setPackages:(NSArray *)packages {
+    NSMutableArray *local = [NSMutableArray arrayWithCapacity:16];
+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([package installed] != nil)
+            [local addObject:package];
+    }
 
-        [transition_ transition:0 toView:list_];
+    [local sortUsingSelector:@selector(compareByName:)];
 
-        UITableColumn *column = [[UITableColumn alloc]
-            initWithTitle:@"Name"
-            identifier:@"name"
-            width:frame.size.width
-        ];
+    Package *npackage = nil;
+    for (size_t offset = 0, count = [local count]; offset != count; ++offset) {
+        Package *package = [local objectAtIndex:offset];
+        if ([[package name] isEqualToString:package_])
+            npackage = package;
+    }
 
-        UITable *table = [list_ table];
-        [table setSeparatorStyle:1];
-        [table addTableColumn:column];
-        [table setDelegate:self];
+    [table_ setPackages:local];
 
-        pkgview_ = [[PackageView alloc] initWithFrame:[transition_ bounds] database:database_];
-    } return self;
+    if (npackage != nil)
+        [view_ setPackage:npackage];
+    else if (package_ != nil)
+        [self popViews:1];
+
+    [self setPrompt];
 }
 
 - (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-    [pkgview_ setDelegate:delegate];
+    if (view_ != nil)
+        [view_ setDelegate:delegate];
+    [super setDelegate:delegate];
 }
 
-- (void) deselect {
-    [transition_ transition:(resetting_ ? 0 : 2) toView:list_];
-    UITable *table = [list_ table];
-    [table selectRow:-1 byExtendingSelection:NO withFade:(resetting_ ? NO : YES)];
-    package_ = nil;
+@end
+/* }}} */
+/* Search View {{{ */
+@protocol SearchViewDelegate
+- (void) showKeyboard:(BOOL)show;
+@end
+
+@interface SearchView : ResetView <
+    PackageTableDelegate
+> {
+    NSMutableArray *packages_;
+    UIView *accessory_;
+    UISearchField *field_;
+    PackageTable *table_;
+    PackageView *view_;
+    NSString *package_;
 }
 
-- (void) reloadData:(BOOL)reset {
-    packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (void) dealloc;
 
-    if (sections_ != nil) {
-        [sections_ release];
-        sections_ = nil;
-    }
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
+- (void) packageTable:(id)table packageSelected:(Package *)package;
 
-    for (pkgCache::PkgIterator iterator = [database_ cache]->PkgBegin(); !iterator.end(); ++iterator)
-        if (Package *package = [Package packageWithIterator:iterator database:database_])
-            [self addPackage:package];
+- (void) textFieldDidBecomeFirstResponder:(UITextField *)field;
+- (void) textFieldDidResignFirstResponder:(UITextField *)field;
 
-    [packages_ sortUsingSelector:@selector(compareBySectionAndName:)];
-    sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (void) keyboardInputChanged:(UIFieldEditor *)editor;
+- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked;
 
-    Section *section = nil;
-    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        NSString *name = [package section];
+- (id) initWithFrame:(CGRect)frame;
+- (void) setPackages:(NSArray *)packages;
 
-        if (section == nil || ![[section name] isEqual:name]) {
-            section = [[Section alloc] initWithName:name row:offset];
-            [sections_ addObject:section];
-        }
+- (void) setDelegate:(id)delegate;
+- (void) resetPackage:(Package *)package;
+- (void) searchPackages;
 
-        [section addPackage:package];
-    }
+@end
 
-    [list_ reloadData];
-    if (reset)
-        [self resetView];
-    else if (package_ != nil) {
-        package_ = [database_ packageWithName:pkgname_];
-        [pkgview_ setPackage:package_];
-    }
-}
+@implementation SearchView
 
-- (NSString *) title {
-    return nil;
+- (void) dealloc {
+    [packages_ release];
+    [accessory_ release];
+    [field_ release];
+    [table_ release];
+    if (view_ != nil)
+        [view_ release];
+    if (package_ != nil)
+        [package_ release];
+    [super dealloc];
 }
 
-- (void) perform:(Package *)package {
+- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
+    if (button == 0) {
+        Package *package = [view_ package];
+        if ([package installed] == nil)
+            [package install];
+        else
+            [package remove];
+        [delegate_ resolve];
+        [delegate_ perform];
+    }
 }
 
-- (void) addPackage:(Package *)package {
-    [packages_ addObject:package];
-}
+- (void) packageTable:(id)table packageSelected:(Package *)package {
+    if (package == nil) {
+        [navbar_ setAccessoryView:accessory_ animate:(resetting_ ? NO : YES) goingBack:YES];
 
-- (NSString *) versionWithPackage:(Package *)package {
-    return nil;
-}
+        [package_ release];
+        package_ = nil;
 
-@end
-/* }}} */
+        [view_ release];
+        view_ = nil;
+    } else {
+        [navbar_ setAccessoryView:nil animate:YES goingBack:NO];
 
-/* InstallView {{{ */
-@interface InstallView : PackagesView {
-}
+        _assert(package_ == nil);
+        _assert(view_ == nil);
 
-- (NSString *) title;
-- (void) addPackage:(Package *)package;
-- (void) perform:(Package *)package;
-- (NSString *) versionWithPackage:(Package *)package;
-@end
+        package_ = [[package name] retain];
 
-@implementation InstallView
+        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
+        [view_ setDelegate:delegate_];
 
-- (NSString *) title {
-    return @"Install";
+        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:nil];
+        [self resetPackage:package];
+    }
 }
 
-- (void) addPackage:(Package *)package {
-    if ([package installed] == nil)
-        [super addPackage:package];
+- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
+    [delegate_ showKeyboard:YES];
+    [table_ setEnabled:NO];
+
+    /*CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    CGColor dimmed(alpha, 0, 0, 0, 0.5);
+    [editor_ setBackgroundColor:dimmed];
+    CGColorSpaceRelease(space);*/
 }
 
-- (void) perform:(Package *)package {
-    [package install];
+- (void) textFieldDidResignFirstResponder:(UITextField *)field {
+    [table_ setEnabled:YES];
+    [delegate_ showKeyboard:NO];
 }
 
-- (NSString *) versionWithPackage:(Package *)package {
-    return [package latest];
+- (void) keyboardInputChanged:(UIFieldEditor *)editor {
+    NSString *text([field_ text]);
+    [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
 }
 
-@end
-/* }}} */
-/* UpgradeView {{{ */
-@interface UpgradeView : PackagesView {
+- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
+    if ([text length] != 1 || [text characterAtIndex:0] != '\n')
+        return YES;
+
+    [self searchPackages];
+    [field_ resignFirstResponder];
+    return NO;
 }
 
-- (NSString *) title;
-- (NSString *) leftTitle;
-- (void) addPackage:(Package *)package;
-- (void) perform:(Package *)package;
-- (NSString *) versionWithPackage:(Package *)package;
-@end
+- (id) initWithFrame:(CGRect)frame {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-@implementation UpgradeView
+        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
+        [table_ setDelegate:self];
 
-- (NSString *) title {
-    return @"Upgrade";
-}
+        CGRect area = [self bounds];
+        area.origin.y = 30;
+        area.origin.x = 0;
+        area.size.width -= 12;
+        area.size.height = [UISearchField defaultHeight];
 
-- (NSString *) leftTitle {
-    return @"Upgrade All";
-}
+        field_ = [[UISearchField alloc] initWithFrame:area];
 
-- (void) addPackage:(Package *)package {
-    NSString *installed = [package installed];
-    if (installed != nil && [[package latest] compare:installed] != NSOrderedSame)
-        [super addPackage:package];
-}
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        [field_ setFont:font];
+        CFRelease(font);
 
-- (void) perform:(Package *)package {
-    [package install];
-}
+        [field_ setPlaceholder:@"Package Names & Descriptions"];
+        [field_ setPaddingTop:5];
+        [field_ setDelegate:self];
 
-- (NSString *) versionWithPackage:(Package *)package {
-    return [package latest];
-}
+        UITextTraits *traits = [field_ textTraits];
+        [traits setEditingDelegate:self];
+        [traits setReturnKeyType:6];
 
-@end
-/* }}} */
-/* UninstallView {{{ */
-@interface UninstallView : PackagesView {
+        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(6, 6, area.size.width, area.size.height + 30)];
+        [accessory_ addSubview:field_];
+
+        [navbar_ setAccessoryView:accessory_];
+        [self pushView:table_ withTitle:nil backButtonTitle:@"Search" rightButton:nil];
+
+        /* XXX: for the love of god just fix this */
+        [navbar_ removeFromSuperview];
+        [reload_ removeFromSuperview];
+        [configure_ removeFromSuperview];
+        [self addSubview:navbar_];
+        [self addSubview:reload_];
+        [self addSubview:configure_];
+    } return self;
 }
 
-- (NSString *) title;
-- (void) addPackage:(Package *)package;
-- (void) perform:(Package *)package;
-- (NSString *) versionWithPackage:(Package *)package;
-@end
+- (void) setPackages:(NSArray *)packages {
+    [packages_ removeAllObjects];
+    [packages_ addObjectsFromArray:packages];
+    [packages_ sortUsingSelector:@selector(compareByName:)];
 
-@implementation UninstallView
+    Package *npackage = nil;
+    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        if ([[package name] isEqualToString:package_])
+            npackage = package;
+    }
+
+    [self searchPackages];
 
-- (NSString *) title {
-    return @"Uninstall";
+    if (npackage != nil)
+        [self resetPackage:npackage];
+    else if (package_ != nil)
+        [self popViews:1];
+
+    [self setPrompt];
 }
 
-- (void) addPackage:(Package *)package {
-    if ([package installed] != nil)
-        [super addPackage:package];
+- (void) setDelegate:(id)delegate {
+    if (view_ != nil)
+        [view_ setDelegate:delegate];
+    [super setDelegate:delegate];
 }
 
-- (void) perform:(Package *)package {
-    [package remove];
+- (void) resetPackage:(Package *)package {
+    [view_ setPackage:package];
+    NSString *right = [package installed] == nil ? @"Install" : @"Uninstall";
+    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
 }
 
-- (NSString *) versionWithPackage:(Package *)package {
-    return [package installed];
+- (void) searchPackages {
+    NSString *text([field_ text]);
+
+    NSMutableArray *packages([NSMutableArray arrayWithCapacity:16]);
+
+    for (size_t offset(0), count([packages_ count]); offset != count; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        if ([package matches:text])
+            [packages addObject:package];
+    }
+
+    [table_ setPackages:packages];
+    [[table_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
 }
 
 @end
@@ -1989,8 +3434,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,
-    PackagesViewDelegate,
-    ProgressViewDelegate
+    ProgressViewDelegate,
+    SearchViewDelegate
 > {
     UIWindow *window_;
     UIView *underlay_;
@@ -1998,7 +3443,6 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UITransitionView *transition_;
     UIButtonBar *buttonbar_;
 
-    UIAlertSheet *alert_;
     ConfirmationView *confirm_;
 
     Database *database_;
@@ -2009,19 +3453,30 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UIScroller *scroller_;
     UIWebView *webview_;
     NSURL *url_;
+    UIProgressIndicator *indicator_;
 
     InstallView *install_;
-    UpgradeView *upgrade_;
-    UninstallView *uninstall_;
-    SourcesView *sources_;
+    ChangesView *changes_;
+    ManageView *manage_;
+    SearchView *search_;
+
+    bool restart_;
+    unsigned tag_;
+
+    UIKeyboard *keyboard_;
 }
 
 - (void) loadNews;
 - (void) reloadData:(BOOL)reset;
+- (void) setPrompt;
+
+- (void) resolve;
 - (void) perform;
+- (void) upgrade;
+- (void) update;
+
 - (void) cancel;
 - (void) confirm;
-- (void) update;
 
 - (void) progressViewIsComplete:(ProgressView *)progress;
 
@@ -2029,14 +3484,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
 - (void) buttonBarItemTapped:(id)sender;
 
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame;
-- (void) view:(UIView *)view didDrawInRect:(CGRect)rect duration:(float)duration;
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old;
+
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame;
 
+- (void) applicationWillSuspend;
 - (void) applicationDidFinishLaunching:(id)unused;
 @end
 
-#include <objc/objc-class.h>
-
 @implementation Cydia
 
 - (void) loadNews {
@@ -2046,6 +3501,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         timeoutInterval:30.0
     ];
 
+    [request addValue:[NSString stringWithCString:Firmware_] forHTTPHeaderField:@"X-Firmware"];
     [request addValue:[NSString stringWithCString:Machine_] forHTTPHeaderField:@"X-Machine"];
     [request addValue:[NSString stringWithCString:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
 
@@ -2054,15 +3510,82 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 - (void) reloadData:(BOOL)reset {
     [database_ reloadData];
-    [install_ reloadData:reset];
-    [upgrade_ reloadData:reset];
-    [uninstall_ reloadData:reset];
-    [sources_ reloadData];
+
+    size_t count = 16;
+
+    if (Packages_ == nil) {
+        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:count];
+        [Metadata_ setObject:Packages_ forKey:@"Packages"];
+    }
+
+    NSArray *packages = [database_ packages];
+
+    [install_ setPackages:packages];
+    [changes_ setPackages:packages];
+    [manage_ setPackages:packages];
+    [search_ setPackages:packages];
+
+    if (size_t count = [changes_ count]) {
+        NSString *badge([[NSNumber numberWithInt:count] stringValue]);
+        [buttonbar_ setBadgeValue:badge forButton:3];
+        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
+            [buttonbar_ setBadgeAnimated:YES forButton:3];
+        [self setApplicationBadge:badge];
+    } else {
+        [buttonbar_ setBadgeValue:nil forButton:3];
+        if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
+            [buttonbar_ setBadgeAnimated:NO forButton:3];
+        [self removeApplicationBadge];
+    }
+
+    _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+}
+
+- (void) setPrompt {
+    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+}
+
+- (void) resolve {
+    pkgProblemResolver *resolver = [database_ resolver];
+
+    resolver->InstallProtect();
+    if (!resolver->Resolve(true))
+        _error->Discard();
 }
 
 - (void) perform {
     [database_ prepare];
-    confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
+
+    if ([database_ cache]->BrokenCount() == 0)
+        confirm_ = [[ConfirmationView alloc] initWithView:underlay_ database:database_ delegate:self];
+    else {
+        NSMutableArray *broken = [NSMutableArray arrayWithCapacity:16];
+        NSArray *packages = [database_ packages];
+
+        for (size_t i(0); i != [packages count]; ++i) {
+            Package *package = [packages objectAtIndex:i];
+            if ([package broken])
+                [broken addObject:[package name]];
+        }
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Broken Packages", [database_ cache]->BrokenCount()]
+            buttons:[NSArray arrayWithObjects:@"Okay", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:self
+        ] autorelease];
+
+        [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
+        [sheet popupAlertAnimated:YES];
+
+        [self reloadData:NO];
+    }
+}
+
+- (void) upgrade {
+    [database_ upgrade];
+    [self perform];
 }
 
 - (void) cancel {
@@ -2073,11 +3596,29 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
+    restart_ = true;
 
     [progress_
         detachNewThreadSelector:@selector(perform)
         toTarget:database_
         withObject:nil
+        title:@"Running..."
+    ];
+}
+
+- (void) bootstrap_ {
+    [database_ update];
+    [database_ upgrade];
+    [database_ prepare];
+    [database_ perform];
+}
+
+- (void) bootstrap {
+    [progress_
+        detachNewThreadSelector:@selector(bootstrap_)
+        toTarget:self
+        withObject:nil
+        title:@"Bootstrap Install..."
     ];
 }
 
@@ -2086,6 +3627,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         detachNewThreadSelector:@selector(update)
         toTarget:database_
         withObject:nil
+        title:@"Refreshing Sources..."
     ];
 }
 
@@ -2107,18 +3649,16 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         break;
 
         case 1:
-            _assert(alert_ == nil);
-
-            alert_ = [[UIAlertSheet alloc]
+            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
                 initWithTitle:@"About Cydia Packager"
                 buttons:[NSArray arrayWithObjects:@"Close", nil]
                 defaultButtonIndex:0
                 delegate:self
                 context:self
-            ];
+            ] autorelease];
 
-            [alert_ setBodyText:
-                @"Copyright (C) 2007\n"
+            [sheet setBodyText:
+                @"Copyright (C) 2008\n"
                 "Jay Freeman (saurik)\n"
                 "saurik@saurik.com\n"
                 "http://www.saurik.com/\n"
@@ -2132,56 +3672,74 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
                 "http://www.ccs.ucsb.edu/\n"
                 "\n"
                 "Special Thanks:\n"
-                "bad_, BHSPitMonkey, Cobra, core,\n"
-                "Corona, cromas, Darken, dtzWill,\n"
-                "francis, Godores, jerry, Kingstone,\n"
-                "lounger, rockabilly, tman, Wbiggs"
+                "bad_, BHSPitMonkey, cash, Cobra,\n"
+                "core, Corona, crashx, cromas,\n"
+                "Darken, dtzWill, Erica, francis,\n"
+                "Godores, jerry, Kingstone, lounger,\n"
+                "mbranes, rockabilly, tman, Wbiggs"
             ];
 
-            [alert_ presentSheetFromButtonBar:buttonbar_];
+            [sheet presentSheetFromButtonBar:buttonbar_];
         break;
     }
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [alert_ dismiss];
-    [alert_ release];
-    alert_ = nil;
+    [sheet dismiss];
 }
 
 - (void) buttonBarItemTapped:(id)sender {
     UIView *view;
+    unsigned tag = [sender tag];
 
-    switch ([sender tag]) {
+    switch (tag) {
         case 1: view = featured_; break;
         case 2: view = install_; break;
-        case 3: view = upgrade_; break;
-        case 4: view = uninstall_; break;
-        case 5: view = sources_; break;
+        case 3: view = changes_; break;
+        case 4: view = manage_; break;
+        case 5: view = search_; break;
 
         default:
             _assert(false);
     }
 
-    if ([view respondsToSelector:@selector(resetView)])
-        [(id) view resetView];
+    if ([view respondsToSelector:@selector(resetView:)])
+        [(id) view resetView:(tag == tag_ ? NO : YES)];
+    tag_ = tag;
     [transition_ transition:0 toView:view];
 }
 
-- (void) view:(UIView *)view didSetFrame:(CGRect)frame {
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
     [scroller_ setContentSize:frame.size];
+    [indicator_ stopAnimation];
+}
+
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+    [navbar_ setPrompt:title];
+}
+
+- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
+    [navbar_ setPrompt:@"Loading..."];
+    [indicator_ startAnimation];
 }
 
-- (void) view:(UIView *)view didDrawInRect:(CGRect)rect duration:(float)duration {
-    [scroller_ setContentSize:[webview_ bounds].size];
+- (void) applicationWillSuspend {
+    if (restart_)
+        if (FW_LEAST(1,1,3))
+            notify_post("com.apple.language.changed");
+        else
+            system("launchctl stop com.apple.SpringBoard");
+
+    [super applicationWillSuspend];
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
     _assert(pkgInitConfig(*_config));
     _assert(pkgInitSystem(*_config, _system));
 
-    alert_ = nil;
     confirm_ = nil;
+    restart_ = false;
+    tag_ = 1;
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
@@ -2197,7 +3755,9 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [progress_ setContentView:underlay_];
 
     overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
-    [underlay_ addSubview:overlay_];
+
+    if (!bootstrap_)
+        [underlay_ addSubview:overlay_];
 
     transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
@@ -2207,7 +3767,7 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     featured_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
 
-    CGSize navsize = [UINavigationBar defaultSize];
+    CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
     CGRect navrect = {{0, 0}, navsize};
 
     navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
@@ -2218,14 +3778,14 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     [navbar_ showButtonsWithLeftTitle:@"About" rightTitle:@"Reload"];
 
-    UINavigationItem *navitem = [[UINavigationItem alloc] initWithTitle:@"Featured"];
+    UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Featured"] autorelease];
     [navbar_ pushNavigationItem:navitem];
 
     struct CGRect subbounds = [featured_ bounds];
     subbounds.origin.y += navsize.height;
     subbounds.size.height -= navsize.height;
 
-    UIImageView *pinstripe = [[UIImageView alloc] initWithFrame:subbounds];
+    UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:subbounds] autorelease];
     [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
     [featured_ addSubview:pinstripe];
 
@@ -2239,7 +3799,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [scroller_ setScrollDecelerationFactor:0.99];
     [scroller_ setDelegate:self];
 
-    webview_ = [[UIWebView alloc] initWithFrame:[scroller_ bounds]];
+    CGRect webrect = [scroller_ bounds];
+    webrect.size.height = 0;
+
+    webview_ = [[UIWebView alloc] initWithFrame:webrect];
     [scroller_ addSubview:webview_];
 
     [webview_ setTilingEnabled:YES];
@@ -2247,6 +3810,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     [webview_ setAutoresizes:YES];
     [webview_ setDelegate:self];
 
+    CGSize indsize = [UIProgressIndicator defaultSizeForStyle:2];
+    indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(87, 45, indsize.width, indsize.height)];
+    [indicator_ setStyle:2];
+    [featured_ addSubview:indicator_];
+
     NSArray *buttonitems = [NSArray arrayWithObjects:
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
@@ -2270,18 +3838,18 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
-            @"upgrade-up.png", kUIButtonBarButtonInfo,
-            @"upgrade-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"changes-up.png", kUIButtonBarButtonInfo,
+            @"changes-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:3], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Upgrade", kUIButtonBarButtonTitle,
+            @"Changes", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
-            @"uninstall-up.png", kUIButtonBarButtonInfo,
-            @"uninstall-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"manage-up.png", kUIButtonBarButtonInfo,
+            @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
             @"Uninstall", kUIButtonBarButtonTitle,
@@ -2290,11 +3858,11 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
-            @"sources-up.png", kUIButtonBarButtonInfo,
-            @"sources-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"search-up.png", kUIButtonBarButtonInfo,
+            @"search-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:5], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Sources", kUIButtonBarButtonTitle,
+            @"Search", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
     nil];
@@ -2326,60 +3894,139 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
     [overlay_ addSubview:buttonbar_];
 
-    database_ = [[Database alloc] init];
-    [database_ setDelegate:progress_];
-
-    install_ = [[InstallView alloc] initWithFrame:[transition_ bounds] database:database_];
-    [install_ setDelegate:self];
+    [UIKeyboard initImplementationNow];
 
-    upgrade_ = [[UpgradeView alloc] initWithFrame:[transition_ bounds] database:database_];
-    [upgrade_ setDelegate:self];
+    CGRect edtrect = [overlay_ bounds];
+    edtrect.origin.y += navsize.height;
+    edtrect.size.height -= navsize.height;
 
-    uninstall_ = [[UninstallView alloc] initWithFrame:[transition_ bounds] database:database_];
-    [uninstall_ setDelegate:self];
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
+    keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
 
-    sources_ = [[SourcesView alloc] initWithFrame:[transition_ bounds] database:database_];
-    [sources_ setDelegate:self];
-
-#if 0
+    database_ = [[Database alloc] init];
+    [database_ setDelegate:progress_];
 
-    UIAlertSheet *alert = [[UIAlertSheet alloc]
-        initWithTitle:@"Alert Title"
-        buttons:[NSArray arrayWithObjects:@"Yes", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ];
+    install_ = [[InstallView alloc] initWithFrame:[transition_ bounds]];
+    [install_ setDelegate:self];
 
-    NSLog(@"%p\n", [alert table]);
-    [[alert table] setDelegate:self];
-    [[alert table] reloadData];
+    changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
+    [changes_ setDelegate:self];
 
-    [alert addTextFieldWithValue:@"Title" label:@"Label"];
-    [alert setShowsOverSpringBoardAlerts:YES];
-    [alert setBodyText:@"This is an alert."];
-    [alert presentSheetFromButtonBar:buttonbar_];
-    //[alert popupAlertAnimated:YES];
+    manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
+    [manage_ setDelegate:self];
 
-#endif
+    search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
+    [search_ setDelegate:self];
 
     [self reloadData:NO];
-    [progress_ resetView];
 
     Package *package([database_ packageWithName:@"cydia"]);
-    NSString *application = package == nil ? @"Cydia" : [NSString stringWithFormat:@"Cydia/%@", [package installed]];
+    NSString *application = package == nil ? @"Cydia" : [NSString
+        stringWithFormat:@"Cydia/%@",
+        [package installed]
+    ];
+
     WebView *webview = [webview_ webView];
     [webview setApplicationNameForUserAgent:application];
+    [webview setFrameLoadDelegate:self];
 
     url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
     [self loadNews];
+
+    [progress_ resetView];
+
+    if (bootstrap_)
+        [self bootstrap];
+}
+
+- (void) showKeyboard:(BOOL)show {
+    if (show)
+        [overlay_ addSubview:keyboard_];
+    else
+        [keyboard_ removeFromSuperview];
 }
 
 @end
 
+void AddPreferences(NSString *plist) {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    NSMutableDictionary *settings = [[[NSMutableDictionary alloc] initWithContentsOfFile:plist] autorelease];
+    _assert(settings != NULL);
+    NSMutableArray *items = [settings objectForKey:@"items"];
+
+    bool cydia(false);
+
+    for (size_t i(0); i != [items count]; ++i) {
+        NSMutableDictionary *item([items objectAtIndex:i]);
+        NSString *label = [item objectForKey:@"label"];
+        if (label != nil && [label isEqualToString:@"Cydia"]) {
+            cydia = true;
+            break;
+        }
+    }
+
+    if (!cydia) {
+        for (size_t i(0); i != [items count]; ++i) {
+            NSDictionary *item([items objectAtIndex:i]);
+            NSString *label = [item objectForKey:@"label"];
+            if (label != nil && [label isEqualToString:@"General"]) {
+                [items insertObject:[NSDictionary dictionaryWithObjectsAndKeys:
+                    @"CydiaSettings", @"bundle",
+                    @"PSLinkCell", @"cell",
+                    [NSNumber numberWithBool:YES], @"hasIcon",
+                    [NSNumber numberWithBool:YES], @"isController",
+                    @"Cydia", @"label",
+                nil] atIndex:(i + 1)];
+
+                break;
+            }
+        }
+
+        _assert([settings writeToFile:plist atomically:YES] == YES);
+    }
+
+    [pool release];
+}
+
+/*IMP alloc_;
+id Alloc_(id self, SEL selector) {
+    id object = alloc_(self, selector);
+    fprintf(stderr, "[%s]A-%p\n", self->isa->name, object);
+    return object;
+}*/
+
 int main(int argc, char *argv[]) {
+    struct nlist nl[2];
+    memset(nl, 0, sizeof(nl));
+    nl[0].n_un.n_name = "_useMDNSResponder";
+    nlist("/usr/lib/libc.dylib", nl);
+    if (nl[0].n_type != N_UNDF)
+        *(int *) nl[0].n_value = 0;
+
+    bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
+
+    setuid(0);
+    setgid(0);
+
+    /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
+    alloc_ = alloc->method_imp;
+    alloc->method_imp = (IMP) &Alloc_;*/
+
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
+    if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) {
+        if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) {
+            Firmware_ = strdup([prover cString]);
+            NSArray *versions = [prover componentsSeparatedByString:@"."];
+            int count = [versions count];
+            Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0;
+            Minor_ = count > 1 ? [[versions objectAtIndex:1] intValue] : 0;
+            BugFix_ = count > 2 ? [[versions objectAtIndex:2] intValue] : 0;
+        }
+    }
+
     size_t size;
     sysctlbyname("hw.machine", NULL, &size, NULL, 0);
     char *machine = new char[size];
@@ -2396,6 +4043,20 @@ int main(int argc, char *argv[]) {
             IOObjectRelease(service);
         }
 
+    /*AddPreferences(@"/Applications/Preferences.app/Settings-iPhone.plist");
+    AddPreferences(@"/Applications/Preferences.app/Settings-iPod.plist");*/
+
+    if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
+        Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
+    else
+        Packages_ = [Metadata_ objectForKey:@"Packages"];
+
+    setenv("CYDIA", "", _not(int));
+    if (access("/User", F_OK) != 0)
+        system("/usr/libexec/cydia/firmware.sh");
+    system("dpkg --configure -a");
+
     UIApplicationMain(argc, argv, [Cydia class]);
     [pool release];
+    return 0;
 }