]> git.saurik.com Git - cydia.git/blobdiff - Cydia.mm
Forgot the Sponsor field.
[cydia.git] / Cydia.mm
index 174fdfd49470dca3334811c6fa14fa191132dd77..2e1b5b814afe19c3cba479e9ec028d810d672f87 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1,15 +1,75 @@
+/* Cydia - iPhone UIKit Front-End for Debian APT
+ * Copyright (C) 2008  Jay Freeman (saurik)
+*/
+
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef __OBJC2__
+    #define UITextTraits UITextInputTraits
+    #define textTraits textInputTraits
+    #define setAutoCapsType setAutocapitalizationType
+    #define setAutoCorrectionType setAutocorrectionType
+    #define setPreferredKeyboardType setKeyboardType
+#endif
+
 /* #include Directives {{{ */
-#include <Foundation/NSURL.h>
+#include <objc/objc.h>
+#include <objc/runtime.h>
+
+#include <CoreGraphics/CoreGraphics.h>
+#include <GraphicsServices/GraphicsServices.h>
+#include <Foundation/Foundation.h>
 #include <UIKit/UIKit.h>
-#import <GraphicsServices/GraphicsServices.h>
+#include <WebCore/DOMHTML.h>
+
+#import "BrowserView.h"
+#import "ResetView.h"
+#import "UICaboodle.h"
+
+#include <WebKit/WebFrame.h>
+#include <WebKit/WebView.h>
 
 #include <sstream>
+#include <string>
+
 #include <ext/stdio_filebuf.h>
 
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/clean.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/error.h>
@@ -25,81 +85,143 @@ extern "C" {
 #include <mach-o/nlist.h>
 }
 
-#include <objc/objc-class.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <errno.h>
 #include <pcre.h>
-#include <string.h>
 /* }}} */
-/* Extension Keywords {{{ */
-#define _trace() fprintf(stderr, "_trace()@%s:%u[%s]\n", __FILE__, __LINE__, __FUNCTION__)
 
-#define _assert(test) do \
-    if (!(test)) { \
-        fprintf(stderr, "_assert(%d:%s)@%s:%u[%s]\n", errno, #test, __FILE__, __LINE__, __FUNCTION__); \
-        exit(-1); \
-    } \
-while (false)
+/* iPhoneOS 2.0 Compatibility {{{ */
+#ifdef __OBJC2__
+@interface UICGColor : NSObject {
+}
 
-#define _not(type) ((type) ~ (type) 0)
-/* }}} */
-/* Miscellaneous Messages {{{ */
-@interface WebView
-- (void) setApplicationNameForUserAgent:(NSString *)applicationName;
-- (id) frameLoadDelegate;
-- (void) setFrameLoadDelegate:(id)delegate;
+- (id) initWithCGColor:(CGColorRef)color;
 @end
 
-@interface NSString (Cydia)
-- (NSString *) stringByAddingPercentEscapes;
-- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
-@end
-/* }}} */
+@interface UIFont {
+}
 
-#ifdef SRK_ASPEN
-#define UITable UITableView
-#endif
++ (id)systemFontOfSize:(float)fp8;
++ (id)boldSystemFontOfSize:(float)fp8;
+- (UIFont *) fontWithSize:(CGFloat)size;
+@end
 
-/* Reset View (UIView) {{{ */
-@interface UIView (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+@interface NSObject (iPhoneOS)
+- (CGColorRef) cgColor;
+- (CGColorRef) CGColor;
+- (void) set;
 @end
 
-@implementation UIView (CYResetView)
+@implementation NSObject (iPhoneOS)
 
-- (void) resetViewAnimated:(BOOL)animated {
-    fprintf(stderr, "%s\n", self->isa->name);
-    _assert(false);
+- (CGColorRef) cgColor {
+    return [self CGColor];
+}
+
+- (CGColorRef) CGColor {
+    return (CGColorRef) self;
+}
+
+- (void) set {
+    [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set];
 }
 
 @end
-/* }}} */
-/* Reset View (UITable) {{{ */
-@interface UITable (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+@interface UITextView (iPhoneOS)
+- (void) setTextSize:(float)size;
 @end
 
-@implementation UITable (CYResetView)
+@implementation UITextView (iPhoneOS)
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [self selectRow:-1 byExtendingSelection:NO withFade:animated];
+- (void) setTextSize:(float)size {
+    [self setFont:[[self font] fontWithSize:size]];
 }
 
 @end
+#endif
 /* }}} */
-/* Reset View (UISectionList) {{{ */
-@interface UISectionList (CYResetView)
-- (void) resetViewAnimated:(BOOL)animated;
+
+@interface UIApplication (IdleTimer)
+- (void) setIdleTimerDisabled:(char)arg0;
 @end
 
-@implementation UISectionList (CYResetView)
+#ifdef __OBJC2__
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 1,
+    kUIProgressIndicatorStyleSmallWhite = 0,
+    kUIProgressIndicatorStyleSmallBlack = 4
+} UIProgressIndicatorStyle;
+#else
+typedef enum {
+    kUIProgressIndicatorStyleMediumWhite = 0,
+    kUIProgressIndicatorStyleSmallWhite = 2,
+    kUIProgressIndicatorStyleSmallBlack = 3
+} UIProgressIndicatorStyle;
+#endif
+
+typedef enum {
+    kUIControlEventMouseDown = 1 << 0,
+    kUIControlEventMouseMovedInside = 1 << 2, // mouse moved inside control target
+    kUIControlEventMouseMovedOutside = 1 << 3, // mouse moved outside control target
+    kUIControlEventMouseUpInside = 1 << 6, // mouse up inside control target
+    kUIControlEventMouseUpOutside = 1 << 7, // mouse up outside control target
+    kUIControlAllEvents = (kUIControlEventMouseDown | kUIControlEventMouseMovedInside | kUIControlEventMouseMovedOutside | kUIControlEventMouseUpInside | kUIControlEventMouseUpOutside)
+} UIControlEventMasks;
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [[self table] resetViewAnimated:animated];
+@interface NSString (UIKit)
+- (NSString *) stringByAddingPercentEscapes;
+- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
+@end
+
+@interface NSString (Cydia)
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length;
+- (NSComparisonResult) compareByPath:(NSString *)other;
+@end
+
+@implementation NSString (Cydia)
+
++ (NSString *) stringWithUTF8Bytes:(const char *)bytes length:(int)length {
+    char data[length + 1];
+    memcpy(data, bytes, length);
+    data[length] = '\0';
+    return [NSString stringWithUTF8String:data];
+}
+
+- (NSComparisonResult) compareByPath:(NSString *)other {
+    NSString *prefix = [self commonPrefixWithString:other options:0];
+    size_t length = [prefix length];
+
+    NSRange lrange = NSMakeRange(length, [self length] - length);
+    NSRange rrange = NSMakeRange(length, [other length] - length);
+
+    lrange = [self rangeOfString:@"/" options:0 range:lrange];
+    rrange = [other rangeOfString:@"/" options:0 range:rrange];
+
+    NSComparisonResult value;
+
+    if (lrange.location == NSNotFound && rrange.location == NSNotFound)
+        value = NSOrderedSame;
+    else if (lrange.location == NSNotFound)
+        value = NSOrderedAscending;
+    else if (rrange.location == NSNotFound)
+        value = NSOrderedDescending;
+    else
+        value = NSOrderedSame;
+
+    NSString *lpath = lrange.location == NSNotFound ? [self substringFromIndex:length] :
+        [self substringWithRange:NSMakeRange(length, lrange.location - length)];
+    NSString *rpath = rrange.location == NSNotFound ? [other substringFromIndex:length] :
+        [other substringWithRange:NSMakeRange(length, rrange.location - length)];
+
+    NSComparisonResult result = [lpath compare:rpath];
+    return result == NSOrderedSame ? value : result;
 }
 
 @end
-/* }}} */
 
 /* Perl-Compatible RegEx {{{ */
 class Pcre {
@@ -133,10 +255,12 @@ class Pcre {
     }
 
     NSString *operator [](size_t match) {
-        return [NSString
-            stringWithCString:(data_ + matches_[match * 2])
-            length:(matches_[match * 2 + 1] - matches_[match * 2])
-        ];
+        return [NSString stringWithUTF8Bytes:(data_ + matches_[match * 2]) length:(matches_[match * 2 + 1] - matches_[match * 2])];
+    }
+
+    bool operator ()(NSString *data) {
+        // XXX: length is for characters, not for bytes
+        return operator ()([data UTF8String], [data length]);
     }
 
     bool operator ()(const char *data, size_t size) {
@@ -145,19 +269,106 @@ class Pcre {
     }
 };
 /* }}} */
-/* CoreGraphicsServices Primitives {{{ */
+/* Mime Addresses {{{ */
+@interface Address : NSObject {
+    NSString *name_;
+    NSString *address_;
+}
+
+- (NSString *) name;
+- (NSString *) address;
+
++ (Address *) addressWithString:(NSString *)string;
+- (Address *) initWithString:(NSString *)string;
+@end
+
+@implementation Address
+
+- (void) dealloc {
+    [name_ release];
+    if (address_ != nil)
+        [address_ release];
+    [super dealloc];
+}
+
+- (NSString *) name {
+    return name_;
+}
+
+- (NSString *) address {
+    return address_;
+}
+
++ (Address *) addressWithString:(NSString *)string {
+    return [[[Address alloc] initWithString:string] autorelease];
+}
+
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"address", @"name", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (Address *) initWithString:(NSString *)string {
+    if ((self = [super init]) != nil) {
+        const char *data = [string UTF8String];
+        size_t size = [string length];
+
+        static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
+
+        if (address_r(data, size)) {
+            name_ = [address_r[1] retain];
+            address_ = [address_r[2] retain];
+        } else {
+            name_ = [[NSString alloc]
+                initWithBytes:data
+                length:size
+                encoding:kCFStringEncodingUTF8
+            ];
+
+            address_ = nil;
+        }
+    } return self;
+}
+
+@end
+/* }}} */
+/* CoreGraphics 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() :
+        color_(NULL)
+    {
+    }
+
+    CGColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) :
+        color_(NULL)
+    {
+        Set(space, red, green, blue, alpha);
+    }
+
+    void Clear() {
+        if (color_ != NULL)
+            CGColorRelease(color_);
     }
 
     ~CGColor() {
-        CGColorRelease(color_);
+        Clear();
+    }
+
+    void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
+        Clear();
+        float color[] = {red, green, blue, alpha};
+        color_ = CGColorCreate(space, color);
     }
 
     operator CGColorRef() {
@@ -171,13 +382,81 @@ class GSFont {
 
   public:
     ~GSFont() {
-        /* XXX: no GSFontRelease()? */
         CFRelease(font_);
     }
 };
 /* }}} */
+/* Right Alignment {{{ */
+@interface UIRightTextLabel : UITextLabel {
+    float       _savedRightEdgeX;
+    BOOL        _sizedtofit_flag;
+}
+
+- (void) setFrame:(CGRect)frame;
+- (void) setText:(NSString *)text;
+- (void) realignText;
+@end
+
+@implementation UIRightTextLabel
+
+- (void) setFrame:(CGRect)frame {
+    [super setFrame:frame];
+    if (_sizedtofit_flag == NO) {
+        _savedRightEdgeX = frame.origin.x;
+        [self realignText];
+    }
+}
+
+- (void) setText:(NSString *)text {
+    [super setText:text];
+    [self realignText];
+}
+
+- (void) realignText {
+    CGRect oldFrame = [self frame];
+
+    _sizedtofit_flag = YES;
+    [self sizeToFit]; // shrink down size so I can right align it
+
+    CGRect newFrame = [self frame];
+
+    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
+    oldFrame.size.width = newFrame.size.width;
+    [super setFrame:oldFrame];
+    _sizedtofit_flag = NO;
+}
+
+@end
+/* }}} */
 
+extern "C" void UISetColor(CGColorRef color);
+
+/* Random Global Variables {{{ */
 static const int PulseInterval_ = 50000;
+static const int ButtonBarHeight_ = 48;
+static const float KeyboardTime_ = 0.3f;
+static const char * const SpringBoard_ = "/System/Library/LaunchDaemons/com.apple.SpringBoard.plist";
+
+static CGColor Blue_;
+static CGColor Blueish_;
+static CGColor Black_;
+static CGColor Clear_;
+static CGColor Red_;
+static CGColor White_;
+static CGColor Gray_;
+
+static NSString *Home_;
+static BOOL Sounds_Keyboard_;
+
+static BOOL Advanced_;
+static BOOL Loaded_;
+static BOOL Ignored_;
+
+static UIFont *Font12_;
+static UIFont *Font12Bold_;
+static UIFont *Font14_;
+static UIFont *Font18Bold_;
+static UIFont *Font22Bold_;
 
 const char *Firmware_ = NULL;
 const char *Machine_ = NULL;
@@ -187,15 +466,25 @@ unsigned Major_;
 unsigned Minor_;
 unsigned BugFix_;
 
+CFLocaleRef Locale_;
+CGColorSpaceRef space_;
+
 #define FW_LEAST(major, minor, bugfix) \
     (major < Major_ || major == Major_ && \
         (minor < Minor_ || minor == Minor_ && \
             bugfix <= BugFix_))
 
-bool bootstrap_ = false;
+bool bootstrap_;
+bool reload_;
 
+static NSDictionary *SectionMap_;
 static NSMutableDictionary *Metadata_;
-static NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Settings_;
+static _transient NSString *Role_;
+static _transient NSMutableDictionary *Packages_;
+static _transient NSMutableDictionary *Sections_;
+static _transient NSMutableDictionary *Sources_;
+static bool Changed_;
 static NSDate *now_;
 
 NSString *GetLastUpdate() {
@@ -204,22 +493,18 @@ NSString *GetLastUpdate() {
     if (update == nil)
         return @"Never or Unknown";
 
-    CFLocaleRef locale = CFLocaleCopyCurrent();
-    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+    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;
-- (void) setTitle:(NSString *)title;
-- (void) setPercent:(float)percent;
-- (void) addOutput:(NSString *)output;
-@end
+/* }}} */
+/* Display Helpers {{{ */
+inline float Interpolate(float begin, float end, float fraction) {
+    return (end - begin) * fraction + begin;
+}
 
 NSString *SizeString(double size) {
     unsigned power = 0;
@@ -233,22 +518,26 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%.1f%s", size, powers_[power]];
 }
 
+NSString *StripVersion(NSString *version) {
+    NSRange colon = [version rangeOfString:@":"];
+    if (colon.location != NSNotFound)
+        version = [version substringFromIndex:(colon.location + 1)];
+    return version;
+}
+
 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)
+    /*if (html)
         [text setHTML:value];
-    else
+    else*/
         [text setText:value];
     [text setEnabled:NO];
 
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-    CGColor clear(space, 0, 0, 0, 0);
-    [text setBackgroundColor:clear];
-    CGColorSpaceRelease(space);
+    [text setBackgroundColor:Clear_];
 
     CGRect frame = [text frame];
     [text setFrame:frame];
@@ -259,12 +548,80 @@ UITextView *GetTextView(NSString *value, float left, bool html) {
     return text;
 }
 
+NSString *Simplify(NSString *title) {
+    const char *data = [title UTF8String];
+    size_t size = [title length];
+
+    static Pcre square_r("^\\[(.*)\\]$");
+    if (square_r(data, size))
+        return Simplify(square_r[1]);
+
+    static Pcre paren_r("^\\((.*)\\)$");
+    if (paren_r(data, size))
+        return Simplify(paren_r[1]);
+
+    static Pcre title_r("^(.*?) \\(.*\\)$");
+    if (title_r(data, size))
+        return Simplify(title_r[1]);
+
+    return title;
+}
+/* }}} */
+
+bool isSectionVisible(NSString *section) {
+    NSDictionary *metadata = [Sections_ objectForKey:section];
+    NSNumber *hidden = metadata == nil ? nil : [metadata objectForKey:@"Hidden"];
+    return hidden == nil || ![hidden boolValue];
+}
+
+/* Delegate Prototypes {{{ */
+@class Package;
+@class Source;
+
+@interface NSObject (ProgressDelegate)
+@end
+
+@implementation NSObject(ProgressDelegate)
+
+- (void) _setProgressError:(NSArray *)args {
+    [self performSelector:@selector(setProgressError:forPackage:)
+        withObject:[args objectAtIndex:0]
+        withObject:([args count] == 1 ? nil : [args objectAtIndex:1])
+    ];
+}
+
+@end
+
+@protocol ProgressDelegate
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id;
+- (void) setProgressTitle:(NSString *)title;
+- (void) setProgressPercent:(float)percent;
+- (void) addProgressOutput:(NSString *)output;
+@end
+
+@protocol ConfigurationDelegate
+- (void) repairWithSelector:(SEL)selector;
+- (void) setConfigurationData:(NSString *)data;
+@end
+
+@protocol CydiaDelegate
+- (void) installPackage:(Package *)package;
+- (void) removePackage:(Package *)package;
+- (void) slideUp:(UIAlertSheet *)alert;
+- (void) distUpgrade;
+- (void) updateData;
+- (void) syncData;
+- (void) askForSettings;
+- (UIProgressHUD *) addProgressHUD;
+@end
+/* }}} */
+
 /* Status Delegation {{{ */
 class Status :
     public pkgAcquireStatus
 {
   private:
-    id delegate_;
+    _transient NSObject<ProgressDelegate> *delegate_;
 
   public:
     Status() :
@@ -284,7 +641,7 @@ class Status :
     }
 
     virtual void Fetch(pkgAcquire::ItemDesc &item) {
-        [delegate_ setTitle:[NSString stringWithCString:("Downloading " + item.ShortDesc).c_str()]];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
     }
 
     virtual void Done(pkgAcquire::ItemDesc &item) {
@@ -297,7 +654,10 @@ class Status :
         )
             return;
 
-        [delegate_ setError:[NSString stringWithCString:item.Owner->ErrorText.c_str()]];
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()], nil]
+            waitUntilDone:YES
+        ];
     }
 
     virtual bool Pulse(pkgAcquire *Owner) {
@@ -308,7 +668,7 @@ class Status :
             double(TotalBytes + TotalItems)
         );
 
-        [delegate_ setPercent:percent];
+        [delegate_ setProgressPercent:percent];
         return value;
     }
 
@@ -324,12 +684,12 @@ class Progress :
     public OpProgress
 {
   private:
-    id delegate_;
+    _transient id<ProgressDelegate> delegate_;
 
   protected:
     virtual void Update() {
-        [delegate_ setTitle:[NSString stringWithCString:Op.c_str()]];
-        [delegate_ setPercent:(Percent / 100)];
+        [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];
+        [delegate_ setProgressPercent:(Percent / 100)];
     }
 
   public:
@@ -343,358 +703,1418 @@ class Progress :
     }
 
     virtual void Done() {
-        [delegate_ setPercent:1];
+        [delegate_ setProgressPercent:1];
     }
 };
 /* }}} */
 
-/* External Constants {{{ */
-extern NSString *kUIButtonBarButtonAction;
-extern NSString *kUIButtonBarButtonInfo;
-extern NSString *kUIButtonBarButtonInfoOffset;
-extern NSString *kUIButtonBarButtonSelectedInfo;
-extern NSString *kUIButtonBarButtonStyle;
-extern NSString *kUIButtonBarButtonTag;
-extern NSString *kUIButtonBarButtonTarget;
-extern NSString *kUIButtonBarButtonTitle;
-extern NSString *kUIButtonBarButtonTitleVerticalHeight;
-extern NSString *kUIButtonBarButtonTitleWidth;
-extern NSString *kUIButtonBarButtonType;
-/* }}} */
-/* Mime Addresses {{{ */
-Pcre email_r("^\"?(.*)\"? <([^>]*)>$");
+/* Database Interface {{{ */
+@interface Database : NSObject {
+    pkgCacheFile cache_;
+    pkgDepCache::Policy *policy_;
+    pkgRecords *records_;
+    pkgProblemResolver *resolver_;
+    pkgAcquire *fetcher_;
+    FileFd *lock_;
+    SPtr<pkgPackageManager> manager_;
+    pkgSourceList *list_;
 
-@interface Address : NSObject {
-    NSString *name_;
-    NSString *email_;
-}
+    NSMutableDictionary *sources_;
+    NSMutableArray *packages_;
 
-- (void) dealloc;
+    _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_;
+    Status status_;
+    Progress progress_;
 
-- (NSString *) name;
-- (NSString *) email;
+    int cydiafd_;
+    int statusfd_;
+    FILE *input_;
+}
 
-+ (Address *) addressWithString:(NSString *)string;
-- (Address *) initWithString:(NSString *)string;
-@end
+- (void) _readCydia:(NSNumber *)fd;
+- (void) _readStatus:(NSNumber *)fd;
+- (void) _readOutput:(NSNumber *)fd;
 
-@implementation Address
+- (FILE *) input;
 
-- (void) dealloc {
-    [name_ release];
-    if (email_ != nil)
-        [email_ release];
-    [super dealloc];
-}
+- (Package *) packageWithName:(NSString *)name;
 
-- (NSString *) name {
-    return name_;
-}
+- (Database *) init;
+- (pkgCacheFile &) cache;
+- (pkgDepCache::Policy *) policy;
+- (pkgRecords *) records;
+- (pkgProblemResolver *) resolver;
+- (pkgAcquire &) fetcher;
+- (NSArray *) packages;
+- (NSArray *) sources;
+- (void) reloadData;
 
-- (NSString *) email {
-    return email_;
-}
+- (void) configure;
+- (void) prepare;
+- (void) perform;
+- (void) upgrade;
+- (void) update;
 
-+ (Address *) addressWithString:(NSString *)string {
-    return [[[Address alloc] initWithString:string] autorelease];
-}
+- (void) updateWithStatus:(Status &)status;
 
-- (Address *) initWithString:(NSString *)string {
-    if ((self = [super init]) != nil) {
-        const char *data = [string UTF8String];
-        size_t size = [string length];
+- (void) setDelegate:(id)delegate;
+- (Source *) getSource:(const pkgCache::PkgFileIterator &)file;
+@end
+/* }}} */
 
-        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;
-        }
-    } return self;
-}
-
-@end
-/* }}} */
-
-/* Right Alignment {{{ */
-@interface UIRightTextLabel : UITextLabel {
-    float       _savedRightEdgeX;
-    BOOL        _sizedtofit_flag;
-}
+/* Source Class {{{ */
+@interface Source : NSObject {
+    NSString *description_;
+    NSString *label_;
+    NSString *origin_;
 
-- (void) setFrame:(CGRect)frame;
-- (void) setText:(NSString *)text;
-- (void) realignText;
-@end
+    NSString *uri_;
+    NSString *distribution_;
+    NSString *type_;
+    NSString *version_;
 
-@implementation UIRightTextLabel
+    NSString *defaultIcon_;
 
-- (void) setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    if (_sizedtofit_flag == NO) {
-        _savedRightEdgeX = frame.origin.x;
-        [self realignText];
-    }
+    NSDictionary *record_;
+    BOOL trusted_;
 }
 
-- (void) setText:(NSString *)text {
-    [super setText:text];
-    [self realignText];
-}
+- (Source *) initWithMetaIndex:(metaIndex *)index;
 
-- (void) realignText {
-    CGRect oldFrame = [self frame];
+- (NSComparisonResult) compareByNameAndType:(Source *)source;
 
-    _sizedtofit_flag = YES;
-    [self sizeToFit]; // shrink down size so I can right align it
+- (NSDictionary *) record;
+- (BOOL) trusted;
 
-    CGRect newFrame = [self frame];
+- (NSString *) uri;
+- (NSString *) distribution;
+- (NSString *) type;
+- (NSString *) key;
+- (NSString *) host;
 
-    oldFrame.origin.x = _savedRightEdgeX - newFrame.size.width;
-    oldFrame.size.width = newFrame.size.width;
-    [super setFrame:oldFrame];
-    _sizedtofit_flag = NO;
-}
+- (NSString *) name;
+- (NSString *) description;
+- (NSString *) label;
+- (NSString *) origin;
+- (NSString *) version;
+
+- (NSString *) defaultIcon;
 
 @end
-/* }}} */
-/* Linear Algebra {{{ */
-inline float interpolate(float begin, float end, float fraction) {
-    return (end - begin) * fraction + begin;
-}
-/* }}} */
 
-@class Package;
-@class Source;
+@implementation Source
 
-/* Database Interface {{{ */
-@interface Database : NSObject {
-    pkgCacheFile cache_;
-    pkgRecords *records_;
-    pkgProblemResolver *resolver_;
-    pkgAcquire *fetcher_;
-    FileFd *lock_;
-    SPtr<pkgPackageManager> manager_;
-    pkgSourceList *list_;
+- (void) dealloc {
+    [uri_ release];
+    [distribution_ release];
+    [type_ release];
 
-    NSMutableDictionary *sources_;
-    NSMutableArray *packages_;
+    if (description_ != nil)
+        [description_ release];
+    if (label_ != nil)
+        [label_ release];
+    if (origin_ != nil)
+        [origin_ release];
+    if (version_ != nil)
+        [version_ release];
+    if (defaultIcon_ != nil)
+        [defaultIcon_ release];
+    if (record_ != nil)
+        [record_ release];
 
-    id delegate_;
-    Status status_;
-    Progress progress_;
-    int statusfd_;
+    [super dealloc];
 }
 
-- (void) dealloc;
-
-- (void) _readStatus:(NSNumber *)fd;
-- (void) _readOutput:(NSNumber *)fd;
-
-- (Package *) packageWithName:(NSString *)name;
-
-- (Database *) init;
-- (pkgCacheFile &) cache;
-- (pkgRecords *) records;
-- (pkgProblemResolver *) resolver;
-- (pkgAcquire &) fetcher;
-- (NSArray *) packages;
-- (void) reloadData;
-
-- (void) prepare;
-- (void) perform;
-- (void) update;
-- (void) upgrade;
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"description", @"distribution", @"host", @"key", @"label", @"name", @"origin", @"trusted", @"type", @"uri", @"version", nil];
+}
 
-- (void) setDelegate:(id)delegate;
-- (Source *) getSource:(const pkgCache::PkgFileIterator &)file;
-@end
-/* }}} */
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
 
-/* Reset View {{{ */
-@interface ResetView : UIView {
-    UIPushButton *configure_;
-    UIPushButton *reload_;
-    NSMutableArray *views_;
-    UINavigationBar *navbar_;
-    UITransitionView *transition_;
-    bool resetting_;
-    id delegate_;
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
-- (void) dealloc;
+- (Source *) initWithMetaIndex:(metaIndex *)index {
+    if ((self = [super init]) != nil) {
+        trusted_ = index->IsTrusted();
 
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+        uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
+        distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
+        type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
 
-- (id) initWithFrame:(CGRect)frame;
-- (void) setDelegate:(id)delegate;
+        description_ = nil;
+        label_ = nil;
+        origin_ = nil;
+        version_ = nil;
+        defaultIcon_ = nil;
 
-- (void) configurePushed;
-- (void) reloadPushed;
+        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;
 
-- (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
+                std::string name(line.substr(0, colon));
+                std::string value(line.substr(colon + 1));
+                while (!value.empty() && value[0] == ' ')
+                    value = value.substr(1);
 
-@implementation ResetView
+                if (name == "Default-Icon")
+                    defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+                else if (name == "Description")
+                    description_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+                else if (name == "Label")
+                    label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+                else if (name == "Origin")
+                    origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+                else if (name == "Version")
+                    version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+            }
+        }
 
-- (void) dealloc {
-    [configure_ release];
-    [reload_ release];
-    [transition_ release];
-    [navbar_ release];
-    [views_ release];
-    [super dealloc];
+        record_ = [Sources_ objectForKey:[self key]];
+        if (record_ != nil)
+            record_ = [record_ retain];
+    } return self;
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar poppedItem:(UINavigationItem *)item {
-    [views_ removeLastObject];
-    UIView *view([views_ lastObject]);
-    [view resetViewAnimated:!resetting_];
+- (NSComparisonResult) compareByNameAndType:(Source *)source {
+    NSDictionary *lhr = [self record];
+    NSDictionary *rhr = [source record];
 
-    if (!resetting_) {
-        [transition_ transition:2 toView:view];
-        [self _resetView];
-    }
-}
-
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
-}
+    if (lhr != rhr)
+        return lhr == nil ? NSOrderedDescending : NSOrderedAscending;
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        views_ = [[NSMutableArray arrayWithCapacity:4] retain];
+    NSString *lhs = [self name];
+    NSString *rhs = [source name];
 
-        struct CGRect bounds = [self bounds];
-        CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
-        CGRect navrect = {{0, 0}, navsize};
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [self addSubview:navbar_];
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+    return [lhs caseInsensitiveCompare:rhs];
+}
 
-        transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
-            bounds.origin.x, bounds.origin.y + navsize.height, bounds.size.width, bounds.size.height - navsize.height
-        )];
+- (NSDictionary *) record {
+    return record_;
+}
 
-        //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];
+- (BOOL) trusted {
+    return trusted_;
+}
 
-        //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];
+- (NSString *) uri {
+    return uri_;
+}
 
-        [navbar_ addSubview:configure_];
-        [navbar_ addSubview:reload_];
+- (NSString *) distribution {
+    return distribution_;
+}
 
-        [self addSubview:transition_];
-    } return self;
+- (NSString *) type {
+    return type_;
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (NSString *) key {
+    return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_];
 }
 
-- (void) configurePushed {
-    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Sources Unimplemented"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
-        defaultButtonIndex:0
-        delegate:self
-        context:self
-    ] autorelease];
+- (NSString *) host {
+    return [[[NSURL URLWithString:[self uri]] host] lowercaseString];
+}
 
-    [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];
+- (NSString *) name {
+    return origin_ == nil ? [self host] : origin_;
 }
 
-- (void) reloadPushed {
-    [delegate_ update];
+- (NSString *) description {
+    return description_;
 }
 
-- (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];
+- (NSString *) label {
+    return label_ == nil ? [self host] : label_;
+}
 
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+- (NSString *) origin {
+    return origin_;
+}
 
-    [transition_ transition:([views_ count] == 0 ? 0 : 1) toView:view];
-    [views_ addObject:view];
+- (NSString *) version {
+    return version_;
 }
 
-- (void) popViews:(unsigned)views {
-    resetting_ = true;
-    for (unsigned i(0); i != views; ++i)
-        [navbar_ popNavigationItem];
-    resetting_ = false;
+- (NSString *) defaultIcon {
+    return defaultIcon_;
+}
 
-    [self _resetView];
-    [transition_ transition:2 toView:[views_ lastObject]];
+@end
+/* }}} */
+/* Relationship Class {{{ */
+@interface Relationship : NSObject {
+    NSString *type_;
+    NSString *id_;
 }
 
-- (void) resetView:(BOOL)clear {
-    resetting_ = true;
+- (NSString *) type;
+- (NSString *) id;
+- (NSString *) name;
 
-    if ([views_ count] > 1) {
-        [navbar_ disableAnimation];
-        while ([views_ count] != (clear ? 1 : 2))
-            [navbar_ popNavigationItem];
-        [navbar_ enableAnimation];
-        if (!clear)
-            [navbar_ popNavigationItem];
-    }
+@end
 
-    resetting_ = false;
+@implementation Relationship
 
-    [self _resetView];
-    [transition_ transition:(clear ? 0 : 2) toView:[views_ lastObject]];
+- (void) dealloc {
+    [type_ release];
+    [id_ release];
+    [super dealloc];
 }
 
-- (void) _resetView {
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:nil];
+- (NSString *) type {
+    return type_;
 }
 
-- (void) setPrompt {
-    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+- (NSString *) id {
+    return id_;
 }
 
-@end
-/* }}} */
-/* Confirmation View {{{ */
-void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
-    if ([packages count] == 0)
-        return;
-
-    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);
+- (NSString *) name {
+    _assert(false);
+    return nil;
 }
 
-@protocol ConfirmationViewDelegate
-- (void) cancel;
-- (void) confirm;
 @end
+/* }}} */
+/* Package Class {{{ */
+NSString *Scour(const char *field, const char *begin, const char *end) {
+    size_t i(0), l(strlen(field));
 
-@interface ConfirmationView : UIView {
-    Database *database_;
+    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 stringWithUTF8Bytes:value length:(line - value)];
+        } else {
+            begin = std::find(begin, end, '\n');
+            if (begin == end)
+                return nil;
+            ++begin;
+        }
+    }
+}
+
+@interface Package : NSObject {
+    pkgCache::PkgIterator iterator_;
+    _transient Database *database_;
+    pkgCache::VerIterator version_;
+    pkgCache::VerFileIterator file_;
+
+    Source *source_;
+    bool cached_;
+
+    NSString *latest_;
+    NSString *installed_;
+
+    NSString *id_;
+    NSString *name_;
+    NSString *tagline_;
+    NSString *icon_;
+    NSString *homepage_;
+    Address *sponsor_;
+    Address *author_;
+    NSArray *tags_;
+    NSString *role_;
+
+    NSArray *relationships_;
+}
+
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
+
+- (pkgCache::PkgIterator) iterator;
+
+- (NSString *) section;
+- (Address *) maintainer;
+- (size_t) size;
+- (NSString *) description;
+- (NSString *) index;
+
+- (NSDate *) seen;
+
+- (NSString *) latest;
+- (NSString *) installed;
+
+- (BOOL) valid;
+- (BOOL) upgradableAndEssential:(BOOL)essential;
+- (BOOL) essential;
+- (BOOL) broken;
+- (BOOL) visible;
+
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
+
+- (NSString *) id;
+- (NSString *) name;
+- (NSString *) tagline;
+- (NSString *) icon;
+- (NSString *) homepage;
+- (Address *) author;
+
+- (NSArray *) relationships;
+
+- (Source *) source;
+- (NSString *) role;
+
+- (BOOL) matches:(NSString *)text;
+
+- (bool) hasSupportingRole;
+- (BOOL) hasTag:(NSString *)tag;
+
+- (NSComparisonResult) compareByName:(Package *)package;
+- (NSComparisonResult) compareBySection:(Package *)package;
+- (NSComparisonResult) compareBySectionAndName:(Package *)package;
+- (NSComparisonResult) compareForChanges:(Package *)package;
+
+- (void) install;
+- (void) remove;
+
+- (NSNumber *) isVisiblySearchedForBy:(NSString *)search;
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number;
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)section;
+- (NSNumber *) isVisibleInSource:(Source *)source;
+
+@end
+
+@implementation Package
+
+- (void) dealloc {
+    if (source_ != nil)
+        [source_ release];
+
+    [latest_ release];
+    if (installed_ != nil)
+        [installed_ release];
+
+    [id_ release];
+    if (name_ != nil)
+        [name_ release];
+    [tagline_ release];
+    if (icon_ != nil)
+        [icon_ release];
+    if (homepage_ != nil)
+        [homepage_ release];
+    if (sponsor_ != nil)
+        [sponsor_ release];
+    if (author_ != nil)
+        [author_ release];
+    if (tags_ != nil)
+        [tags_ release];
+    if (role_ != nil)
+        [role_ release];
+
+    if (relationships_ != nil)
+        [relationships_ release];
+
+    [super dealloc];
+}
+
++ (NSArray *) _attributeKeys {
+    return [NSArray arrayWithObjects:@"author", @"description", @"essential", @"homepage", @"icon", @"id", @"installed", @"latest", @"maintainer", @"name", @"section", @"size", @"source", @"sponsor", @"tagline", nil];
+}
+
+- (NSArray *) attributeKeys {
+    return [[self class] _attributeKeys];
+}
+
++ (BOOL) isKeyExcludedFromWebScript:(const char *)name {
+    return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
+}
+
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    if ((self = [super init]) != nil) {
+        iterator_ = iterator;
+        database_ = database;
+
+        version_ = [database_ policy]->GetCandidateVer(iterator_);
+        latest_ = version_.end() ? nil : [StripVersion([NSString stringWithUTF8String:version_.VerStr()]) retain];
+
+        if (!version_.end())
+            file_ = version_.FileList();
+        else {
+            pkgCache &cache([database_ cache]);
+            file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+        }
+
+        pkgCache::VerIterator current = iterator_.CurrentVer();
+        installed_ = current.end() ? nil : [StripVersion([NSString stringWithUTF8String:current.VerStr()]) retain];
+
+        id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
+
+        if (!file_.end()) {
+            pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+
+            const char *begin, *end;
+            parser->GetRec(begin, end);
+
+            name_ = Scour("Name", begin, end);
+            if (name_ != nil)
+                name_ = [name_ retain];
+            tagline_ = [[NSString stringWithUTF8String:parser->ShortDesc().c_str()] retain];
+            icon_ = Scour("Icon", begin, end);
+            if (icon_ != nil)
+                icon_ = [icon_ retain];
+            homepage_ = Scour("Homepage", begin, end);
+            if (homepage_ == nil)
+                homepage_ = Scour("Website", begin, end);
+            if (homepage_ != nil)
+                homepage_ = [homepage_ retain];
+            NSString *sponsor = Scour("Sponsor", begin, end);
+            if (sponsor != nil)
+                sponsor_ = [[Address addressWithString:sponsor] retain];
+            NSString *author = Scour("Author", begin, end);
+            if (author != nil)
+                author_ = [[Address addressWithString:author] retain];
+            NSString *tags = Scour("Tag", begin, end);
+            if (tags != nil)
+                tags_ = [[tags componentsSeparatedByString:@", "] retain];
+        }
+
+        if (tags_ != nil)
+            for (int i(0), e([tags_ count]); i != e; ++i) {
+                NSString *tag = [tags_ objectAtIndex:i];
+                if ([tag hasPrefix:@"role::"]) {
+                    role_ = [[tag substringFromIndex:6] retain];
+                    break;
+                }
+            }
+
+        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
+        if (metadata == nil || [metadata count] == 0) {
+            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                now_, @"FirstSeen",
+            nil];
+
+            [Packages_ setObject:metadata forKey:id_];
+            Changed_ = true;
+        }
+    } return self;
+}
+
++ (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
+    return [[[Package alloc]
+        initWithIterator:iterator 
+        database:database
+    ] autorelease];
+}
+
+- (pkgCache::PkgIterator) iterator {
+    return iterator_;
+}
+
+- (NSString *) section {
+    const char *section = iterator_.Section();
+    if (section == NULL)
+        return nil;
+
+    NSString *name = [[NSString stringWithUTF8String:section] stringByReplacingCharacter:' ' withCharacter:'_'];
+
+  lookup:
+    if (NSDictionary *value = [SectionMap_ objectForKey:name])
+        if (NSString *rename = [value objectForKey:@"Rename"]) {
+            name = rename;
+            goto lookup;
+        }
+
+    return [name stringByReplacingCharacter:'_' withCharacter:' '];
+}
+
+- (Address *) maintainer {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    return [Address addressWithString:[NSString stringWithUTF8String:parser->Maintainer().c_str()]];
+}
+
+- (size_t) size {
+    return version_.end() ? 0 : version_->InstalledSize;
+}
+
+- (NSString *) description {
+    if (file_.end())
+        return nil;
+    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+    NSString *description([NSString stringWithUTF8String: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];
+    }
+
+    return [trimmed componentsJoinedByString:@"\n"];
+}
+
+- (NSString *) index {
+    NSString *index = [[[self name] substringToIndex:1] uppercaseString];
+    return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
+}
+
+- (NSDate *) seen {
+    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
+}
+
+- (NSString *) latest {
+    return latest_;
+}
+
+- (NSString *) installed {
+    return installed_;
+}
+
+- (BOOL) valid {
+    return !version_.end();
+}
+
+- (BOOL) upgradableAndEssential:(BOOL)essential {
+    pkgCache::VerIterator current = iterator_.CurrentVer();
+
+    if (current.end())
+        return essential && [self essential];
+    else {
+        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
+        return !candidate.end() && candidate != current;
+    }
+}
+
+- (BOOL) essential {
+    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+}
+
+- (BOOL) broken {
+    return [database_ cache][iterator_].InstBroken();
+}
+
+- (BOOL) visible {
+    NSString *section = [self section];
+    return [self hasSupportingRole] && (section == nil || isSectionVisible(section));
+}
+
+- (BOOL) half {
+    unsigned char current = iterator_->CurrentState;
+    return current == pkgCache::State::HalfConfigured || current == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) halfConfigured {
+    return iterator_->CurrentState == pkgCache::State::HalfConfigured;
+}
+
+- (BOOL) halfInstalled {
+    return iterator_->CurrentState == pkgCache::State::HalfInstalled;
+}
+
+- (BOOL) hasMode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+    return state.Mode != pkgDepCache::ModeKeep;
+}
+
+- (NSString *) mode {
+    pkgDepCache::StateCache &state([database_ cache][iterator_]);
+
+    switch (state.Mode) {
+        case pkgDepCache::ModeDelete:
+            if ((state.iFlags & pkgDepCache::Purge) != 0)
+                return @"Purge";
+            else
+                return @"Remove";
+            _assert(false);
+        case pkgDepCache::ModeKeep:
+            if ((state.iFlags & pkgDepCache::AutoKept) != 0)
+                return nil;
+            else
+                return nil;
+            _assert(false);
+        case pkgDepCache::ModeInstall:
+            if ((state.iFlags & pkgDepCache::ReInstall) != 0)
+                return @"Reinstall";
+            else switch (state.Status) {
+                case -1:
+                    return @"Downgrade";
+                case 0:
+                    return @"Install";
+                case 1:
+                    return @"Upgrade";
+                case 2:
+                    return @"New Install";
+                default:
+                    _assert(false);
+            }
+        default:
+            _assert(false);
+    }
+}
+
+- (NSString *) id {
+    return id_;
+}
+
+- (NSString *) name {
+    return name_ == nil ? id_ : name_;
+}
+
+- (NSString *) tagline {
+    return tagline_;
+}
+
+- (NSString *) icon {
+    return icon_;
+}
+
+- (NSString *) homepage {
+    return homepage_;
+}
+
+- (Address *) sponsor {
+    return sponsor_;
+}
+
+- (Address *) author {
+    return author_;
+}
+
+- (NSArray *) relationships {
+    return relationships_;
+}
+
+- (Source *) source {
+    if (!cached_) {
+        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
+        cached_ = true;
+    }
+
+    return source_;
+}
+
+- (NSString *) role {
+    return role_;
+}
+
+- (BOOL) matches:(NSString *)text {
+    if (text == nil)
+        return NO;
+
+    NSRange range;
+
+    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
+    if (range.location != NSNotFound)
+        return YES;
+
+    return NO;
+}
+
+- (bool) hasSupportingRole {
+    if (role_ == nil)
+        return true;
+    if ([role_ isEqualToString:@"enduser"])
+        return true;
+    if ([Role_ isEqualToString:@"User"])
+        return false;
+    if ([role_ isEqualToString:@"hacker"])
+        return true;
+    if ([Role_ isEqualToString:@"Hacker"])
+        return false;
+    if ([role_ isEqualToString:@"developer"])
+        return true;
+    if ([Role_ isEqualToString:@"Developer"])
+        return false;
+    _assert(false);
+}
+
+- (BOOL) hasTag:(NSString *)tag {
+    return tags_ == nil ? NO : [tags_ containsObject:tag];
+}
+
+- (NSComparisonResult) compareByName:(Package *)package {
+    NSString *lhs = [self name];
+    NSString *rhs = [package name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs caseInsensitiveCompare:rhs];
+}
+
+- (NSComparisonResult) compareBySection:(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 caseInsensitiveCompare:rhs];
+        if (result != NSOrderedSame)
+            return result;
+    }
+
+    return NSOrderedSame;
+}
+
+- (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;
+    }
+
+    return [self compareByName:package];
+}
+
+- (NSComparisonResult) compareForChanges:(Package *)package {
+    BOOL lhs = [self upgradableAndEssential:YES];
+    BOOL rhs = [package upgradableAndEssential:YES];
+
+    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);
+        }
+    }
+
+    return [self compareByName:package];
+}
+
+- (void) install {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    pkgCacheFile &cache([database_ cache]);
+    cache->MarkInstall(iterator_, false);
+    pkgDepCache::StateCache &state((*cache)[iterator_]);
+    if (!state.Install())
+        cache->SetReInstall(iterator_, true);
+}
+
+- (void) remove {
+    pkgProblemResolver *resolver = [database_ resolver];
+    resolver->Clear(iterator_);
+    resolver->Protect(iterator_);
+    resolver->Remove(iterator_);
+    [database_ cache]->MarkDelete(iterator_, true);
+}
+
+- (NSNumber *) isVisiblySearchedForBy:(NSString *)search {
+    return [NSNumber numberWithBool:(
+        [self valid] && [self visible] && [self matches:search]
+    )];
+}
+
+- (NSNumber *) isInstalledAndVisible:(NSNumber *)number {
+    return [NSNumber numberWithBool:(
+        (![number boolValue] || [self visible]) && [self installed] != nil
+    )];
+}
+
+- (NSNumber *) isVisiblyUninstalledInSection:(NSString *)name {
+    NSString *section = [self section];
+
+    return [NSNumber numberWithBool:(
+        [self valid] && [self visible] &&
+        [self installed] == nil && (
+            name == nil ||
+            section == nil && [name length] == 0 ||
+            [name isEqualToString:section]
+        )
+    )];
+}
+
+- (NSNumber *) isVisibleInSource:(Source *)source {
+    return [NSNumber numberWithBool:([self source] == source && [self visible])];
+}
+
+@end
+/* }}} */
+/* Section Class {{{ */
+@interface Section : NSObject {
+    NSString *name_;
+    size_t row_;
+    size_t count_;
+}
+
+- (NSComparisonResult) compareByName:(Section *)section;
+- (Section *) initWithName:(NSString *)name;
+- (Section *) initWithName:(NSString *)name row:(size_t)row;
+- (NSString *) name;
+- (size_t) row;
+- (size_t) count;
+- (void) addToCount;
+
+@end
+
+@implementation Section
+
+- (void) dealloc {
+    [name_ release];
+    [super dealloc];
+}
+
+- (NSComparisonResult) compareByName:(Section *)section {
+    NSString *lhs = [self name];
+    NSString *rhs = [section name];
+
+    if ([lhs length] != 0 && [rhs length] != 0) {
+        unichar lhc = [lhs characterAtIndex:0];
+        unichar rhc = [rhs characterAtIndex:0];
+
+        if (isalpha(lhc) && !isalpha(rhc))
+            return NSOrderedAscending;
+        else if (!isalpha(lhc) && isalpha(rhc))
+            return NSOrderedDescending;
+    }
+
+    return [lhs caseInsensitiveCompare:rhs];
+}
+
+- (Section *) initWithName:(NSString *)name {
+    return [self initWithName:name row:0];
+}
+
+- (Section *) initWithName:(NSString *)name row:(size_t)row {
+    if ((self = [super init]) != nil) {
+        name_ = [name retain];
+        row_ = row;
+    } return self;
+}
+
+- (NSString *) name {
+    return name_;
+}
+
+- (size_t) row {
+    return row_;
+}
+
+- (size_t) count {
+    return count_;
+}
+
+- (void) addToCount {
+    ++count_;
+}
+
+@end
+/* }}} */
+
+int Finish_;
+NSArray *Finishes_;
+
+/* Database Implementation {{{ */
+@implementation Database
+
+- (void) dealloc {
+    _assert(false);
+    [super dealloc];
+}
+
+- (void) _readCydia:(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;
+
+    static Pcre finish_r("^finish:([^:]*)$");
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+
+        if (finish_r(data, size)) {
+            NSString *finish = finish_r[1];
+            int index = [Finishes_ indexOfObject:finish];
+            if (index != INT_MAX && index > Finish_)
+                Finish_ = index;
+        }
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (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;
+
+    static Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    static Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
+
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "S:%s\n", data);
+
+        if (conffile_r(data, size)) {
+            [delegate_ setConfigurationData:conffile_r[1]];
+        } else if (strncmp(data, "status: ", 8) == 0) {
+            NSString *string = [NSString stringWithUTF8String:(data + 8)];
+            [delegate_ setProgressTitle:string];
+        } else if (pmstatus_r(data, size)) {
+            std::string type([pmstatus_r[1] UTF8String]);
+            NSString *id = pmstatus_r[2];
+
+            float percent([pmstatus_r[3] floatValue]);
+            [delegate_ setProgressPercent:(percent / 100)];
+
+            NSString *string = pmstatus_r[4];
+
+            if (type == "pmerror")
+                [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+                    withObject:[NSArray arrayWithObjects:string, id, nil]
+                    waitUntilDone:YES
+                ];
+            else if (type == "pmstatus")
+                [delegate_ setProgressTitle:string];
+            else if (type == "pmconffile")
+                [delegate_ setConfigurationData:string];
+            else _assert(false);
+        } 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)) {
+        fprintf(stderr, "O:%s\n", line.c_str());
+        [delegate_ addProgressOutput:[NSString stringWithUTF8String:line.c_str()]];
+    }
+
+    [pool release];
+    _assert(false);
+}
+
+- (FILE *) input {
+    return input_;
+}
+
+- (Package *) packageWithName:(NSString *)name {
+    if (static_cast<pkgDepCache *>(cache_) == NULL)
+        return nil;
+    pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String]));
+    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+}
+
+- (Database *) init {
+    if ((self = [super init]) != nil) {
+        policy_ = NULL;
+        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);
+        cydiafd_ = fds[1];
+
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 1"] UTF8String], _not(int));
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
+        _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[0], 0) != -1);
+        _assert(close(fds[0]) != -1);
+
+        input_ = fdopen(fds[1], "a");
+
+        _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_;
+}
+
+- (pkgDepCache::Policy *) policy {
+    return policy_;
+}
+
+- (pkgRecords *) records {
+    return records_;
+}
+
+- (pkgProblemResolver *) resolver {
+    return resolver_;
+}
+
+- (pkgAcquire &) fetcher {
+    return *fetcher_;
+}
+
+- (NSArray *) packages {
+    return packages_;
+}
+
+- (NSArray *) sources {
+    return [sources_ allValues];
+}
+
+- (void) reloadData {
+    _error->Discard();
+
+    delete list_;
+    list_ = NULL;
+    manager_ = NULL;
+    delete lock_;
+    lock_ = NULL;
+    delete fetcher_;
+    fetcher_ = NULL;
+    delete resolver_;
+    resolver_ = NULL;
+    delete records_;
+    records_ = NULL;
+    delete policy_;
+    policy_ = NULL;
+
+    cache_.Close();
+
+    if (!cache_.Open(progress_, true)) {
+        std::string error;
+        if (!_error->PopMessage(error))
+            _assert(false);
+        _error->Discard();
+        fprintf(stderr, "cache_.Open():[%s]\n", error.c_str());
+
+        if (error == "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem. ")
+            [delegate_ repairWithSelector:@selector(configure)];
+        else if (error == "The package lists or status file could not be parsed or opened.")
+            [delegate_ repairWithSelector:@selector(update)];
+        // else if (error == "Could not open lock file /var/lib/dpkg/lock - open (13 Permission denied)")
+        // else if (error == "Could not get lock /var/lib/dpkg/lock - open (35 Resource temporarily unavailable)")
+        // else if (error == "The list of sources could not be read.")
+        else _assert(false);
+
+        return;
+    }
+
+    now_ = [[NSDate date] retain];
+
+    policy_ = new pkgDepCache::Policy();
+    records_ = new pkgRecords(cache_);
+    resolver_ = new pkgProblemResolver(cache_);
+    fetcher_ = new pkgAcquire(&status_);
+    lock_ = NULL;
+
+    list_ = new pkgSourceList();
+    _assert(list_->ReadMainList());
+
+    _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
+    _assert(pkgApplyStatus(cache_));
+
+    if (cache_->BrokenCount() != 0) {
+        _assert(pkgFixBroken(cache_));
+        _assert(cache_->BrokenCount() == 0);
+        _assert(pkgMinimizeUpgrade(cache_));
+    }
+
+    [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])
+            [packages_ addObject:package];
+
+    [packages_ sortUsingSelector:@selector(compareByName:)];
+}
+
+- (void) configure {
+    NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
+    system([dpkg UTF8String]);
+}
+
+- (void) clean {
+    if (lock_ != NULL)
+        return;
+
+    FileFd Lock;
+    Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher;
+    fetcher.Clean(_config->FindDir("Dir::Cache::Archives"));
+
+    class LogCleaner :
+        public pkgArchiveCleaner
+    {
+      protected:
+        virtual void Erase(const char *File, std::string Pkg, std::string Ver, struct stat &St) {
+            unlink(File);
+        }
+    } cleaner;
+
+    if (!cleaner.Go(_config->FindDir("Dir::Cache::Archives") + "partial/", cache_)) {
+        std::string error;
+        while (_error->PopMessage(error))
+            fprintf(stderr, "ArchiveCleaner: %s\n", error.c_str());
+    }
+}
+
+- (void) prepare {
+    pkgRecords records(cache_);
+
+    lock_ = new FileFd();
+    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgSourceList list;
+    // XXX: explain this with an error message
+    _assert(list.ReadMainList());
+
+    manager_ = (_system->CreatePM(cache_));
+    _assert(manager_->GetArchives(fetcher_, &list, &records));
+    _assert(!_error->PendingError());
+}
+
+- (void) perform {
+    NSMutableArray *before = [NSMutableArray arrayWithCapacity:16]; {
+        pkgSourceList list;
+        _assert(list.ReadMainList());
+        for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
+            [before addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
+    }
+
+    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue) {
+        _trace();
+        return;
+    }
+
+    bool failed = false;
+    for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) {
+        if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete)
+            continue;
+
+        std::string uri = (*item)->DescURI();
+        std::string error = (*item)->ErrorText;
+
+        fprintf(stderr, "pAf:%s:%s\n", uri.c_str(), error.c_str());
+        failed = true;
+
+        [delegate_ performSelectorOnMainThread:@selector(_setProgressError:)
+            withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:error.c_str()], nil]
+            waitUntilDone:YES
+        ];
+    }
+
+    if (failed) {
+        _trace();
+        return;
+    }
+
+    _system->UnLock();
+    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+
+    if (_error->PendingError()) {
+        _trace();
+        return;
+    }
+
+    if (result == pkgPackageManager::Failed) {
+        _trace();
+        return;
+    }
+
+    if (result != pkgPackageManager::Completed) {
+        _trace();
+        return;
+    }
+
+    NSMutableArray *after = [NSMutableArray arrayWithCapacity:16]; {
+        pkgSourceList list;
+        _assert(list.ReadMainList());
+        for (pkgSourceList::const_iterator source = list.begin(); source != list.end(); ++source)
+            [after addObject:[NSString stringWithUTF8String:(*source)->GetURI().c_str()]];
+    }
+
+    if (![before isEqualToArray:after])
+        [self update];
+}
+
+- (void) upgrade {
+    _assert(pkgDistUpgrade(cache_));
+}
+
+- (void) update {
+    [self updateWithStatus:status_];
+}
+
+- (void) updateWithStatus:(Status &)status {
+    pkgSourceList list;
+    _assert(list.ReadMainList());
+
+    FileFd lock;
+    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+    _assert(!_error->PendingError());
+
+    pkgAcquire fetcher(&status);
+    _assert(list.GetIndexes(&fetcher));
+
+    if (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"];
+        Changed_ = true;
+    }
+}
+
+- (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
+/* }}} */
+
+/* Confirmation View {{{ */
+void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString *key) {
+    if ([packages count] == 0)
+        return;
+
+    UITextView *text = GetTextView([packages count] == 0 ? @"n/a" : [packages componentsJoinedByString:@", "], 120, false);
+    [fields setObject:text forKey:key];
+
+    CGColor blue(space_, 0, 0, 0.4, 1);
+    [text setTextColor:blue];
+}
+
+@protocol ConfirmationViewDelegate
+- (void) cancel;
+- (void) confirm;
+@end
+
+@interface ConfirmationView : UIView {
+    Database *database_;
     id delegate_;
     UITransitionView *transition_;
     UIView *overlay_;
@@ -704,19 +2124,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
     UIAlertSheet *essential_;
 }
 
-- (void) dealloc;
 - (void) cancel;
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
-
-- (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;
-
 - (id) initWithView:(UIView *)view database:(Database *)database delegate:(id)delegate;
 
 @end
@@ -724,6 +2133,10 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @implementation ConfirmationView
 
 - (void) dealloc {
+    [navbar_ setDelegate:nil];
+    [transition_ setDelegate:nil];
+    [table_ setDataSource:nil];
+
     [transition_ release];
     [overlay_ release];
     [navbar_ release];
@@ -760,8 +2173,23 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 }
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [essential_ dismiss];
-    [self cancel];
+    NSString *context = [sheet context];
+
+    if ([context isEqualToString:@"remove"])
+        switch (button) {
+            case 1:
+                [self cancel];
+                break;
+            case 2:
+                [delegate_ confirm];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [sheet dismiss];
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
@@ -853,7 +2281,8 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         CGRect bounds = [overlay_ bounds];
 
         navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [navbar_ setBarStyle:1];
+        if (Advanced_)
+            [navbar_ setBarStyle:1];
         [navbar_ setDelegate:self];
 
         UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:@"Confirm"] autorelease];
@@ -863,28 +2292,32 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
         fields_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
 
         NSMutableArray *installing = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *reinstalling = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *upgrading = [NSMutableArray arrayWithCapacity:16];
+        NSMutableArray *downgrading = [NSMutableArray arrayWithCapacity:16];
         NSMutableArray *removing = [NSMutableArray arrayWithCapacity:16];
 
-        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()]);
-            bool essential((iterator->Flags & pkgCache::Flag::Essential) != 0);
+        NSArray *packages = [database_ packages];
+        for (size_t i(0), e = [packages count]; i != e; ++i) {
+            Package *package = [packages objectAtIndex:i];
+            pkgCache::PkgIterator iterator = [package iterator];
+            pkgDepCache::StateCache &state(cache[iterator]);
 
-            if (cache[iterator].NewInstall()) {
-                if (essential)
-                    install = true;
+            NSString *name([package name]);
+
+            if (state.NewInstall())
                 [installing addObject:name];
-            } else if (cache[iterator].Upgrade()) {
-                if (essential)
-                    upgrade = true;
+            else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
+                [reinstalling addObject:name];
+            else if (state.Upgrade())
                 [upgrading addObject:name];
-            } else if (cache[iterator].Delete()) {
-                if (essential)
+            else if (state.Downgrade())
+                [downgrading addObject:name];
+            else if (state.Delete()) {
+                if ([package essential])
                     remove = true;
                 [removing addObject:name];
             }
@@ -892,20 +2325,38 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         if (!remove)
             essential_ = nil;
-        else {
+        else if (Advanced_ || true) {
+            essential_ = [[UIAlertSheet alloc]
+                initWithTitle:@"Removing Essentials"
+                buttons:[NSArray arrayWithObjects:
+                    @"Cancel Operation (Safe)",
+                    @"Force Removal (Unsafe)",
+                nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"remove"
+            ];
+
+#ifndef __OBJC2__
+            [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+#endif
+            [essential_ setBodyText:@"This operation involves the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. If you continue, you may not be able to use Cydia to repair any damage."];
+        } else {
             essential_ = [[UIAlertSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 delegate:self
-                context:self
+                context:@"unable"
             ];
 
-            [essential_ setBodyText:@"One or more of the packages you are about to remove are marked 'Essential' and cannot be removed by Cydia. Please use apt-get."];
+            [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode under to continue and force this operation you will need to be activate the Advanced mode under Settings."];
         }
 
         AddTextView(fields_, installing, @"Installing");
+        AddTextView(fields_, reinstalling, @"Reinstalling");
         AddTextView(fields_, upgrading, @"Upgrading");
+        AddTextView(fields_, downgrading, @"Downgrading");
         AddTextView(fields_, removing, @"Removing");
 
         table_ = [[UIPreferencesTable alloc] initWithFrame:CGRectMake(
@@ -932,562 +2383,851 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 @end
 /* }}} */
 
-/* Source Class {{{ */
-@interface Source : NSObject {
-    NSString *description_;
-    NSString *label_;
-    NSString *origin_;
+/* 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 <
+    ConfigurationDelegate,
+    ProgressDelegate
+> {
+    _transient Database *database_;
+    UIView *view_;
+    UIView *background_;
+    UITransitionView *transition_;
+    UIView *overlay_;
+    UINavigationBar *navbar_;
+    UIProgressBar *progress_;
+    UITextView *output_;
+    UITextLabel *status_;
+    UIPushButton *close_;
+    id delegate_;
+    BOOL running_;
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate;
+- (void) setContentView:(UIView *)view;
+- (void) resetView;
+
+- (void) _retachThread;
+- (void) _detachNewThreadData:(ProgressData *)data;
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+
+- (BOOL) isRunning;
+
+@end
+
+@protocol ProgressViewDelegate
+- (void) progressViewIsComplete:(ProgressView *)sender;
+@end
+
+@implementation ProgressView
+
+- (void) dealloc {
+    [transition_ setDelegate:nil];
+    [navbar_ setDelegate:nil];
+
+    [view_ release];
+    if (background_ != nil)
+        [background_ release];
+    [transition_ release];
+    [overlay_ release];
+    [navbar_ release];
+    [progress_ release];
+    [output_ release];
+    [status_ release];
+    [close_ release];
+    [super dealloc];
+}
+
+- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
+    if (bootstrap_ && from == overlay_ && to == view_)
+        exit(0);
+}
+
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;
+        delegate_ = delegate;
+
+        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];
+        [progress_ setStyle:0];
+
+        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];
+        [output_ setEditable:NO];
+
+        [overlay_ addSubview:output_];
+
+        close_ = [[UIPushButton alloc] initWithFrame:CGRectMake(
+            10,
+            bounds.size.height - prgsize.height - 50,
+            bounds.size.width - 20,
+            32 + prgsize.height
+        )];
+
+        [close_ setAutosizesToFit:NO];
+        [close_ setDrawsShadow:YES];
+        [close_ setStretchBackground:YES];
+        [close_ setEnabled:YES];
+
+        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
+        [close_ setTitleFont:bold];
+        CFRelease(bold);
+
+        [close_ addTarget:self action:@selector(closeButtonPushed) forEvents:kUIControlEventMouseUpInside];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-up.png"] forState:0];
+        [close_ setBackground:[UIImage applicationImageNamed:@"green-dn.png"] forState:1];
+    } return self;
+}
+
+- (void) setContentView:(UIView *)view {
+    view_ = [view retain];
+}
+
+- (void) resetView {
+    [transition_ transition:6 toView:view_];
+}
+
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"conffile"]) {
+        FILE *input = [database_ input];
+
+        switch (button) {
+            case 1:
+                fprintf(input, "N\n");
+                fflush(input);
+                break;
+            case 2:
+                fprintf(input, "Y\n");
+                fflush(input);
+                break;
+            default:
+                _assert(false);
+        }
+    }
+
+    [sheet dismiss];
+}
 
-    NSString *uri_;
-    NSString *distribution_;
-    NSString *type_;
-    NSString *version_;
+- (void) closeButtonPushed {
+    switch (Finish_) {
+        case 0:
+            [delegate_ progressViewIsComplete:self];
+           [self resetView];
+        break;
 
-    NSString *defaultIcon_;
+        case 1:
+            [delegate_ suspendWithAnimation:YES];
+        break;
 
-    BOOL trusted_;
-}
+        case 2:
+            system("killall SpringBoard");
+        break;
 
-- (void) dealloc;
+        case 3:
+            system("launchctl unload /System/Library/LaunchDaemons/com.apple.SpringBoard.plist; launchctl load /System/Library/LaunchDaemons/com.apple.SpringBoard.plist");
+        break;
 
-- (Source *) initWithMetaIndex:(metaIndex *)index;
+        case 4:
+            system("reboot");
+        break;
+    }
+}
 
-- (BOOL) trusted;
+- (void) _retachThread {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:@"Complete"];
+
+    [overlay_ addSubview:close_];
+    [progress_ removeFromSuperview];
+    [status_ removeFromSuperview];
+
+    switch (Finish_) {
+        case 0: [close_ setTitle:@"Return to Cydia"]; break;
+        case 1: [close_ setTitle:@"Close Cydia (Restart)"]; break;
+        case 2: [close_ setTitle:@"Restart SpringBoard"]; break;
+        case 3: [close_ setTitle:@"Reload SpringBoard"]; break;
+        case 4: [close_ setTitle:@"Reboot Device"]; break;
+    }
 
-- (NSString *) uri;
-- (NSString *) distribution;
-- (NSString *) type;
+#ifdef __OBJC2__
+    notify_post("com.apple.mobile.application_installed");
+#endif
 
-- (NSString *) description;
-- (NSString *) label;
-- (NSString *) origin;
-- (NSString *) version;
+    [delegate_ setStatusBarShowsProgress:NO];
 
-- (NSString *) defaultIcon;
-@end
+    running_ = NO;
+}
 
-@implementation Source
+- (void) _detachNewThreadData:(ProgressData *)data {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-- (void) dealloc {
-    [uri_ release];
-    [distribution_ release];
-    [type_ release];
+    [[data target] performSelector:[data selector] withObject:[data object]];
+    [data release];
 
-    if (description_ != nil)
-        [description_ release];
-    if (label_ != nil)
-        [label_ release];
-    if (origin_ != nil)
-        [origin_ release];
-    if (version_ != nil)
-        [version_ release];
+    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
 
-    [super dealloc];
+    [pool release];
 }
 
-- (Source *) initWithMetaIndex:(metaIndex *)index {
-    if ((self = [super init]) != nil) {
-        trusted_ = index->IsTrusted();
-
-        uri_ = [[NSString stringWithCString:index->GetURI().c_str()] retain];
-        distribution_ = [[NSString stringWithCString:index->GetDist().c_str()] retain];
-        type_ = [[NSString stringWithCString:index->GetType()] retain];
+- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title {
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:title];
 
-        description_ = nil;
-        label_ = nil;
-        origin_ = nil;
+    [status_ setText:nil];
+    [output_ setText:@""];
+    [progress_ setProgress:0];
 
-        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;
+    [close_ removeFromSuperview];
+    [overlay_ addSubview:progress_];
+    [overlay_ addSubview:status_];
 
-                std::string name(line.substr(0, colon));
-                std::string value(line.substr(colon + 1));
-                while (!value.empty() && value[0] == ' ')
-                    value = value.substr(1);
+    [delegate_ setStatusBarShowsProgress:YES];
+    running_ = YES;
 
-                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;
-}
+    [transition_ transition:6 toView:overlay_];
 
-- (BOOL) trusted {
-    return trusted_;
+    [NSThread
+        detachNewThreadSelector:@selector(_detachNewThreadData:)
+        toTarget:self
+        withObject:[[ProgressData alloc]
+            initWithSelector:selector
+            target:target
+            object:object
+        ]
+    ];
 }
 
-- (NSString *) uri {
-    return uri_;
+- (void) repairWithSelector:(SEL)selector {
+    [self
+        detachNewThreadSelector:selector
+        toTarget:database_
+        withObject:nil
+        title:@"Repairing..."
+    ];
 }
 
-- (NSString *) distribution {
-    return distribution_;
+- (void) setConfigurationData:(NSString *)data {
+    [self
+        performSelectorOnMainThread:@selector(_setConfigurationData:)
+        withObject:data
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) type {
-    return type_;
-}
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    Package *package = id == nil ? nil : [database_ packageWithName:id];
 
-- (NSString *) description {
-    return description_;
-}
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:(package == nil ? @"Source Error" : [package name])
+        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"error"
+    ] autorelease];
 
-- (NSString *) label {
-    return label_;
+    [sheet setBodyText:error];
+    [sheet popupAlertAnimated:YES];
 }
 
-- (NSString *) origin {
-    return origin_;
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) version {
-    return version_;
+- (void) setProgressPercent:(float)percent {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressPercent:)
+        withObject:[NSNumber numberWithFloat:percent]
+        waitUntilDone:YES
+    ];
 }
 
-- (NSString *) defaultIcon {
-    return defaultIcon_;
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
 }
 
-@end
-/* }}} */
-/* Package Class {{{ */
-NSString *Scour(const char *field, const char *begin, const char *end) {
-    size_t i(0), l(strlen(field));
+- (void) _setConfigurationData:(NSString *)data {
+    static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
-    for (;;) {
-        const char *name = begin + i;
-        const char *colon = name + l;
-        const char *value = colon + 1;
+    _assert(conffile_r(data));
 
-        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;
-        }
-    }
-}
+    NSString *ofile = conffile_r[1];
+    //NSString *nfile = conffile_r[2];
 
-@interface Package : NSObject {
-    pkgCache::PkgIterator iterator_;
-    Database *database_;
-    pkgCache::VerIterator version_;
-    pkgCache::VerFileIterator file_;
-    Source *source_;
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:@"Configuration Upgrade"
+        buttons:[NSArray arrayWithObjects:
+            @"Keep My Old Copy",
+            @"Accept The New Copy",
+            // XXX: @"See What Changed",
+        nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"conffile"
+    ] autorelease];
 
-    NSString *latest_;
-    NSString *installed_;
+    [sheet setBodyText:[NSString stringWithFormat:
+        @"The following file has been changed by both the package maintainer and by you (or for you by a script).\n\n%@"
+    , ofile]];
 
-    NSString *id_;
-    NSString *name_;
-    NSString *tagline_;
-    NSString *icon_;
-    NSString *website_;
+    [sheet popupAlertAnimated:YES];
 }
 
-- (void) dealloc;
-
-- (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) _setProgressTitle:(NSString *)title {
+    [status_ setText:[title stringByAppendingString:@"..."]];
+}
 
-- (NSString *) section;
-- (Address *) maintainer;
-- (size_t) size;
-- (NSString *) description;
-- (NSString *) index;
+- (void) _setProgressPercent:(NSNumber *)percent {
+    [progress_ setProgress:[percent floatValue]];
+}
 
-- (NSDate *) seen;
+- (void) _addProgressOutput:(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];
+}
 
-- (NSString *) latest;
-- (NSString *) installed;
-- (BOOL) upgradable;
-- (BOOL) essential;
-- (BOOL) broken;
+- (BOOL) isRunning {
+    return running_;
+}
 
-- (NSString *) id;
-- (NSString *) name;
-- (NSString *) tagline;
-- (NSString *) icon;
-- (NSString *) website;
+@end
+/* }}} */
 
-- (Source *) source;
+/* Package Cell {{{ */
+@interface PackageCell : UISimpleTableCell {
+    UIImage *icon_;
+    NSString *name_;
+    NSString *description_;
+    NSString *source_;
+    //UIImageView *trusted_;
+#ifdef USE_BADGES
+    UIImageView *badge_;
+    UITextLabel *status_;
+#endif
+}
 
-- (BOOL) matches:(NSString *)text;
+- (PackageCell *) init;
+- (void) setPackage:(Package *)package;
 
-- (NSComparisonResult) compareByName:(Package *)package;
-- (NSComparisonResult) compareBySectionAndName:(Package *)package;
-- (NSComparisonResult) compareForChanges:(Package *)package;
++ (int) heightForPackage:(Package *)package;
 
-- (void) install;
-- (void) remove;
 @end
 
-@implementation Package
+@implementation PackageCell
 
-- (void) dealloc {
-    [latest_ release];
-    if (installed_ != nil)
-        [installed_ release];
+- (void) clearPackage {
+    if (icon_ != nil) {
+        [icon_ release];
+        icon_ = nil;
+    }
 
-    [id_ release];
-    if (name_ != nil)
+    if (name_ != nil) {
         [name_ release];
-    [tagline_ release];
-    if (icon_ != nil)
-        [icon_ release];
-    if (website_ != nil)
-        [website_ release];
+        name_ = nil;
+    }
 
-    if (source_ != nil)
+    if (description_ != nil) {
+        [description_ release];
+        description_ = nil;
+    }
+
+    if (source_ != nil) {
         [source_ release];
+        source_ = nil;
+    }
+}
 
+- (void) dealloc {
+    [self clearPackage];
+#ifdef USE_BADGES
+    [badge_ release];
+    [status_ release];
+#endif
+    //[trusted_ release];
     [super dealloc];
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
+- (PackageCell *) init {
     if ((self = [super init]) != nil) {
-        iterator_ = iterator;
-        database_ = database;
-
-        version_ = version;
-        file_ = file;
+#ifdef USE_BADGES
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
 
-        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:Clear_];
+        [status_ setFont:small];
+#endif
+    } return self;
+}
 
-        const char *begin, *end;
-        parser->GetRec(begin, end);
+- (void) setPackage:(Package *)package {
+    [self clearPackage];
 
-        latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
-        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
+    Source *source = [package source];
 
-        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];
+    icon_ = nil;
+    if (NSString *icon = [package icon])
+        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];
+    if (icon_ == nil) if (NSString *section = [package section])
+        icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sections/%@.png", Simplify(section)]];
+    /*if (icon_ == nil) if (NSString *icon = [source defaultIcon])
+        icon_ = [UIImage imageAtPath:[icon substringFromIndex:6]];*/
+    if (icon_ == nil)
+        icon_ = [UIImage applicationImageNamed:@"unknown.png"];
 
-        source_ = [[database_ getSource:file_.File()] retain];
+    icon_ = [icon_ retain];
 
-        NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
-        if (metadata == nil || [metadata count] == 0) {
-            metadata = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                now_, @"FirstSeen",
-            nil];
+    name_ = [[package name] retain];
+    description_ = [[package tagline] retain];
 
-            [Packages_ setObject:metadata forKey:id_];
-        }
-    } return self;
-}
+    NSString *label = nil;
+    bool trusted = false;
 
-+ (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;
-}
+    if (source != nil) {
+        label = [source label];
+        trusted = [source trusted];
+    } else if ([[package id] isEqualToString:@"firmware"])
+        label = @"Apple";
+    else
+        label = @"Unknown/Local";
 
-- (NSString *) section {
-    const char *section = iterator_.Section();
-    return section == NULL ? nil : [[NSString stringWithCString:section] stringByReplacingCharacter:'_' withCharacter:' '];
-}
+    NSString *from = [NSString stringWithFormat:@"from %@", label];
 
-- (Address *) maintainer {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
-}
+    NSString *section = Simplify([package section]);
+    if (section != nil && ![section isEqualToString:label])
+        from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
 
-- (size_t) size {
-    return version_->InstalledSize;
-}
+    source_ = [from retain];
 
-- (NSString *) description {
-    pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-    NSString *description([NSString stringWithCString:parser->LongDesc().c_str()]);
+#ifdef USE_BADGES
+    [badge_ removeFromSuperview];
+    [status_ removeFromSuperview];
 
-    NSArray *lines = [description componentsSeparatedByString:@"\n"];
-    NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
-    if ([lines count] < 2)
-        return nil;
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];
 
-    NSCharacterSet *whitespace = [NSCharacterSet whitespaceCharacterSet];
-    for (size_t i(1); i != [lines count]; ++i) {
-        NSString *trim = [[lines objectAtIndex:i] stringByTrimmingCharactersInSet:whitespace];
-        [trimmed addObject:trim];
+        [status_ setText:[NSString stringWithFormat:@"Queued for %@", mode]];
+        [status_ setColor:Blueish_];
+    } else if ([package half]) {
+        [badge_ setImage:[UIImage applicationImageNamed:@"damaged.png"]];
+        [status_ setText:@"Package Damaged"];
+        [status_ setColor:Red_];
+    } else {
+        [badge_ setImage:nil];
+        [status_ setText:nil];
+        goto done;
     }
 
-    return [trimmed componentsJoinedByString:@"\n"];
+    [self addSubview:badge_];
+    [self addSubview:status_];
+  done:;
+#endif
 }
 
-- (NSString *) index {
-    NSString *index = [[[self name] substringToIndex:1] uppercaseString];
-    return [index length] != 0 && isalpha([index characterAtIndex:0]) ? index : @"123";
-}
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil)
+        [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 
-- (NSDate *) seen {
-    return [[Packages_ objectForKey:id_] objectForKey:@"FirstSeen"];
-}
+    if (selected)
+        UISetColor(White_);
 
-- (NSString *) latest {
-    return latest_;
-}
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
+    [source_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
-- (NSString *) installed {
-    return installed_;
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
+
+    [super drawContentInRect:rect selected:selected];
 }
 
-- (BOOL) upgradable {
-    if (NSString *installed = [self installed])
-        return [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
++ (int) heightForPackage:(Package *)package {
+    NSString *tagline([package tagline]);
+    int height = tagline == nil || [tagline length] == 0 ? -17 : 0;
+#ifdef USE_BADGES
+    if ([package hasMode] || [package half])
+        return height + 96;
     else
-        return [self essential];
+#endif
+        return height + 73;
 }
 
-- (BOOL) essential {
-    return (iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES;
+@end
+/* }}} */
+/* Section Cell {{{ */
+@interface SectionCell : UISimpleTableCell {
+    NSString *section_;
+    NSString *name_;
+    NSString *count_;
+    UIImage *icon_;
+    UISwitchControl *switch_;
+    BOOL editing_;
 }
 
-- (BOOL) broken {
-    return (*[database_ cache])[iterator_].InstBroken();
-}
+- (id) init;
+- (void) setSection:(Section *)section editing:(BOOL)editing;
 
-- (NSString *) id {
-    return id_;
-}
+@end
 
-- (NSString *) name {
-    return name_ == nil ? id_ : name_;
-}
+@implementation SectionCell
 
-- (NSString *) tagline {
-    return tagline_;
-}
+- (void) clearSection {
+    if (section_ != nil) {
+        [section_ release];
+        section_ = nil;
+    }
 
-- (NSString *) icon {
-    return icon_;
-}
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
 
-- (NSString *) website {
-    return website_;
+    if (count_ != nil) {
+        [count_ release];
+        count_ = nil;
+    }
 }
 
-- (Source *) source {
-    return source_;
+- (void) dealloc {
+    [self clearSection];
+    [icon_ release];
+    [switch_ release];
+    [super dealloc];
 }
 
-- (BOOL) matches:(NSString *)text {
-    if (text == nil)
-        return NO;
-
-    NSRange range;
-
-    range = [[self id] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
-
-    range = [[self name] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
-
-    range = [[self tagline] rangeOfString:text options:NSCaseInsensitiveSearch];
-    if (range.location != NSNotFound)
-        return YES;
+- (id) init {
+    if ((self = [super init]) != nil) {
+        icon_ = [[UIImage applicationImageNamed:@"folder.png"] retain];
 
-    return NO;
+        switch_ = [[UISwitchControl alloc] initWithFrame:CGRectMake(218, 9, 60, 25)];
+        [switch_ addTarget:self action:@selector(onSwitch:) forEvents:kUIControlEventMouseUpInside];
+    } return self;
 }
 
-- (NSComparisonResult) compareByName:(Package *)package {
-    NSString *lhs = [self name];
-    NSString *rhs = [package name];
-
-    if ([lhs length] != 0 && [rhs length] != 0) {
-        unichar lhc = [lhs characterAtIndex:0];
-        unichar rhc = [rhs characterAtIndex:0];
-
-        if (isalpha(lhc) && !isalpha(rhc))
-            return NSOrderedAscending;
-        else if (!isalpha(lhc) && isalpha(rhc))
-            return NSOrderedDescending;
+- (void) onSwitch:(id)sender {
+    NSMutableDictionary *metadata = [Sections_ objectForKey:section_];
+    if (metadata == nil) {
+        metadata = [NSMutableDictionary dictionaryWithCapacity:2];
+        [Sections_ setObject:metadata forKey:section_];
     }
 
-    return [lhs caseInsensitiveCompare:rhs];
+    Changed_ = true;
+    [metadata setObject:[NSNumber numberWithBool:([switch_ value] == 0)] forKey:@"Hidden"];
 }
 
-- (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;
+- (void) setSection:(Section *)section editing:(BOOL)editing {
+    if (editing != editing_) {
+        if (editing_)
+            [switch_ removeFromSuperview];
+        else
+            [self addSubview:switch_];
+        editing_ = editing;
     }
 
-    return [self compareByName:package];
+    [self clearSection];
+
+    if (section == nil) {
+        name_ = [@"All Packages" retain];
+        count_ = nil;
+    } else {
+        section_ = [section name];
+        if (section_ != nil)
+            section_ = [section_ retain];
+        name_  = [(section_ == nil ? @"(No Section)" : section_) retain];
+        count_ = [[NSString stringWithFormat:@"%d", [section count]] retain];
+
+        if (editing_)
+            [switch_ setValue:isSectionVisible(section_) animated:NO];
+    }
 }
 
-- (NSComparisonResult) compareForChanges:(Package *)package {
-    BOOL lhs = [self upgradable];
-    BOOL rhs = [package upgradable];
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 
-    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);
-        }
-    }
+    if (selected)
+        UISetColor(White_);
 
-    return [self compareByName:package];
-}
+    if (!selected)
+        UISetColor(Black_);
+    [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(editing_ ? 164 : 250) withFont:Font22Bold_ ellipsis:2];
 
-- (void) install {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    [database_ cache]->MarkInstall(iterator_, false);
-}
+    CGSize size = [count_ sizeWithFont:Font14_];
 
-- (void) remove {
-    pkgProblemResolver *resolver = [database_ resolver];
-    resolver->Clear(iterator_);
-    resolver->Protect(iterator_);
-    resolver->Remove(iterator_);
-    [database_ cache]->MarkDelete(iterator_, true);
+    UISetColor(White_);
+    if (count_ != nil)
+        [count_ drawAtPoint:CGPointMake(12 + (29 - size.width) / 2, 15) withFont:Font12Bold_];
+
+    [super drawContentInRect:rect selected:selected];
 }
 
 @end
 /* }}} */
-/* Section Class {{{ */
-@interface Section : NSObject {
+
+/* File Table {{{ */
+@interface FileTable : RVPage {
+    _transient Database *database_;
+    Package *package_;
     NSString *name_;
-    size_t row_;
-    NSMutableArray *packages_;
+    NSMutableArray *files_;
+    UITable *list_;
 }
 
-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) setPackage:(Package *)package;
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row;
-- (NSString *) name;
-- (size_t) row;
-- (NSArray *) packages;
-- (size_t) count;
-- (void) addPackage:(Package *)package;
 @end
 
-@implementation Section
+@implementation FileTable
 
 - (void) dealloc {
-    [name_ release];
-    [packages_ release];
+    if (package_ != nil)
+        [package_ release];
+    if (name_ != nil)
+        [name_ release];
+    [files_ release];
+    [list_ release];
     [super dealloc];
 }
 
-- (Section *) initWithName:(NSString *)name row:(size_t)row {
-    if ((self = [super init]) != nil) {
-        name_ = [name retain];
-        row_ = row;
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (int) numberOfRowsInTable:(UITable *)table {
+    return files_ == nil ? 0 : [files_ count];
+}
+
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return 24;
+}
+
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil) {
+        reusing = [[[UIImageAndTextTableCell alloc] init] autorelease];
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
+        [[(UIImageAndTextTableCell *)reusing titleTextLabel] setFont:font];
+        CFRelease(font);
+    }
+    [(UIImageAndTextTableCell *)reusing setTitle:[files_ objectAtIndex:row]];
+    return reusing;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return NO;
+}
+
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+
+        files_ = [[NSMutableArray arrayWithCapacity:32] retain];
+
+        list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        [self addSubview:list_];
+
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];
+
+        [list_ setDataSource:self];
+        [list_ setSeparatorStyle:1];
+        [list_ addTableColumn:column];
+        [list_ setDelegate:self];
+        [list_ setReusesTableCells:YES];
     } return self;
 }
 
-- (NSString *) name {
-    return name_;
+- (void) setPackage:(Package *)package {
+    if (package_ != nil) {
+        [package_ autorelease];
+        package_ = nil;
+    }
+
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
+    }
+
+    [files_ removeAllObjects];
+
+    if (package != nil) {
+        package_ = [package retain];
+        name_ = [[package id] retain];
+
+        NSString *path = [NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_];
+
+        {
+            std::ifstream fin([path UTF8String]);
+            std::string line;
+            while (std::getline(fin, line))
+                [files_ addObject:[NSString stringWithUTF8String:line.c_str()]];
+        }
+
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
+            [files_ sortUsingSelector:@selector(compareByPath:)];
+
+            NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
+            [stack addObject:@"/"];
+
+            for (int i(0), e([files_ count]); i != e; ++i) {
+                NSString *file = [files_ objectAtIndex:i];
+                while (![file hasPrefix:[stack lastObject]])
+                    [stack removeLastObject];
+                NSString *directory = [stack lastObject];
+                [stack addObject:[file stringByAppendingString:@"/"]];
+                [files_ replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%*s%@",
+                    ([stack count] - 2) * 3, "",
+                    [file substringFromIndex:[directory length]]
+                ]];
+            }
+        }
+    }
+
+    [list_ reloadData];
 }
 
-- (size_t) row {
-    return row_;
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
 }
 
-- (NSArray *) packages {
-    return packages_;
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
 }
 
-- (size_t) count {
-    return [packages_ count];
+- (NSString *) title {
+    return @"Installed Files";
 }
 
-- (void) addPackage:(Package *)package {
-    [packages_ addObject:package];
+- (NSString *) backButtonTitle {
+    return @"Files";
 }
 
 @end
 /* }}} */
-
 /* Package View {{{ */
-@protocol PackageViewDelegate
-- (void) performPackage:(Package *)package;
-@end
-
-@interface PackageView : UIView {
-    UIPreferencesTable *table_;
+@interface PackageView : BrowserView {
     Package *package_;
-    UITextView *description_;
-    id delegate_;
+    NSString *name_;
+    NSMutableArray *buttons_;
 }
 
-- (void) dealloc;
-
-- (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;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 - (void) setPackage:(Package *)package;
-- (void) setDelegate:(id)delegate;
+
 @end
 
 @implementation PackageView
@@ -1495,152 +3235,76 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (void) dealloc {
     if (package_ != nil)
         [package_ release];
-    if (description_ != nil)
-        [description_ release];
-    [table_ release];
+    if (name_ != nil)
+        [name_ release];
+    [buttons_ release];
     [super dealloc];
 }
 
-- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
-    return 3;
+- (void) _clickButtonWithName:(NSString *)name {
+    if ([name isEqualToString:@"Install"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Reinstall"])
+        [delegate_ installPackage:package_];
+    else if ([name isEqualToString:@"Remove"])
+        [delegate_ removePackage:package_];
+    else if ([name isEqualToString:@"Upgrade"])
+        [delegate_ installPackage:package_];
+    else _assert(false);
 }
 
-- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
-    switch (group) {
-        case 0: return nil;
-        case 1: return @"Package Details";
-        case 2: return @"Source Information";
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    int count = [buttons_ count];
+    _assert(count != 0);
+    _assert(button <= count + 1);
 
-        default: _assert(false);
-    }
-}
+    if (count != button - 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
 
-- (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_;
+    [sheet dismiss];
 }
 
-- (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);
-    }
+- (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
+    [window setValue:package_ forKey:@"package"];
 }
 
-- (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;
+- (void) _rightButtonClicked {
+    /*[super _rightButtonClicked];
+    return;*/
 
-            default: _assert(false);
-        } break;
+    int count = [buttons_ count];
+    _assert(count != 0);
 
-        default: _assert(false);
+    if (count == 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:0]];
+    else {
+        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:(count + 1)];
+        [buttons addObjectsFromArray:buttons_];
+        [buttons addObject:@"Cancel"];
+
+        [delegate_ slideUp:[[[UIAlertSheet alloc]
+            initWithTitle:nil
+            buttons:buttons
+            defaultButtonIndex:2
+            delegate:self
+            context:@"manage"
+        ] autorelease]];
     }
-
-    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]];
+- (NSString *) _rightButtonTitle {
+    int count = [buttons_ count];
+    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
 }
 
-- (Package *) package {
-    return package_;
+- (NSString *) title {
+    return @"Details";
 }
 
-- (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];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book database:database]) != nil) {
+        database_ = database;
+        buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
     } return self;
 }
 
@@ -1650,1066 +3314,1185 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         package_ = nil;
     }
 
-    if (description_ != nil) {
-        [description_ release];
-        description_ = nil;
+    if (name_ != nil) {
+        [name_ release];
+        name_ = nil;
     }
 
+    [buttons_ removeAllObjects];
+
     if (package != nil) {
         package_ = [package retain];
+        name_ = [[package id] retain];
 
-        NSString *description([package description]);
-        if (description == nil)
-            description = [package tagline];
-        description_ = [GetTextView(description, 12, true) retain];
+        [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"package" ofType:@"html"]]];
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor black(space, 0, 0, 0, 1);
-        [description_ setTextColor:black];
-        CGColorSpaceRelease(space);
-
-        [table_ reloadData];
+        if ([package_ source] == nil);
+        else if ([package_ upgradableAndEssential:NO])
+            [buttons_ addObject:@"Upgrade"];
+        else if ([package_ installed] == nil)
+            [buttons_ addObject:@"Install"];
+        else
+            [buttons_ addObject:@"Reinstall"];
+        if ([package_ installed] != nil)
+            [buttons_ addObject:@"Remove"];
     }
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
+- (void) reloadData {
+    [self setPackage:[database_ packageWithName:name_]];
+    [self reloadButtons];
 }
 
 @end
 /* }}} */
-/* Package Cell {{{ */
-@interface PackageCell : UITableCell {
-    UIImageView *icon_;
-    UITextLabel *name_;
-    UITextLabel *description_;
-    UITextLabel *source_;
-    UITextLabel *version_;
-    UIImageView *trusted_;
-    SEL versioner_;
+/* Package Table {{{ */
+@interface PackageTable : RVPage {
+    _transient Database *database_;
+    NSString *title_;
+    SEL filter_;
+    id object_;
+    NSMutableArray *packages_;
+    NSMutableArray *sections_;
+    UISectionList *list_;
 }
 
-- (void) dealloc;
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
 
-- (PackageCell *) initWithVersioner:(SEL)versioner;
-- (void) setPackage:(Package *)package;
+- (void) setDelegate:(id)delegate;
+- (void) setObject:(id)object;
+
+- (void) reloadData;
+- (void) resetCursor;
+
+- (UISectionList *) list;
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide;
 
 @end
 
-@implementation PackageCell
+@implementation PackageTable
 
 - (void) dealloc {
-    [icon_ release];
-    [name_ release];
-    [description_ release];
-    [source_ release];
-    [version_ release];
-    [trusted_ release];
+    [list_ setDataSource:nil];
+
+    [title_ release];
+    if (object_ != nil)
+        [object_ release];
+    [packages_ release];
+    [sections_ release];
+    [list_ release];
     [super dealloc];
 }
 
-- (PackageCell *) initWithVersioner:(SEL)versioner {
-    if ((self = [super init]) != nil) {
-        versioner_ = versioner;
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return [sections_ count];
+}
 
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef large = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 16);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 14);
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    return [[sections_ objectAtIndex:section] name];
+}
+
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    return [[sections_ objectAtIndex:section] row];
+}
+
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [packages_ count];
+}
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (float) table:(UITable *)table heightForRow:(int)row {
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
+}
 
-        CGColor clear(space, 0, 0, 0, 0);
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
+    if (reusing == nil)
+        reusing = [[[PackageCell alloc] init] autorelease];
+    [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
+    return reusing;
+}
 
-        icon_ = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 30, 30)];
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return NO;
+}
 
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 12, 240, 25)];
-        [name_ setBackgroundColor:clear];
-        [name_ setFont:bold];
+- (void) tableRowSelected:(NSNotification *)notification {
+    int row = [[notification object] selectedRow];
+    if (row == INT_MAX)
+        return;
 
-        description_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 46, 280, 20)];
-        [description_ setBackgroundColor:clear];
-        [description_ setFont:small];
+    Package *package = [packages_ objectAtIndex:row];
+    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    [view setDelegate:delegate_];
+    [view setPackage:package];
+    [book_ pushPage:view];
+}
 
-        source_ = [[UITextLabel alloc] initWithFrame:CGRectMake(12, 72, 225, 20)];
-        [source_ setBackgroundColor:clear];
-        [source_ setFont:large];
+- (id) initWithBook:(RVBook *)book database:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        title_ = [title retain];
+        filter_ = filter;
+        object_ = object == nil ? nil : [object retain];
 
-        version_ = [[UIRightTextLabel alloc] initWithFrame:CGRectMake(286, 69, 70, 25)];
-        [version_ setBackgroundColor:clear];
-        [version_ setFont:large];
+        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        //trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(278, 7, 16, 16)];
-        trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
-        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
+        [list_ setDataSource:self];
 
-        [self addSubview:icon_];
-        [self addSubview:name_];
-        [self addSubview:description_];
-        [self addSubview:source_];
-        [self addSubview:version_];
+        UITableColumn *column = [[[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ] autorelease];
 
-        CGColorSpaceRelease(space);
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+        [table setReusesTableCells:YES];
 
-        CFRelease(small);
-        CFRelease(large);
-        CFRelease(bold);
+        [self addSubview:list_];
+        [self reloadData];
     } 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"];
+- (void) setDelegate:(id)delegate {
+    delegate_ = delegate;
+}
 
-    [icon_ setImage:image];
-    [icon_ zoomToScale:0.5f];
-    [icon_ setFrame:CGRectMake(10, 10, 30, 30)];
+- (void) setObject:(id)object {
+    if (object_ != nil)
+        [object_ release];
+    if (object == nil)
+        object_ = nil;
+    else
+        object_ = [object retain];
+}
 
-    [name_ setText:[package name]];
-    [version_ setText:[package latest]];
-    [description_ setText:[package tagline]];
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
 
-    NSString *label;
-    bool trusted;
+    [packages_ removeAllObjects];
+    [sections_ removeAllObjects];
 
-    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;
+    for (size_t i(0); i != [packages count]; ++i) {
+        Package *package([packages objectAtIndex:i]);
+        if ([[package performSelector:filter_ withObject:object_] boolValue])
+            [packages_ addObject:package];
     }
 
-    [source_ setText:[NSString stringWithFormat:@"from %@", label]];
-
-    [trusted_ removeFromSuperview];
-    if (trusted)
-        [self addSubview:trusted_];
-}
+    Section *section = nil;
 
-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    for (size_t offset(0); offset != [packages_ count]; ++offset) {
+        Package *package = [packages_ objectAtIndex:offset];
+        NSString *name = [package index];
 
-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+        if (section == nil || ![[section name] isEqualToString:name]) {
+            section = [[[Section alloc] initWithName:name row:offset] autorelease];
+            [sections_ addObject:section];
+        }
 
-    CGColor blue(space,
-        interpolate(0.2, 1.0, fraction),
-        interpolate(0.2, 1.0, fraction),
-        interpolate(1.0, 1.0, fraction),
-    1.0);
+        [section addToCount];
+    }
 
-    CGColor gray(space,
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-        interpolate(0.4, 1.0, fraction),
-    1.0);
+    [list_ reloadData];
+}
 
-    [name_ setColor:black];
-    [description_ setColor:gray];
-    [source_ setColor:black];
-    [version_ setColor:blue];
+- (NSString *) title {
+    return title_;
+}
 
-    CGColorSpaceRelease(space);
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
 }
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
+- (void) resetCursor {
+    [[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
 }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (UISectionList *) list {
+    return list_;
 }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (void) setShouldHideHeaderInShortLists:(BOOL)hide {
+    [list_ setShouldHideHeaderInShortLists:hide];
 }
 
 @end
 /* }}} */
 
-/* Database Implementation {{{ */
-@implementation Database
-
-- (void) dealloc {
-    _assert(false);
-    [super dealloc];
+/* Add Source View {{{ */
+@interface AddSourceView : RVPage {
+    _transient Database *database_;
 }
 
-- (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());
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-        _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)];
+@end
 
-        NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+@implementation AddSourceView
 
-        if (type == "pmerror")
-            [delegate_ setError:string];
-        else if (type == "pmstatus")
-            [delegate_ setTitle:string];
-        else if (type == "pmconffile")
-            ;
-        else _assert(false);
-    }
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+    } return self;
+}
 
-    [pool release];
-    _assert(false);
+@end
+/* }}} */
+/* Source Cell {{{ */
+@interface SourceCell : UITableCell {
+    UIImage *icon_;
+    NSString *origin_;
+    NSString *description_;
+    NSString *label_;
 }
 
-- (void) _readOutput:(NSNumber *)fd {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (void) dealloc;
 
-    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
-    std::istream is(&ib);
-    std::string line;
+- (SourceCell *) initWithSource:(Source *)source;
 
-    while (std::getline(is, line))
-        [delegate_ addOutput:[NSString stringWithCString:line.c_str()]];
+@end
 
-    [pool release];
-    _assert(false);
-}
+@implementation SourceCell
 
-- (Package *) packageWithName:(NSString *)name {
-    pkgCache::PkgIterator iterator(cache_->FindPkg([name cString]));
-    return iterator.end() ? nil : [Package packageWithIterator:iterator database:self];
+- (void) dealloc {
+    [icon_ release];
+    [origin_ release];
+    [description_ release];
+    [label_ release];
+    [super dealloc];
 }
 
-- (Database *) init {
+- (SourceCell *) initWithSource:(Source *)source {
     if ((self = [super init]) != nil) {
-        records_ = NULL;
-        resolver_ = NULL;
-        fetcher_ = NULL;
-        lock_ = NULL;
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:[NSString stringWithFormat:@"Sources/%@.png", [source host]]];
+        if (icon_ == nil)
+            icon_ = [UIImage applicationImageNamed:@"unknown.png"];
+        icon_ = [icon_ retain];
+
+        origin_ = [[source name] retain];
+        label_ = [[source uri] retain];
+        description_ = [[source description] retain];
+    } return self;
+}
 
-        sources_ = [[NSMutableDictionary dictionaryWithCapacity:16] retain];
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (void) drawContentInRect:(CGRect)rect selected:(BOOL)selected {
+    if (icon_ != nil)
+        [icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
 
-        int fds[2];
+    if (selected)
+        UISetColor(White_);
 
-        _assert(pipe(fds) != -1);
-        statusfd_ = fds[1];
+    if (!selected)
+        UISetColor(Black_);
+    [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:240 withFont:Font18Bold_ ellipsis:2];
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readStatus:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
+    if (!selected)
+        UISetColor(Blue_);
+    [label_ drawAtPoint:CGPointMake(58, 29) forWidth:225 withFont:Font12_ ellipsis:2];
 
-        _assert(pipe(fds) != -1);
-        _assert(dup2(fds[1], 1) != -1);
-        _assert(close(fds[1]) != -1);
+    if (!selected)
+        UISetColor(Gray_);
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:280 withFont:Font14_ ellipsis:2];
 
-        [NSThread
-            detachNewThreadSelector:@selector(_readOutput:)
-            toTarget:self
-            withObject:[[NSNumber numberWithInt:fds[0]] retain]
-        ];
-    } return self;
+    [super drawContentInRect:rect selected:selected];
 }
 
-- (pkgCacheFile &) cache {
-    return cache_;
-}
+@end
+/* }}} */
+/* Source Table {{{ */
+@interface SourceTable : RVPage {
+    _transient Database *database_;
+    UISectionList *list_;
+    NSMutableArray *sources_;
+    UIAlertSheet *alert_;
+    int offset_;
 
-- (pkgRecords *) records {
-    return records_;
-}
+    NSString *href_;
+    UIProgressHUD *hud_;
+    NSError *error_;
 
-- (pkgProblemResolver *) resolver {
-    return resolver_;
-}
+    //NSURLConnection *installer_;
+    NSURLConnection *trivial_bz2_;
+    NSURLConnection *trivial_gz_;
+    //NSURLConnection *automatic_;
 
-- (pkgAcquire &) fetcher {
-    return *fetcher_;
+    BOOL trivial_;
 }
 
-- (NSArray *) packages {
-    return packages_;
-}
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-- (void) reloadData {
-    _error->Discard();
-    delete list_;
-    manager_ = NULL;
-    delete lock_;
-    delete fetcher_;
-    delete resolver_;
-    delete records_;
-    cache_.Close();
+@end
 
-    if (!cache_.Open(progress_, true)) {
-        fprintf(stderr, "repairing corrupted database...\n");
-        _error->Discard();
-        [self update];
-        _assert(cache_.Open(progress_, true));
+@implementation SourceTable
+
+- (void) _deallocConnection:(NSURLConnection *)connection {
+    if (connection != nil) {
+        [connection cancel];
+        //[connection setDelegate:nil];
+        [connection release];
     }
+}
 
-    now_ = [NSDate date];
+- (void) dealloc {
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+
+    if (href_ != nil)
+        [href_ release];
+    if (hud_ != nil)
+        [hud_ release];
+    if (error_ != nil)
+        [error_ release];
+
+    //[self _deallocConnection:installer_];
+    [self _deallocConnection:trivial_gz_];
+    [self _deallocConnection:trivial_bz2_];
+    //[self _deallocConnection:automatic_];
+
+    [sources_ release];
+    [list_ release];
+    [super dealloc];
+}
 
-    records_ = new pkgRecords(cache_);
-    resolver_ = new pkgProblemResolver(cache_);
-    fetcher_ = new pkgAcquire(&status_);
-    lock_ = NULL;
+- (int) numberOfSectionsInSectionList:(UISectionList *)list {
+    return offset_ == 0 ? 1 : 2;
+}
 
-    list_ = new pkgSourceList();
-    _assert(list_->ReadMainList());
+- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
+    switch (section + (offset_ == 0 ? 1 : 0)) {
+        case 0: return @"Entered by User";
+        case 1: return @"Installed by Packages";
 
-    [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)]
-            ];
+        default:
+            _assert(false);
+            return nil;
     }
-
-    [packages_ removeAllObjects];
-    for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
-        if (Package *package = [Package packageWithIterator:iterator database:self])
-            [packages_ addObject:package];
 }
 
-- (void) prepare {
-    pkgRecords records(cache_);
-
-    lock_ = new FileFd();
-    lock_->Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock"));
-    _assert(!_error->PendingError());
+- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
+    switch (section + (offset_ == 0 ? 1 : 0)) {
+        case 0: return 0;
+        case 1: return offset_;
 
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+        default:
+            _assert(false);
+            return -1;
+    }
+}
 
-    manager_ = (_system->CreatePM(cache_));
-    _assert(manager_->GetArchives(fetcher_, &list, &records));
-    _assert(!_error->PendingError());
+- (int) numberOfRowsInTable:(UITable *)table {
+    return [sources_ count];
 }
 
-- (void) perform {
-    if (fetcher_->Run(PulseInterval_) != pkgAcquire::Continue)
-        return;
+- (float) table:(UITable *)table heightForRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source description] == nil ? 56 : 73;
+}
 
-    _system->UnLock();
-    pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+- (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col {
+    Source *source = [sources_ objectAtIndex:row];
+    // XXX: weird warning, stupid selectors ;P
+    return [[[SourceCell alloc] initWithSource:(id)source] autorelease];
+}
 
-    if (result == pkgPackageManager::Failed)
-        return;
-    if (_error->PendingError())
-        return;
-    if (result != pkgPackageManager::Completed)
-        return;
+- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
+    return YES;
 }
 
-- (void) update {
-    pkgSourceList list;
-    _assert(list.ReadMainList());
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return YES;
+}
 
-    FileFd lock;
-    lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-    _assert(!_error->PendingError());
+- (void) tableRowSelected:(NSNotification*)notification {
+    UITable *table([list_ table]);
+    int row([table selectedRow]);
+    if (row == INT_MAX)
+        return;
 
-    pkgAcquire fetcher(&status_);
-    _assert(list.GetIndexes(&fetcher));
-    _assert(fetcher.Run(PulseInterval_) != pkgAcquire::Failed);
+    Source *source = [sources_ objectAtIndex:row];
 
-    bool failed = false;
-    for (pkgAcquire::ItemIterator item = fetcher.ItemsBegin(); item != fetcher.ItemsEnd(); item++)
-        if ((*item)->Status != pkgAcquire::Item::StatDone) {
-            (*item)->Finished();
-            failed = true;
-        }
+    PackageTable *packages = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:[source label]
+        filter:@selector(isVisibleInSource:)
+        with:source
+    ] autorelease];
 
-    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/"));
-    }
+    [packages setDelegate:delegate_];
 
-    [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
+    [book_ pushPage:packages];
 }
 
-- (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_));
+- (BOOL) table:(UITable *)table canDeleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    return [source record] != nil;
 }
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-    status_.setDelegate(delegate);
-    progress_.setDelegate(delegate);
+- (void) table:(UITable *)table willSwipeToDeleteRow:(int)row {
+    [[list_ table] setDeleteConfirmationRow:row];
 }
 
-- (Source *) getSource:(const pkgCache::PkgFileIterator &)file {
-    pkgIndexFile *index(NULL);
-    list_->FindIndex(file, index);
-    return [sources_ objectForKey:[NSNumber numberWithLong:reinterpret_cast<uintptr_t>(index)]];
+- (void) table:(UITable *)table deleteRow:(int)row {
+    Source *source = [sources_ objectAtIndex:row];
+    [Sources_ removeObjectForKey:[source key]];
+    [delegate_ syncData];
 }
 
-@end
-/* }}} */
+- (void) _endConnection:(NSURLConnection *)connection {
+    NSURLConnection **field = NULL;
+    if (connection == trivial_bz2_)
+        field = &trivial_bz2_;
+    else if (connection == trivial_gz_)
+        field = &trivial_gz_;
+    _assert(field != NULL);
+    [connection release];
+    *field = nil;
 
-/* Progress Data {{{ */
-@interface ProgressData : NSObject {
-    SEL selector_;
-    id target_;
-    id object_;
-}
+    if (
+        trivial_bz2_ == nil &&
+        trivial_gz_ == nil
+    ) {
+        [delegate_ setStatusBarShowsProgress:NO];
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object;
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-- (SEL) selector;
-- (id) target;
-- (id) object;
-@end
+        if (trivial_) {
+            [Sources_ setObject:[NSDictionary dictionaryWithObjectsAndKeys:
+                @"deb", @"Type",
+                href_, @"URI",
+                @"./", @"Distribution",
+            nil] forKey:[NSString stringWithFormat:@"deb:%@:./", href_]];
 
-@implementation ProgressData
+            [delegate_ syncData];
+        } else if (error_ != nil) {
+            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+                initWithTitle:@"Verification Error"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"urlerror"
+            ] autorelease];
 
-- (ProgressData *) initWithSelector:(SEL)selector target:(id)target object:(id)object {
-    if ((self = [super init]) != nil) {
-        selector_ = selector;
-        target_ = target;
-        object_ = object;
-    } return self;
-}
+            [sheet setBodyText:[error_ localizedDescription]];
+            [sheet popupAlertAnimated:YES];
+        } else {
+            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+                initWithTitle:@"Did not Find Repository"
+                buttons:[NSArray arrayWithObjects:@"OK", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"trivial"
+            ] autorelease];
 
-- (SEL) selector {
-    return selector_;
+            [sheet setBodyText:@"The indicated repository could not be found. This could be because you are trying to add a legacy Installer repository (these are not supported). Also, this interface is only capable of working with exact repository URLs. If you host a repository and are having issues please contact the author of Cydia with any questions you have."];
+            [sheet popupAlertAnimated:YES];
+        }
+
+        [href_ release];
+        href_ = nil;
+
+        if (error_ != nil) {
+            [error_ release];
+            error_ = nil;
+        }
+    }
 }
 
-- (id) target {
-    return target_;
+- (void) connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLResponse *)response {
+    switch ([response statusCode]) {
+        case 200:
+            trivial_ = YES;
+    }
 }
 
-- (id) object {
-    return object_;
+- (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
+    fprintf(stderr, "connection:\"%s\" didFailWithError:\"%s\"", [href_ UTF8String], [[error localizedDescription] UTF8String]);
+    if (error_ != nil)
+        error_ = [error retain];
+    [self _endConnection:connection];
 }
 
-@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) connectionDidFinishLoading:(NSURLConnection *)connection {
+    [self _endConnection:connection];
 }
 
-- (void) dealloc;
+- (NSURLConnection *) _requestHRef:(NSString *)href method:(NSString *)method {
+    NSMutableURLRequest *request = [NSMutableURLRequest
+        requestWithURL:[NSURL URLWithString:href]
+        cachePolicy:NSURLRequestUseProtocolCachePolicy
+        timeoutInterval:20.0
+    ];
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
+    [request setHTTPMethod:method];
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
-- (void) setContentView:(UIView *)view;
-- (void) resetView;
+    return [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
+}
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"source"])
+        switch (button) {
+            case 1: {
+                NSString *href = [[sheet textField] text];
 
-- (void) _retachThread;
-- (void) _detachNewThreadData:(ProgressData *)data;
-- (void) detachNewThreadSelector:(SEL)selector toTarget:(id)target withObject:(id)object title:(NSString *)title;
+                //installer_ = [[self _requestHRef:href method:@"GET"] retain];
 
-- (void) setError:(NSString *)error;
-- (void) _setError:(NSString *)error;
+                if (![href hasSuffix:@"/"])
+                    href_ = [href stringByAppendingString:@"/"];
+                else
+                    href_ = href;
+                href_ = [href_ retain];
 
-- (void) setTitle:(NSString *)title;
-- (void) _setTitle:(NSString *)title;
+                trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
+                trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain];
+                //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain];
 
-- (void) setPercent:(float)percent;
-- (void) _setPercent:(NSNumber *)percent;
+                trivial_ = false;
 
-- (void) addOutput:(NSString *)output;
-- (void) _addOutput:(NSString *)output;
-@end
+                hud_ = [delegate_ addProgressHUD];
+                [hud_ setText:@"Verifying URL"];
+            } break;
 
-@protocol ProgressViewDelegate
-- (void) progressViewIsComplete:(ProgressView *)sender;
-@end
+            case 2:
+            break;
 
-@implementation ProgressView
+            default:
+                _assert(false);
+        }
 
-- (void) dealloc {
-    [view_ release];
-    if (background_ != nil)
-        [background_ release];
-    [transition_ release];
-    [overlay_ release];
-    [navbar_ release];
-    [progress_ release];
-    [output_ release];
-    [status_ release];
-    [super dealloc];
+    [sheet dismiss];
 }
 
-- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to {
-    if (bootstrap_ && from == overlay_ && to == view_)
-        exit(0);
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        sources_ = [[NSMutableArray arrayWithCapacity:16] retain];
+
+        //list_ = [[UITable alloc] initWithFrame:[self bounds]];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+        [list_ setShouldHideHeaderInShortLists:NO];
+
+        [self addSubview:list_];
+        [list_ setDataSource:self];
+
+        UITableColumn *column = [[UITableColumn alloc]
+            initWithTitle:@"Name"
+            identifier:@"name"
+            width:[self frame].size.width
+        ];
+
+        UITable *table = [list_ table];
+        [table setSeparatorStyle:1];
+        [table addTableColumn:column];
+        [table setDelegate:self];
+
+        [self reloadData];
+    } return self;
 }
 
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        delegate_ = delegate;
+- (void) reloadData {
+    pkgSourceList list;
+    _assert(list.ReadMainList());
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+    [sources_ removeAllObjects];
+    [sources_ addObjectsFromArray:[database_ sources]];
+    [sources_ sortUsingSelector:@selector(compareByNameAndType:)];
 
-        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);
+    int count = [sources_ count];
+    for (offset_ = 0; offset_ != count; ++offset_) {
+        Source *source = [sources_ objectAtIndex:offset_];
+        if ([source record] == nil)
+            break;
+    }
 
-        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
-        [transition_ setDelegate:self];
+    [list_ reloadData];
+}
 
-        overlay_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
 
-        if (bootstrap_)
-            [overlay_ setBackgroundColor:black];
-        else {
-            background_ = [[UIView alloc] initWithFrame:[self bounds]];
-            [background_ setBackgroundColor:black];
-            [self addSubview:background_];
-        }
+- (void) _leftButtonClicked {
+    /*[book_ pushPage:[[[AddSourceView alloc]
+        initWithBook:book_
+        database:database_
+    ] autorelease]];*/
 
-        [self addSubview:transition_];
+    UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+        initWithTitle:@"Enter Cydia/APT URL"
+        buttons:[NSArray arrayWithObjects:@"Add Source", @"Cancel", nil]
+        defaultButtonIndex:0
+        delegate:self
+        context:@"source"
+    ] autorelease];
 
-        CGSize navsize = [UINavigationBar defaultSize];
-        CGRect navrect = {{0, 0}, navsize};
+    [sheet addTextFieldWithValue:@"http://" label:@""];
 
-        navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-        [overlay_ addSubview:navbar_];
+    UITextTraits *traits = [[sheet textField] textTraits];
+    [traits setAutoCapsType:0];
+    [traits setPreferredKeyboardType:3];
+    [traits setAutoCorrectionType:1];
 
-        [navbar_ setBarStyle:1];
-        [navbar_ setDelegate:self];
+    [sheet popupAlertAnimated:YES];
+}
 
-        UINavigationItem *navitem = [[[UINavigationItem alloc] initWithTitle:nil] autorelease];
-        [navbar_ pushNavigationItem:navitem];
+- (void) _rightButtonClicked {
+    UITable *table = [list_ table];
+    BOOL editing = [table isRowDeletionEnabled];
+    [table enableRowDeletion:!editing animated:YES];
+    [book_ reloadButtonsForPage:self];
+}
 
-        CGRect bounds = [overlay_ bounds];
-        CGSize prgsize = [UIProgressBar defaultSize];
+- (NSString *) title {
+    return @"Sources";
+}
 
-        CGRect prgrect = {{
-            (bounds.size.width - prgsize.width) / 2,
-            bounds.size.height - prgsize.height - 20
-        }, prgsize};
+- (NSString *) backButtonTitle {
+    return @"Sources";
+}
 
-        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
-        [overlay_ addSubview:progress_];
+- (NSString *) leftButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Add" : nil;
+}
 
-        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(
-            10,
-            bounds.size.height - prgsize.height - 50,
-            bounds.size.width - 20,
-            24
-        )];
+- (NSString *) rightButtonTitle {
+    return [[list_ table] isRowDeletionEnabled] ? @"Done" : @"Edit";
+}
+
+- (RVUINavBarButtonStyle) rightButtonStyle {
+    return [[list_ table] isRowDeletionEnabled] ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+}
 
-        [status_ setColor:white];
-        [status_ setBackgroundColor:clear];
+@end
+/* }}} */
 
-        [status_ setCentersHorizontally:YES];
-        //[status_ setFont:font];
+/* Installed View {{{ */
+@interface InstalledView : RVPage {
+    _transient Database *database_;
+    PackageTable *packages_;
+    BOOL expert_;
+}
 
-        output_ = [[UITextView alloc] initWithFrame:CGRectMake(
-            10,
-            navrect.size.height + 20,
-            bounds.size.width - 20,
-            bounds.size.height - navsize.height - 62 - navrect.size.height
-        )];
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
 
-        //[output_ setTextFont:@"Courier New"];
-        [output_ setTextSize:12];
+@end
 
-        [output_ setTextColor:white];
-        [output_ setBackgroundColor:clear];
+@implementation InstalledView
 
-        [output_ setMarginTop:0];
-        [output_ setAllowsRubberBanding:YES];
+- (void) dealloc {
+    [packages_ release];
+    [super dealloc];
+}
 
-        [overlay_ addSubview:output_];
-        [overlay_ addSubview:status_];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
-        [progress_ setStyle:0];
+        packages_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isInstalledAndVisible:)
+            with:[NSNumber numberWithBool:YES]
+        ];
 
-        CGColorSpaceRelease(space);
+        [self addSubview:packages_];
     } return self;
 }
 
-- (void) setContentView:(UIView *)view {
-    view_ = [view retain];
+- (void) resetViewAnimated:(BOOL)animated {
+    [packages_ resetViewAnimated:animated];
 }
 
-- (void) resetView {
-    [transition_ transition:6 toView:view_];
+- (void) reloadData {
+    [packages_ reloadData];
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (void) _rightButtonClicked {
+    [packages_ setObject:[NSNumber numberWithBool:expert_]];
+    [packages_ reloadData];
+    expert_ = !expert_;
+    [book_ reloadButtonsForPage:self];
 }
 
-- (void) _retachThread {
-    [delegate_ progressViewIsComplete:self];
-    [self resetView];
+- (NSString *) title {
+    return @"Installed";
 }
 
-- (void) _detachNewThreadData:(ProgressData *)data {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+- (NSString *) backButtonTitle {
+    return @"Packages";
+}
 
-    [[data target] performSelector:[data selector] withObject:[data object]];
-    [data release];
+- (NSString *) rightButtonTitle {
+    return Role_ != nil && [Role_ isEqualToString:@"Developer"] ? nil : expert_ ? @"Expert" : @"Simple";
+}
 
-    [self performSelectorOnMainThread:@selector(_retachThread) withObject:nil waitUntilDone:YES];
+- (RVUINavBarButtonStyle) rightButtonStyle {
+    return expert_ ? RVUINavBarButtonStyleHighlighted : RVUINavBarButtonStyleNormal;
+}
 
-    [pool release];
+- (void) setDelegate:(id)delegate {
+    [super setDelegate:delegate];
+    [packages_ setDelegate:delegate];
 }
 
-- (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];
+@end
+/* }}} */
 
-    [status_ setText:nil];
-    [output_ setText:@""];
-    [progress_ setProgress:0];
+/* Home View {{{ */
+@interface HomeView : BrowserView {
+}
 
-    [transition_ transition:6 toView:overlay_];
+@end
 
-    [NSThread
-        detachNewThreadSelector:@selector(_detachNewThreadData:)
-        toTarget:self
-        withObject:[[ProgressData alloc]
-            initWithSelector:selector
-            target:target
-            object:object
-        ]
-    ];
-}
+@implementation HomeView
 
-- (void) setError:(NSString *)error {
-    [self
-        performSelectorOnMainThread:@selector(_setError:)
-        withObject:error
-        waitUntilDone:YES
-    ];
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
 }
 
-- (void) _setError:(NSString *)error {
+- (void) _leftButtonClicked {
     UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-        initWithTitle:@"Package Error"
-        buttons:[NSArray arrayWithObjects:@"Okay", nil]
+        initWithTitle:@"About Cydia Installer"
+        buttons:[NSArray arrayWithObjects:@"Close", nil]
         defaultButtonIndex:0
         delegate:self
-        context:self
+        context:@"about"
     ] autorelease];
 
-    [sheet setBodyText:error];
+    [sheet setBodyText:
+        @"Copyright (C) 2008\n"
+        "Jay Freeman (saurik)\n"
+        "saurik@saurik.com\n"
+        "http://www.saurik.com/\n"
+        "\n"
+        "The Okori Group\n"
+        "http://www.theokorigroup.com/\n"
+        "\n"
+        "College of Creative Studies,\n"
+        "University of California,\n"
+        "Santa Barbara\n"
+        "http://www.ccs.ucsb.edu/"
+    ];
+
     [sheet popupAlertAnimated:YES];
 }
 
-- (void) setTitle:(NSString *)title {
-    [self
-        performSelectorOnMainThread:@selector(_setTitle:)
-        withObject:title
-        waitUntilDone:YES
-    ];
+- (NSString *) leftButtonTitle {
+    return @"About";
 }
 
-- (void) _setTitle:(NSString *)title {
-    [status_ setText:[title stringByAppendingString:@"..."]];
+@end
+/* }}} */
+/* Manage View {{{ */
+@interface ManageView : BrowserView {
 }
 
-- (void) setPercent:(float)percent {
-    [self
-        performSelectorOnMainThread:@selector(_setPercent:)
-        withObject:[NSNumber numberWithFloat:percent]
-        waitUntilDone:YES
-    ];
+@end
+
+@implementation ManageView
+
+- (NSString *) title {
+    return @"Manage";
 }
 
-- (void) _setPercent:(NSNumber *)percent {
-    [progress_ setProgress:[percent floatValue]];
+- (void) _leftButtonClicked {
+    [delegate_ askForSettings];
 }
 
-- (void) addOutput:(NSString *)output {
-    [self
-        performSelectorOnMainThread:@selector(_addOutput:)
-        withObject:output
-        waitUntilDone:YES
-    ];
+- (NSString *) leftButtonTitle {
+    return @"Settings";
 }
 
-- (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];
+- (NSString *) _rightButtonTitle {
+    return nil;
 }
 
 @end
 /* }}} */
 
-/* Package Table {{{ */
-@protocol PackageTableDelegate
-- (void) packageTable:(id)table packageSelected:(Package *)package;
-@end
-
-@interface PackageTable : UIView {
-    SEL versioner_;
-    UISectionList *list_;
+/* Browser Implementation {{{ */
+@implementation BrowserView
 
-    id delegate_;
-    NSArray *packages_;
-    NSMutableArray *sections_;
+- (void) dealloc {
+    WebView *webview = [webview_ webView];
+    [webview setFrameLoadDelegate:nil];
+    [webview setResourceLoadDelegate:nil];
+    [webview setUIDelegate:nil];
+
+    [scroller_ setDelegate:nil];
+    [webview_ setDelegate:nil];
+
+    [scroller_ release];
+    [webview_ release];
+    [urls_ release];
+    [indicator_ release];
+    if (title_ != nil)
+        [title_ release];
+    [super dealloc];
 }
 
-- (void) dealloc;
-
-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
+- (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
+    [self loadRequest:[NSURLRequest
+        requestWithURL:url
+        cachePolicy:policy
+        timeoutInterval:30.0
+    ]];
+}
 
-- (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) loadURL:(NSURL *)url {
+    [self loadURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+}
 
-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner;
+- (NSURLRequest *) _addHeadersToRequest:(NSURLRequest *)request {
+    NSMutableURLRequest *copy = [request mutableCopy];
 
-- (void) setDelegate:(id)delegate;
-- (void) setPackages:(NSArray *)packages;
+    [copy addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+    [copy addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+    [copy addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
 
-- (void) resetViewAnimated:(BOOL)animated;
-- (UITable *) table;
-@end
+    if (Role_ != nil)
+        [copy addValue:Role_ forHTTPHeaderField:@"X-Role"];
 
-@implementation PackageTable
+    return copy;
+}
 
-- (void) dealloc {
-    [list_ release];
-    [sections_ release];
-    if (packages_ != nil)
-        [packages_ release];
-    [super dealloc];
+- (void) loadRequest:(NSURLRequest *)request {
+    pushed_ = true;
+    [webview_ loadRequest:request];
 }
 
-- (int) numberOfSectionsInSectionList:(UISectionList *)list {
-    return [sections_ count];
+- (void) reloadURL {
+    NSURL *url = [[[urls_ lastObject] retain] autorelease];
+    [urls_ removeLastObject];
+    [self loadURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData];
 }
 
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section {
-    return [[sections_ objectAtIndex:section] name];
+- (WebView *) webView {
+    return [webview_ webView];
 }
 
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section {
-    return [[sections_ objectAtIndex:section] row];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
+    [scroller_ setContentSize:frame.size];
 }
 
-- (int) numberOfRowsInTable:(UITable *)table {
-    return [packages_ count];
+- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
+    [self view:sender didSetFrame:frame];
 }
 
-- (float) table:(UITable *)table heightForRow:(int)row {
-    return 100;
+- (void) pushPage:(RVPage *)page {
+    [self setBackButtonTitle:title_];
+    [page setDelegate:delegate_];
+    [book_ pushPage:page];
 }
 
-- (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;
+- (void) getSpecial:(NSString *)href {
+    RVPage *page = nil;
+
+    if ([href hasPrefix:@"mailto:"])
+        [delegate_ openURL:[NSURL URLWithString:href]];
+    else if ([href isEqualToString:@"cydia://add-source"])
+        page = [[[AddSourceView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://sources"])
+        page = [[[SourceTable alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href isEqualToString:@"cydia://packages"])
+        page = [[[InstalledView alloc] initWithBook:book_ database:database_] autorelease];
+    else if ([href hasPrefix:@"cydia://files/"]) {
+        NSString *name = [href substringFromIndex:14];
+
+        if (Package *package = [database_ packageWithName:name]) {
+            FileTable *files = [[[FileTable alloc] initWithBook:book_ database:database_] autorelease];
+            [files setPackage:package];
+            page = files;
+        }
+    } else if ([href hasPrefix:@"apptapp://package/"]) {
+        NSString *name = [href substringFromIndex:18];
+
+        if (Package *package = [database_ packageWithName:name]) {
+            PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+            [view setPackage:package];
+            page = view;
+        } else {
+            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+                initWithTitle:@"Cannot Locate Package"
+                buttons:[NSArray arrayWithObjects:@"Close", nil]
+                defaultButtonIndex:0
+                delegate:self
+                context:@"missing"
+            ] autorelease];
+
+            [sheet setBodyText:[NSString stringWithFormat:
+                @"The package %@ cannot be found in your current sources. I might recommend installing more sources."
+            , name]];
+
+            [sheet popupAlertAnimated:YES];
+        }
+    }
+
+    if (page != nil)
+        [self pushPage:page];
 }
 
-- (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return NO;
+- (void) webView:(WebView *)sender willClickElement:(id)element {
+    if ([[element localName] isEqualToString:@"img"])
+        do if ((element = [element parentNode]) == nil)
+            return;
+        while (![[element localName] isEqualToString:@"a"]);
+    if (![element respondsToSelector:@selector(href)])
+        return;
+    NSString *href = [element href];
+    if (href == nil)
+        return;
+    [self getSpecial:href];
 }
 
-- (void) tableRowSelected:(NSNotification *)notification {
-    int row = [[notification object] selectedRow];
-    [delegate_ packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
+- (BOOL) isSpecialScheme:(NSString *)scheme {
+    return
+        [scheme isEqualToString:@"apptapp"] ||
+        [scheme isEqualToString:@"cydia"] ||
+        [scheme isEqualToString:@"mailto"];
 }
 
-- (id) initWithFrame:(CGRect)frame versioner:(SEL)versioner {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        versioner_ = versioner;
-        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource {
+    NSURL *url = [request URL];
+    if ([self isSpecialScheme:[url scheme]]) {
+        [self getSpecial:[url absoluteString]];
+        return nil;
+    }
 
-        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:YES];
-        [list_ setDataSource:self];
+    if (!pushed_) {
+        pushed_ = true;
+        [book_ pushPage:self];
+    }
 
-        UITableColumn *column = [[[UITableColumn alloc]
-            initWithTitle:@"Name"
-            identifier:@"name"
-            width:frame.size.width
-        ] autorelease];
+    return [self _addHeadersToRequest:request];
+}
 
-        UITable *table = [list_ table];
-        [table setSeparatorStyle:1];
-        [table addTableColumn:column];
-        [table setDelegate:self];
-        [table setReusesTableCells:YES];
+- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request {
+    if (request != nil) {
+        NSString *scheme = [[request URL] scheme];
+        if ([self isSpecialScheme:scheme])
+            return nil;
+    }
 
-        [self addSubview:list_];
-    } return self;
-}
+    [self setBackButtonTitle:title_];
 
-- (void) setDelegate:(id)delegate {
-    delegate_ = delegate;
-}
+    BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
+    [browser setDelegate:delegate_];
 
-- (void) setPackages:(NSArray *)packages {
-    if (packages_ != nil)
-        [packages_ autorelease];
-    _assert(packages != nil);
-    packages_ = [packages retain];
+    if (request != nil) {
+        [browser loadRequest:[self _addHeadersToRequest:request]];
+        [book_ pushPage:browser];
+    }
 
-    [sections_ removeAllObjects];
+    return [browser webView];
+}
 
-    Section *section = nil;
+- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
+    title_ = [title retain];
+    [self setTitle:title];
+}
 
-    for (size_t offset(0); offset != [packages_ count]; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        NSString *name = [package index];
+- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
 
-        if (section == nil || ![[section name] isEqual:name]) {
-            section = [[[Section alloc] initWithName:name row:offset] autorelease];
-            [sections_ addObject:section];
-        }
+    reloading_ = false;
+    loading_ = true;
+    [indicator_ startAnimation];
+    [self reloadButtons];
 
-        [section addPackage:package];
+    if (title_ != nil) {
+        [title_ release];
+        title_ = nil;
     }
 
-    [list_ reloadData];
-}
+    [self setTitle:@"Loading..."];
 
-- (void) resetViewAnimated:(BOOL)animated {
-    [[list_ table] selectRow:-1 byExtendingSelection:NO withFade:animated];
-}
+    WebView *webview = [webview_ webView];
+    NSString *href = [webview mainFrameURL];
+    [urls_ addObject:[NSURL URLWithString:href]];
 
-- (UITable *) table {
-    return [list_ table];
+    CGRect webrect = [scroller_ frame];
+    webrect.size.height = 0;
+    [webview_ setFrame:webrect];
 }
 
-@end
-/* }}} */
-
-/* Section Cell {{{ */
-@interface SectionCell : UITableCell {
-    UITextLabel *name_;
-    UITextLabel *count_;
+- (void) _finishLoading {
+    if (!reloading_) {
+        loading_ = false;
+        [indicator_ stopAnimation];
+        [self reloadButtons];
+    }
 }
 
-- (void) dealloc;
+- (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self _finishLoading];
+}
 
-- (id) init;
-- (void) setSection:(Section *)section;
+- (void) webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
+    if ([frame parentFrame] != nil)
+        return;
+    [self _finishLoading];
 
-- (void) _setSelected:(float)fraction;
-- (void) setSelected:(BOOL)selected;
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
-- (void) _setSelectionFadeFraction:(float)fraction;
+    [self loadURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@?%@",
+        [[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"error" ofType:@"html"]] absoluteString],
+        [[error localizedDescription] stringByAddingPercentEscapes]
+    ]]];
+}
 
-@end
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+        loading_ = false;
 
-@implementation SectionCell
+        struct CGRect bounds = [self bounds];
 
-- (void) dealloc {
-    [name_ release];
-    [count_ release];
-    [super dealloc];
-}
+        UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:bounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];
 
-- (id) init {
-    if ((self = [super init]) != nil) {
-        GSFontRef bold = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 22);
-        GSFontRef small = GSFontCreateWithName("Helvetica", kGSFontTraitBold, 12);
+        scroller_ = [[UIScroller alloc] initWithFrame:bounds];
+        [self addSubview:scroller_];
 
-        CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-        CGColor clear(space, 0, 0, 0, 0);
-        CGColor white(space, 1, 1, 1, 1);
+        [scroller_ setScrollingEnabled:YES];
+        [scroller_ setAdjustForContentSizeChange:YES];
+        [scroller_ setClipsSubviews:YES];
+        [scroller_ setAllowsRubberBanding:YES];
+        [scroller_ setScrollDecelerationFactor:0.99];
+        [scroller_ setDelegate:self];
 
-        name_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 9, 250, 25)];
-        [name_ setBackgroundColor:clear];
-        [name_ setFont:bold];
+        CGRect webrect = [scroller_ bounds];
+        webrect.size.height = 0;
 
-        count_ = [[UITextLabel alloc] initWithFrame:CGRectMake(11, 7, 29, 32)];
-        [count_ setCentersHorizontally:YES];
-        [count_ setBackgroundColor:clear];
-        [count_ setFont:small];
-        [count_ setColor:white];
+        webview_ = [[UIWebView alloc] initWithFrame:webrect];
+        [scroller_ addSubview:webview_];
 
-        UIImageView *folder = [[[UIImageView alloc] initWithFrame:CGRectMake(8, 7, 32, 32)] autorelease];
-        [folder setImage:[UIImage applicationImageNamed:@"folder.png"]];
+        [webview_ setTilingEnabled:YES];
+        [webview_ setTileSize:CGSizeMake(webrect.size.width, 500)];
+        [webview_ setAutoresizes:YES];
+        [webview_ setDelegate:self];
+        //[webview_ setEnabledGestures:2];
 
-        [self addSubview:folder];
-        [self addSubview:name_];
-        [self addSubview:count_];
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:kUIProgressIndicatorStyleMediumWhite];
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
+        [indicator_ setStyle:kUIProgressIndicatorStyleMediumWhite];
 
-        [self _setSelected:0];
+        Package *package([database_ packageWithName:@"cydia"]);
+        NSString *application = package == nil ? @"Cydia" : [NSString
+            stringWithFormat:@"Cydia/%@",
+            [package installed]
+        ];
 
-        CGColorSpaceRelease(space);
+        WebView *webview = [webview_ webView];
+        [webview setApplicationNameForUserAgent:application];
+        [webview setFrameLoadDelegate:self];
+        [webview setResourceLoadDelegate:self];
+        [webview setUIDelegate:self];
 
-        CFRelease(small);
-        CFRelease(bold);
+        urls_ = [[NSMutableArray alloc] initWithCapacity:16];
     } return self;
 }
 
-- (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]]];
-    }
+- (void) _rightButtonClicked {
+    reloading_ = true;
+    [self reloadURL];
 }
 
-- (void) _setSelected:(float)fraction {
-    CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+- (NSString *) _rightButtonTitle {
+    return @"Reload";
+}
 
-    CGColor black(space,
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-        interpolate(0.0, 1.0, fraction),
-    1.0);
+- (NSString *) rightButtonTitle {
+    return loading_ ? @"" : [self _rightButtonTitle];
+}
 
-    [name_ setColor:black];
+- (NSString *) title {
+    return nil;
+}
 
-    CGColorSpaceRelease(space);
+- (NSString *) backButtonTitle {
+    return @"Browser";
 }
 
-- (void) setSelected:(BOOL)selected {
-    [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected];
+- (void) setPageActive:(BOOL)active {
+    if (active)
+        [book_ addSubview:indicator_];
+    else
+        [indicator_ removeFromSuperview];
 }
 
-- (void) setSelected:(BOOL)selected withFade:(BOOL)fade {
-    if (!fade)
-        [self _setSelected:(selected ? 1.0 : 0.0)];
-    [super setSelected:selected withFade:fade];
+- (void) resetViewAnimated:(BOOL)animated {
 }
 
-- (void) _setSelectionFadeFraction:(float)fraction {
-    [self _setSelected:fraction];
-    [super _setSelectionFadeFraction:fraction];
+- (void) setPushed:(bool)pushed {
+    pushed_ = pushed;
 }
 
 @end
 /* }}} */
-/* Install View {{{ */
-@interface InstallView : ResetView <
-    PackageTableDelegate
+
+@interface CYBook : RVBook <
+    ProgressDelegate
 > {
-    NSArray *sections_;
-    UITable *list_;
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *section_;
-    NSString *package_;
-    NSMutableArray *packages_;
+    _transient Database *database_;
+    UIView *overlay_;
+    UIProgressIndicator *indicator_;
+    UITextLabel *prompt_;
+    UIProgressBar *progress_;
+    bool updating_;
 }
 
-- (void) dealloc;
+- (id) initWithFrame:(CGRect)frame database:(Database *)database;
+- (void) update;
+- (BOOL) updating;
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
+@end
 
-- (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;
+/* Install View {{{ */
+@interface InstallView : RVPage {
+    _transient Database *database_;
+    NSMutableArray *sections_;
+    NSMutableArray *filtered_;
+    UITransitionView *transition_;
+    UITable *list_;
+    UIView *accessory_;
+    BOOL editing_;
+}
 
-- (void) packageTable:(id)table packageSelected:(Package *)package;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
+- (void) resetView;
 
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-- (void) setDelegate:(id)delegate;
 @end
 
 @implementation InstallView
 
 - (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];
-}
+    [list_ setDataSource:nil];
+    [list_ setDelegate:nil];
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    if (button == 0) {
-        [[view_ package] install];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
+    [sections_ release];
+    [filtered_ release];
+    [transition_ release];
+    [list_ release];
+    [accessory_ release];
+    [super dealloc];
 }
 
 - (int) numberOfRowsInTable:(UITable *)table {
-    return [sections_ count] + 1;
+    return editing_ ? [sections_ count] : [filtered_ count] + 1;
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
@@ -2719,84 +4502,76 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (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)]];
+    [(SectionCell *)reusing setSection:(editing_ ?
+        [sections_ objectAtIndex:row] :
+        (row == 0 ? nil : [filtered_ objectAtIndex:(row - 1)])
+    ) editing:editing_];
     return reusing;
 }
 
 - (BOOL) table:(UITable *)table showDisclosureForRow:(int)row {
-    return YES;
+    return !editing_;
+}
+
+- (BOOL) table:(UITable *)table canSelectRow:(int)row {
+    return !editing_;
 }
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
+    if (row == INT_MAX)
+        return;
 
-    if (row == INT_MAX) {
-        [section_ release];
-        section_ = nil;
+    Section *section;
+    NSString *name;
+    NSString *title;
 
-        [table_ release];
-        table_ = nil;
+    if (row == 0) {
+        section = nil;
+        name = nil;
+        title = @"All Packages";
     } else {
-        _assert(section_ == nil);
-        _assert(table_ == nil);
-
-        Section *section;
-        NSString *name;
+        section = [filtered_ objectAtIndex:(row - 1)];
+        name = [section name];
 
-        if (row == 0) {
-            section = nil;
-            section_ = nil;
-            name = @"All Packages";
-        } else {
-            section = [sections_ objectAtIndex:(row - 1)];
-            name = [section name];
-            section_ = [name retain];
+        if (name != nil)
+            title = name;
+        else {
+            name = @"";
+            title = @"(No Section)";
         }
-
-        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);
+    PackageTable *table = [[[PackageTable alloc]
+        initWithBook:book_
+        database:database_
+        title:title
+        filter:@selector(isVisiblyUninstalledInSection:)
+        with:name
+    ] autorelease];
 
-        package_ = [[package name] retain];
+    [table setDelegate:delegate_];
 
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    [book_ pushPage:table];
+}
 
-        [view_ setPackage:package];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Install"];
-    }
-}
+        sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        filtered_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+        transition_ = [[UITransitionView alloc] initWithFrame:[self bounds]];
+        [self addSubview:transition_];
 
         list_ = [[UITable alloc] initWithFrame:[transition_ bounds]];
-        [self pushView:list_ withTitle:@"Install" backButtonTitle:@"Sections" rightButton:nil];
+        [transition_ transition:0 toView:list_];
 
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
-            width:frame.size.width
+            width:[self frame].size.width
         ] autorelease];
 
         [list_ setDataSource:self];
@@ -2805,122 +4580,119 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [list_ setDelegate:self];
         [list_ setReusesTableCells:YES];
 
-        [transition_ transition:0 toView:list_];
+        [self reloadData];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+
+    [sections_ removeAllObjects];
+    [filtered_ removeAllObjects];
+
+    NSMutableArray *filtered = [NSMutableArray arrayWithCapacity:[packages count]];
+    NSMutableDictionary *sections = [NSMutableDictionary dictionaryWithCapacity:32];
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil)
-            [packages_ addObject:package];
+        NSString *name([package section]);
+
+        if (name != nil) {
+            Section *section([sections objectForKey:name]);
+            if (section == nil) {
+                section = [[[Section alloc] initWithName:name] autorelease];
+                [sections setObject:section forKey:name];
+            }
+        }
+
+        if ([package valid] && [package installed] == nil && [package visible])
+            [filtered addObject:package];
     }
 
-    [packages_ sortUsingSelector:@selector(compareBySectionAndName:)];
-    NSMutableArray *sections = [NSMutableArray arrayWithCapacity:16];
+    [sections_ addObjectsFromArray:[sections allValues]];
+    [sections_ sortUsingSelector:@selector(compareByName:)];
 
-    Section *nsection = nil;
-    Package *npackage = nil;
+    [filtered sortUsingSelector:@selector(compareBySection:)];
 
     Section *section = nil;
-    for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
+    for (size_t offset = 0, count = [filtered count]; offset != count; ++offset) {
+        Package *package = [filtered objectAtIndex:offset];
         NSString *name = [package section];
 
-        if (section == nil || name != nil && ![[section name] isEqual:name]) {
-            section = [[[Section alloc] initWithName:name row:offset] autorelease];
-
-            if (name == nil || [name isEqualToString:section_])
-                nsection = section;
-            [sections addObject:section];
+        if (section == nil || name != nil && ![[section name] isEqualToString:name]) {
+            section = name == nil ?
+                [[[Section alloc] initWithName:nil] autorelease] :
+                [sections objectForKey:name];
+            [filtered_ addObject:section];
         }
 
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
-        [section addPackage:package];
+        [section addToCount];
     }
 
-    if (sections_ != nil)
-        [sections_ release];
-    sections_ = [sections retain];
+    [list_ reloadData];
+}
 
-    [packages_ sortUsingSelector:@selector(compareByName:)];
+- (void) resetView {
+    if (editing_)
+        [self _rightButtonClicked];
+}
 
-    [list_ reloadData];
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
 
-    unsigned views(0);
+- (void) _rightButtonClicked {
+    if ((editing_ = !editing_))
+        [list_ reloadData];
+    else {
+        [delegate_ updateData];
+    }
+
+    [book_ setTitle:[self title] forPage:self];
+    [book_ reloadButtonsForPage:self];
+}
 
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        ++views;
+- (NSString *) title {
+    return editing_ ? @"Section Visibility" : @"Install by Section";
+}
 
-    if (table_ != nil && section_ == nil) 
-        [table_ setPackages:packages_];
-    else if (nsection != nil)
-        [table_ setPackages:[nsection packages]];
-    else if (section_ != nil)
-        ++views;
+- (NSString *) backButtonTitle {
+    return @"Sections";
+}
 
-    if (views != 0)
-        [self popViews:views];
-    [self setPrompt];
+- (NSString *) rightButtonTitle {
+    return [sections_ count] == 0 ? nil : editing_ ? @"Done" : @"Edit";
 }
 
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (UIView *) accessoryView {
+    return accessory_;
 }
 
 @end
 /* }}} */
 /* Changes View {{{ */
-@interface ChangesView : ResetView <
-    PackageTableDelegate
-> {
-    UISectionList *list_;
+@interface ChangesView : RVPage {
+    _transient Database *database_;
     NSMutableArray *packages_;
     NSMutableArray *sections_;
-    PackageView *view_;
-    NSString *package_;
-    size_t count_;
+    UISectionList *list_;
+    unsigned upgrades_;
 }
 
-- (void) dealloc;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-
-- (int) numberOfSectionsInSectionList:(UISectionList *)list;
-- (NSString *) sectionList:(UISectionList *)list titleForSection:(int)section;
-- (int) sectionList:(UISectionList *)list rowForSection:(int)section;
-
-- (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;
-- (void) setPackages:(NSArray *)packages;
-- (void) _resetView;
-- (size_t) count;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
 
-- (void) setDelegate:(id)delegate;
 @end
 
 @implementation ChangesView
 
 - (void) dealloc {
-    [list_ release];
+    [[list_ table] setDelegate:nil];
+    [list_ setDataSource:nil];
+
     [packages_ release];
     [sections_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [list_ release];
     [super dealloc];
 }
 
@@ -2941,12 +4713,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 100;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
     if (reusing == nil)
-        reusing = [[[PackageCell alloc] initWithVersioner:NULL] autorelease];
+        reusing = [[[PackageCell alloc] init] autorelease];
     [(PackageCell *)reusing setPackage:[packages_ objectAtIndex:row]];
     return reusing;
 }
@@ -2957,53 +4729,34 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [[notification object] selectedRow];
-    [self packageTable:self packageSelected:(row == INT_MAX ? nil : [packages_ objectAtIndex:row])];
+    if (row == INT_MAX)
+        return;
+    Package *package = [packages_ objectAtIndex:row];
+    PackageView *view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
+    [view setDelegate:delegate_];
+    [view setPackage:package];
+    [book_ pushPage:view];
 }
 
-- (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) _leftButtonClicked {
+    [(CYBook *)book_ update];
+    [self reloadButtons];
 }
 
-- (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"
-        )];
-    }
+- (void) _rightButtonClicked {
+    [delegate_ distUpgrade];
 }
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        database_ = database;
+
         packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
         sections_ = [[NSMutableArray arrayWithCapacity:16] retain];
 
-        list_ = [[UISectionList alloc] initWithFrame:[transition_ bounds] showSectionIndex:NO];
+        list_ = [[UISectionList alloc] initWithFrame:[self bounds] showSectionIndex:NO];
+        [self addSubview:list_];
+
         [list_ setShouldHideHeaderInShortLists:NO];
         [list_ setDataSource:self];
         //[list_ setSectionListStyle:1];
@@ -3011,7 +4764,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         UITableColumn *column = [[[UITableColumn alloc]
             initWithTitle:@"Name"
             identifier:@"name"
-            width:frame.size.width
+            width:[self frame].size.width
         ] autorelease];
 
         UITable *table = [list_ table];
@@ -3020,197 +4773,94 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [table setDelegate:self];
         [table setReusesTableCells:YES];
 
-        [self pushView:list_ withTitle:@"Changes" backButtonTitle:nil rightButton:nil];
+        [self reloadData];
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
+- (void) reloadData {
+    NSArray *packages = [database_ packages];
+
     [packages_ removeAllObjects];
+    [sections_ removeAllObjects];
+
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil || [package upgradable])
+
+        if (
+            [package installed] == nil && [package valid] && [package visible] ||
+            [package upgradableAndEssential:NO]
+        )
             [packages_ addObject:package];
     }
 
     [packages_ sortUsingSelector:@selector(compareForChanges:)];
 
-    [sections_ removeAllObjects];
-
-    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades" row:0] autorelease];
+    Section *upgradable = [[[Section alloc] initWithName:@"Available Upgrades"] autorelease];
     Section *section = nil;
 
-    count_ = 0;
-    Package *npackage = nil;
+    upgrades_ = 0;
+    bool unseens = false;
+
+    CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
+
     for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
         Package *package = [packages_ objectAtIndex:offset];
-        if ([[package name] isEqualToString:package_])
-            npackage = package;
 
-        if ([package upgradable])
-            [upgradable addPackage:package];
-        else {
+        if ([package upgradableAndEssential:YES]) {
+            ++upgrades_;
+            [upgradable addToCount];
+        } else {
+            unseens = true;
             NSDate *seen = [package seen];
 
             NSString *name;
-            CFStringRef formatted = NULL;
 
             if (seen == nil)
-                name = @"n/a ?";
+                name = [@"n/a ?" retain];
             else {
-                CFLocaleRef locale = CFLocaleCopyCurrent();
-                CFDateFormatterRef formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle);
-                formatted = CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
-                name = (NSString *) formatted;
-                CFRelease(formatter);
-                CFRelease(locale);
-            }
-
-            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];
-
-    [self _resetView];
-    [self setPrompt];
-}
-
-- (void) _resetView {
-    if ([views_ count] == 1)
-        [navbar_ showButtonsWithLeftTitle:(count_ == 0 ? nil : @"Upgrade All") rightTitle:nil];
-}
-
-- (size_t) count {
-    return count_;
-}
-
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
-}
-
-@end
-/* }}} */
-/* Manage View {{{ */
-@interface ManageView : ResetView <
-    PackageTableDelegate
-> {
-    PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
-}
-
-- (void) dealloc;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-
-- (void) packageTable:(id)table packageSelected:(Package *)package;
-
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-
-- (void) setDelegate:(id)delegate;
-@end
-
-@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) {
-        [[view_ package] remove];
-        [delegate_ resolve];
-        [delegate_ perform];
-    }
-}
-
-- (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_];
+                name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
+            }
 
-        [view_ setPackage:package];
+            if (section == nil || ![[section name] isEqualToString:name]) {
+                section = [[[Section alloc] initWithName:name row:offset] autorelease];
+                [sections_ addObject:section];
+            }
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:@"Uninstall"];
+            [name release];
+            [section addToCount];
+        }
     }
-}
-
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
 
-        [self pushView:table_ withTitle:@"Uninstall" backButtonTitle:@"Packages" rightButton:nil];
-    } return self;
-}
+    CFRelease(formatter);
 
-- (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];
+    if (unseens) {
+        Section *last = [sections_ lastObject];
+        size_t count = [last count];
+        [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)];
+        [sections_ removeLastObject];
     }
 
-    [local sortUsingSelector:@selector(compareByName:)];
+    if (upgrades_ != 0)
+        [sections_ insertObject:upgradable atIndex:0];
 
-    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;
-    }
+    [list_ reloadData];
+    [self reloadButtons];
+}
 
-    [table_ setPackages:local];
+- (void) resetViewAnimated:(BOOL)animated {
+    [list_ resetViewAnimated:animated];
+}
 
-    if (npackage != nil)
-        [view_ setPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+- (NSString *) leftButtonTitle {
+    return [(CYBook *)book_ updating] ? nil : @"Refresh";
+}
 
-    [self setPrompt];
+- (NSString *) rightButtonTitle {
+    return upgrades_ == 0 ? nil : [NSString stringWithFormat:@"Upgrade (%u)", upgrades_];
 }
 
-- (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
-    [super setDelegate:delegate];
+- (NSString *) title {
+    return @"Changes";
 }
 
 @end
@@ -3220,128 +4870,177 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 - (void) showKeyboard:(BOOL)show;
 @end
 
-@interface SearchView : ResetView <
-    PackageTableDelegate
-> {
-    NSMutableArray *packages_;
+@interface SearchView : RVPage {
     UIView *accessory_;
     UISearchField *field_;
+    UITransitionView *transition_;
     PackageTable *table_;
-    PackageView *view_;
-    NSString *package_;
+    UIPreferencesTable *advanced_;
+    UIView *dimmed_;
+    bool flipped_;
+    bool reload_;
 }
 
-- (void) dealloc;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) packageTable:(id)table packageSelected:(Package *)package;
-
-- (void) textFieldDidBecomeFirstResponder:(UITextField *)field;
-- (void) textFieldDidResignFirstResponder:(UITextField *)field;
-
-- (void) keyboardInputChanged:(UIFieldEditor *)editor;
-- (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked;
-
-- (id) initWithFrame:(CGRect)frame;
-- (void) setPackages:(NSArray *)packages;
-
-- (void) setDelegate:(id)delegate;
-- (void) resetPackage:(Package *)package;
-- (void) searchPackages;
+- (id) initWithBook:(RVBook *)book database:(Database *)database;
+- (void) reloadData;
 
 @end
 
 @implementation SearchView
 
 - (void) dealloc {
-    [packages_ release];
+#ifndef __OBJC2__
+    [[field_ textTraits] setEditingDelegate:nil];
+#endif
+    [field_ setDelegate:nil];
+
     [accessory_ release];
     [field_ release];
+    [transition_ release];
     [table_ release];
-    if (view_ != nil)
-        [view_ release];
-    if (package_ != nil)
-        [package_ release];
+    [advanced_ release];
+    [dimmed_ release];
     [super dealloc];
 }
 
-- (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];
+- (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
+    return 1;
+}
+
+- (NSString *) preferencesTable:(UIPreferencesTable *)table titleForGroup:(int)group {
+    switch (group) {
+        case 0: return @"Advanced Search (Coming Soon!)";
+
+        default: _assert(false);
     }
 }
 
-- (void) packageTable:(id)table packageSelected:(Package *)package {
-    if (package == nil) {
-        [navbar_ setAccessoryView:accessory_ animate:(resetting_ ? NO : YES) goingBack:YES];
+- (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
+    switch (group) {
+        case 0: return 0;
 
-        [package_ release];
-        package_ = nil;
+        default: _assert(false);
+    }
+}
+
+- (void) _showKeyboard:(BOOL)show {
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = [book_ pageBounds];
+    CGRect keyup = keydown;
+    keyup.size.height -= keysize.height - ButtonBarHeight_;
+
+    float delay = KeyboardTime_ * ButtonBarHeight_ / keysize.height;
 
-        [view_ release];
-        view_ = nil;
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:[table_ list]] autorelease];
+    [animation setSignificantRectFields:8];
+
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
     } else {
-        [navbar_ setAccessoryView:nil animate:YES goingBack:NO];
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
+    }
 
-        _assert(package_ == nil);
-        _assert(view_ == nil);
+    UIAnimator *animator = [UIAnimator sharedAnimator];
 
-        package_ = [[package name] retain];
+    [animator
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:(KeyboardTime_ - delay)
+        start:!show
+    ];
 
-        view_ = [[PackageView alloc] initWithFrame:[transition_ bounds]];
-        [view_ setDelegate:delegate_];
+    if (show)
+        [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
 
-        [self pushView:view_ withTitle:[package name] backButtonTitle:nil rightButton:nil];
-        [self resetPackage:package];
-    }
+#ifndef __OBJC2__
+    [delegate_ showKeyboard:show];
+#endif
 }
 
 - (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);*/
+    [self _showKeyboard:YES];
 }
 
 - (void) textFieldDidResignFirstResponder:(UITextField *)field {
-    [table_ setEnabled:YES];
-    [delegate_ showKeyboard:NO];
+    [self _showKeyboard:NO];
 }
 
 - (void) keyboardInputChanged:(UIFieldEditor *)editor {
-    NSString *text([field_ text]);
-    [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+    if (reload_) {
+        NSString *text([field_ text]);
+        [field_ setClearButtonStyle:(text == nil || [text length] == 0 ? 0 : 2)];
+        [self reloadData];
+        reload_ = false;
+    }
+}
+
+- (void) textFieldClearButtonPressed:(UITextField *)field {
+    reload_ = true;
+}
+
+- (void) keyboardInputShouldDelete:(id)input {
+    reload_ = true;
 }
 
 - (BOOL) keyboardInput:(id)input shouldInsertText:(NSString *)text isMarkedText:(int)marked {
-    if ([text length] != 1 || [text characterAtIndex:0] != '\n')
+    if ([text length] != 1 || [text characterAtIndex:0] != '\n') {
+        reload_ = true;
         return YES;
-
-    [self searchPackages];
-    [field_ resignFirstResponder];
-    return NO;
+    } else {
+        [field_ resignFirstResponder];
+        return NO;
+    }
 }
 
-- (id) initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame]) != nil) {
-        packages_ = [[NSMutableArray arrayWithCapacity:16] retain];
+- (id) initWithBook:(RVBook *)book database:(Database *)database {
+    if ((self = [super initWithBook:book]) != nil) {
+        CGRect pageBounds = [book_ pageBounds];
+
+        /*UIImageView *pinstripe = [[[UIImageView alloc] initWithFrame:pageBounds] autorelease];
+        [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
+        [self addSubview:pinstripe];*/
+
+        transition_ = [[UITransitionView alloc] initWithFrame:pageBounds];
+        [self addSubview:transition_];
+
+        advanced_ = [[UIPreferencesTable alloc] initWithFrame:pageBounds];
+
+        [advanced_ setReusesTableCells:YES];
+        [advanced_ setDataSource:self];
+        [advanced_ reloadData];
+
+        dimmed_ = [[UIView alloc] initWithFrame:pageBounds];
+        CGColor dimmed(space_, 0, 0, 0, 0.5);
+        [dimmed_ setBackgroundColor:dimmed];
 
-        table_ = [[PackageTable alloc] initWithFrame:[transition_ bounds] versioner:@selector(latest)];
-        [table_ setDelegate:self];
+        table_ = [[PackageTable alloc]
+            initWithBook:book
+            database:database
+            title:nil
+            filter:@selector(isVisiblySearchedForBy:)
+            with:nil
+        ];
+
+        [table_ setShouldHideHeaderInShortLists:NO];
+        [transition_ transition:0 toView:table_];
+
+        CGRect cnfrect = {{
+#ifdef __OBJC2__
+        6 +
+#endif
+        1, 38}, {17, 18}};
 
-        CGRect area = [self bounds];
+        CGRect area;
+        area.origin.x = /*cnfrect.origin.x + cnfrect.size.width + 4 +*/ 10;
         area.origin.y = 30;
-        area.origin.x = 0;
-        area.size.width -= 12;
+
+        area.size.width =
+#ifdef __OBJC2__
+            8 +
+#endif
+            [self bounds].size.width - area.origin.x - 18;
+
         area.size.height = [UISearchField defaultHeight];
 
         field_ = [[UISearchField alloc] initWithFrame:area];
@@ -3351,176 +5050,343 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         CFRelease(font);
 
         [field_ setPlaceholder:@"Package Names & Descriptions"];
-        [field_ setPaddingTop:5];
         [field_ setDelegate:self];
 
+#ifdef __OBJC2__
+        [field_ setPaddingTop:3];
+#else
+        [field_ setPaddingTop:5];
+#endif
+
         UITextTraits *traits = [field_ textTraits];
-        [traits setEditingDelegate:self];
+        [traits setAutoCapsType:0];
+        [traits setAutoCorrectionType:1];
         [traits setReturnKeyType:6];
 
-        accessory_ = [[UIView alloc] initWithFrame:CGRectMake(6, 6, area.size.width, area.size.height + 30)];
-        [accessory_ addSubview:field_];
+#ifndef __OBJC2__
+        [traits setEditingDelegate:self];
+#endif
+
+        CGRect accrect = {{0, 6}, {6 + cnfrect.size.width + 6 + area.size.width + 6, area.size.height + 30}};
 
-        [navbar_ setAccessoryView:accessory_];
-        [self pushView:table_ withTitle:nil backButtonTitle:@"Search" rightButton:nil];
+        accessory_ = [[UIView alloc] initWithFrame:accrect];
+        [accessory_ addSubview:field_];
 
-        /* XXX: for the love of god just fix this */
-        [navbar_ removeFromSuperview];
-        [reload_ removeFromSuperview];
-        [configure_ removeFromSuperview];
-        [self addSubview:navbar_];
-        [self addSubview:reload_];
-        [self addSubview:configure_];
+        /*UIPushButton *configure = [[[UIPushButton alloc] initWithFrame:cnfrect] autorelease];
+        [configure setShowPressFeedback:YES];
+        [configure setImage:[UIImage applicationImageNamed:@"advanced.png"]];
+        [configure addTarget:self action:@selector(configurePushed) forEvents:1];
+        [accessory_ addSubview:configure];*/
     } return self;
 }
 
-- (void) setPackages:(NSArray *)packages {
-    [packages_ removeAllObjects];
-    [packages_ addObjectsFromArray:packages];
-    [packages_ sortUsingSelector:@selector(compareByName:)];
+- (void) flipPage {
+#ifndef __OBJC2__
+    LKAnimation *animation = [LKTransition animation];
+    [animation setType:@"oglFlip"];
+    [animation setTimingFunction:[LKTimingFunction functionWithName:@"easeInEaseOut"]];
+    [animation setFillMode:@"extended"];
+    [animation setTransitionFlags:3];
+    [animation setDuration:10];
+    [animation setSpeed:0.35];
+    [animation setSubtype:(flipped_ ? @"fromLeft" : @"fromRight")];
+    [[transition_ _layer] addAnimation:animation forKey:0];
+    [transition_ transition:0 toView:(flipped_ ? (UIView *) table_ : (UIView *) advanced_)];
+    flipped_ = !flipped_;
+#endif
+}
 
-    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;
-    }
+- (void) configurePushed {
+    [field_ resignFirstResponder];
+    [self flipPage];
+}
+
+- (void) resetViewAnimated:(BOOL)animated {
+    if (flipped_)
+        [self flipPage];
+    [table_ resetViewAnimated:animated];
+}
+
+- (void) reloadData {
+    if (flipped_)
+        [self flipPage];
+    [table_ setObject:[field_ text]];
+    [table_ reloadData];
+    [table_ resetCursor];
+}
 
-    [self searchPackages];
+- (UIView *) accessoryView {
+    return accessory_;
+}
 
-    if (npackage != nil)
-        [self resetPackage:npackage];
-    else if (package_ != nil)
-        [self popViews:1];
+- (NSString *) title {
+    return nil;
+}
 
-    [self setPrompt];
+- (NSString *) backButtonTitle {
+    return @"Search";
 }
 
 - (void) setDelegate:(id)delegate {
-    if (view_ != nil)
-        [view_ setDelegate:delegate];
+    [table_ setDelegate:delegate];
     [super setDelegate:delegate];
 }
 
-- (void) resetPackage:(Package *)package {
-    [view_ setPackage:package];
-    NSString *right = [package installed] == nil ? @"Install" : @"Uninstall";
-    [navbar_ showButtonsWithLeftTitle:nil rightTitle:right];
+@end
+/* }}} */
+
+@implementation CYBook
+
+- (void) dealloc {
+    [overlay_ release];
+    [indicator_ release];
+    [prompt_ release];
+    [progress_ release];
+    [super dealloc];
+}
+
+- (NSString *) getTitleForPage:(RVPage *)page {
+    return Simplify([super getTitleForPage:page]);
 }
 
-- (void) searchPackages {
-    NSString *text([field_ text]);
+- (BOOL) updating {
+    return updating_;
+}
 
-    NSMutableArray *packages([NSMutableArray arrayWithCapacity:16]);
+- (void) update {
+    [navbar_ setPrompt:@""];
+    [navbar_ addSubview:overlay_];
+    [indicator_ startAnimation];
+    [prompt_ setText:@"Updating Database..."];
+    [progress_ setProgress:0];
 
-    for (size_t offset(0), count([packages_ count]); offset != count; ++offset) {
-        Package *package = [packages_ objectAtIndex:offset];
-        if ([package matches:text])
-            [packages addObject:package];
-    }
+    updating_ = true;
+
+    [NSThread
+        detachNewThreadSelector:@selector(_update)
+        toTarget:self
+        withObject:nil
+    ];
+}
+
+- (void) _update_ {
+    updating_ = false;
+
+    [overlay_ removeFromSuperview];
+    [indicator_ stopAnimation];
+    [delegate_ reloadData];
+
+    [self setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+}
+
+- (id) initWithFrame:(CGRect)frame database:(Database *)database {
+    if ((self = [super initWithFrame:frame]) != nil) {
+        database_ = database;
+
+        if (Advanced_)
+            [navbar_ setBarStyle:1];
+
+        CGRect ovrrect = [navbar_ bounds];
+        ovrrect.size.height = ([UINavigationBar defaultSizeWithPrompt].height - [UINavigationBar defaultSize].height);
+
+        overlay_ = [[UIView alloc] initWithFrame:ovrrect];
+
+        UIProgressIndicatorStyle style = Advanced_ ?
+            kUIProgressIndicatorStyleSmallWhite :
+            kUIProgressIndicatorStyleSmallBlack;
+
+        CGSize indsize = [UIProgressIndicator defaultSizeForStyle:style];
+        unsigned indoffset = (ovrrect.size.height - indsize.height) / 2;
+        CGRect indrect = {{indoffset, indoffset}, indsize};
+
+        indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
+        [indicator_ setStyle:style];
+        [overlay_ addSubview:indicator_];
+
+        CGSize prmsize = {200, indsize.width + 4};
+
+        CGRect prmrect = {{
+            indoffset * 2 + indsize.width,
+#ifdef __OBJC2__
+            -1 +
+#endif
+            (ovrrect.size.height - prmsize.height) / 2
+        }, prmsize};
+
+        GSFontRef font = GSFontCreateWithName("Helvetica", kGSFontTraitNone, 12);
+
+        prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
+
+        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
+        [prompt_ setBackgroundColor:Clear_];
+        [prompt_ setFont:font];
+
+        CFRelease(font);
+
+        [overlay_ addSubview:prompt_];
+
+        CGSize prgsize = {75, 100};
+
+        CGRect prgrect = {{
+            ovrrect.size.width - prgsize.width - 10,
+            (ovrrect.size.height - prgsize.height) / 2
+        } , prgsize};
+
+        progress_ = [[UIProgressBar alloc] initWithFrame:prgrect];
+        [progress_ setStyle:0];
+        [overlay_ addSubview:progress_];
+    } return self;
+}
+
+- (void) _update {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    Status status;
+    status.setDelegate(self);
+
+    [database_ updateWithStatus:status];
+
+    [self
+        performSelectorOnMainThread:@selector(_update_)
+        withObject:nil
+        waitUntilDone:NO
+    ];
+
+    [pool release];
+}
+
+- (void) setProgressError:(NSString *)error forPackage:(NSString *)id {
+    [prompt_ setText:[NSString stringWithFormat:@"Error: %@", error]];
+}
+
+- (void) setProgressTitle:(NSString *)title {
+    [self
+        performSelectorOnMainThread:@selector(_setProgressTitle:)
+        withObject:title
+        waitUntilDone:YES
+    ];
+}
+
+- (void) setProgressPercent:(float)percent {
+}
+
+- (void) addProgressOutput:(NSString *)output {
+    [self
+        performSelectorOnMainThread:@selector(_addProgressOutput:)
+        withObject:output
+        waitUntilDone:YES
+    ];
+}
+
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    [sheet dismiss];
+}
+
+- (void) _setProgressTitle:(NSString *)title {
+    [prompt_ setText:[title stringByAppendingString:@"..."]];
+}
 
-    [table_ setPackages:packages];
-    [[table_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
+- (void) _addProgressOutput:(NSString *)output {
 }
 
 @end
-/* }}} */
 
 @interface Cydia : UIApplication <
     ConfirmationViewDelegate,
     ProgressViewDelegate,
-    SearchViewDelegate
+    SearchViewDelegate,
+    CydiaDelegate
 > {
     UIWindow *window_;
+
     UIView *underlay_;
     UIView *overlay_;
-    UITransitionView *transition_;
+    CYBook *book_;
     UIButtonBar *buttonbar_;
 
     ConfirmationView *confirm_;
 
+    NSMutableArray *essential_;
+    NSMutableArray *broken_;
+
     Database *database_;
     ProgressView *progress_;
 
-    UIView *featured_;
-    UINavigationBar *navbar_;
-    UIScroller *scroller_;
-    UIWebView *webview_;
-    NSURL *url_;
-    UIProgressIndicator *indicator_;
+    unsigned tag_;
+
+    UIKeyboard *keyboard_;
+    UIProgressHUD *hud_;
 
     InstallView *install_;
     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) progressViewIsComplete:(ProgressView *)progress;
-
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button;
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button;
-- (void) buttonBarItemTapped:(id)sender;
-
-- (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
 
 @implementation Cydia
 
-- (void) loadNews {
-    NSMutableURLRequest *request = [NSMutableURLRequest
-        requestWithURL:url_
-        cachePolicy:NSURLRequestReloadIgnoringCacheData
-        timeoutInterval:30.0
-    ];
+- (void) _loaded {
+    if ([broken_ count] != 0) {
+        int count = [broken_ count];
+
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Half-Installed Package%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:
+                @"Forcibly Clear",
+                @"Ignore (Temporary)",
+            nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"fixhalf"
+        ] autorelease];
 
-    [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"];
+        [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a bad state known as either half-configured or half-installed. These errors don't go away and instead continue to cause issues. These scripts can be deleted and the packages forcibly removed."];
+        [sheet popupAlertAnimated:YES];
+    } else if (!Ignored_ && [essential_ count] != 0) {
+        int count = [essential_ count];
 
-    [webview_ loadRequest:request];
+        UIAlertSheet *sheet = [[[UIAlertSheet alloc]
+            initWithTitle:[NSString stringWithFormat:@"%d Essential Upgrade%@", count, (count == 1 ? @"" : @"s")]
+            buttons:[NSArray arrayWithObjects:@"Upgrade Essential", @"Ignore (Temporary)", nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"upgrade"
+        ] autorelease];
+
+        [sheet setBodyText:@"One or more essential packages are currently out of date. If these upgrades are not performed you are likely to encounter errors."];
+        [sheet popupAlertAnimated:YES];
+    }
 }
 
-- (void) reloadData:(BOOL)reset {
+- (void) _reloadData {
+    /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud setText:@"Reloading Data"];
+    [overlay_ addSubview:hud];
+    [hud show:YES];*/
+
     [database_ reloadData];
 
-    size_t count = 16;
+    size_t changes(0);
 
-    if (Packages_ == nil) {
-        Packages_ = [[NSMutableDictionary alloc] initWithCapacity:count];
-        [Metadata_ setObject:Packages_ forKey:@"Packages"];
-    }
+    [essential_ removeAllObjects];
+    [broken_ removeAllObjects];
 
     NSArray *packages = [database_ packages];
+    for (int i(0), e([packages count]); i != e; ++i) {
+        Package *package = [packages objectAtIndex:i];
+        if ([package half])
+            [broken_ addObject:package];
+        if ([package upgradableAndEssential:NO]) {
+            if ([package essential])
+                [essential_ addObject:package];
+            ++changes;
+        }
+    }
 
-    [install_ setPackages:packages];
-    [changes_ setPackages:packages];
-    [manage_ setPackages:packages];
-    [search_ setPackages:packages];
-
-    if (size_t count = [changes_ count]) {
-        NSString *badge([[NSNumber numberWithInt:count] stringValue]);
+    if (changes != 0) {
+        NSString *badge([[NSNumber numberWithInt:changes] stringValue]);
         [buttonbar_ setBadgeValue:badge forButton:3];
         if ([buttonbar_ respondsToSelector:@selector(setBadgeAnimated:forButton:)])
             [buttonbar_ setBadgeAnimated:YES forButton:3];
@@ -3532,11 +5398,79 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [self removeApplicationBadge];
     }
 
-    _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+    [self updateData];
+
+    if ([packages count] == 0);
+    else if (Loaded_)
+        [self _loaded];
+    else {
+        Loaded_ = YES;
+        [book_ update];
+    }
+
+    /*[hud show:NO];
+    [hud removeFromSuperview];*/
+}
+
+- (void) _saveConfig {
+    if (Changed_) {
+        _assert([Metadata_ writeToFile:@"/var/lib/cydia/metadata.plist" atomically:YES] == YES);
+        Changed_ = false;
+    }
+}
+
+- (void) updateData {
+    [self _saveConfig];
+
+    /* XXX: this is just stupid */
+    if (tag_ != 2)
+        [install_ reloadData];
+    if (tag_ != 3)
+        [changes_ reloadData];
+    if (tag_ != 5)
+        [search_ reloadData];
+
+    [book_ reloadData];
+}
+
+- (void) update_ {
+    [database_ update];
+}
+
+- (void) syncData {
+    FILE *file = fopen("/etc/apt/sources.list.d/cydia.list", "w");
+    _assert(file != NULL);
+
+    NSArray *keys = [Sources_ allKeys];
+
+    for (int i(0), e([keys count]); i != e; ++i) {
+        NSString *key = [keys objectAtIndex:i];
+        NSDictionary *source = [Sources_ objectForKey:key];
+
+        fprintf(file, "%s %s %s\n",
+            [[source objectForKey:@"Type"] UTF8String],
+            [[source objectForKey:@"URI"] UTF8String],
+            [[source objectForKey:@"Distribution"] UTF8String]
+        );
+    }
+
+    fclose(file);
+
+    [self _saveConfig];
+
+    [progress_
+        detachNewThreadSelector:@selector(update_)
+        toTarget:self
+        withObject:nil
+        title:@"Updating Sources..."
+    ];
 }
 
-- (void) setPrompt {
-    [navbar_ setPrompt:[NSString stringWithFormat:@"Last Updated: %@", GetLastUpdate()]];
+- (void) reloadData {
+    @synchronized (self) {
+        if (confirm_ == nil)
+            [self _reloadData];
+    }
 }
 
 - (void) resolve {
@@ -3567,30 +5501,50 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             buttons:[NSArray arrayWithObjects:@"Okay", nil]
             defaultButtonIndex:0
             delegate:self
-            context:self
+            context:@"broken"
         ] autorelease];
 
         [sheet setBodyText:[NSString stringWithFormat:@"The following packages have unmet dependencies:\n\n%@", [broken componentsJoinedByString:@"\n"]]];
         [sheet popupAlertAnimated:YES];
 
-        [self reloadData:NO];
+        [self _reloadData];
     }
 }
 
-- (void) upgrade {
-    [database_ upgrade];
-    [self perform];
+- (void) installPackage:(Package *)package {
+    @synchronized (self) {
+        [package install];
+        [self resolve];
+        [self perform];
+    }
+}
+
+- (void) removePackage:(Package *)package {
+    @synchronized (self) {
+        [package remove];
+        [self resolve];
+        [self perform];
+    }
+}
+
+- (void) distUpgrade {
+    @synchronized (self) {
+        [database_ upgrade];
+        [self perform];
+    }
 }
 
 - (void) cancel {
-    [self reloadData:NO];
-    [confirm_ release];
-    confirm_ = nil;
+    @synchronized (self) {
+        [confirm_ release];
+        confirm_ = nil;
+        [self _reloadData];
+    }
 }
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
-    restart_ = true;
+    reload_ = true;
 
     [progress_
         detachNewThreadSelector:@selector(perform)
@@ -3616,207 +5570,147 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     ];
 }
 
-- (void) update {
-    [progress_
-        detachNewThreadSelector:@selector(update)
-        toTarget:database_
-        withObject:nil
-        title:@"Refreshing Sources..."
-    ];
-}
-
 - (void) progressViewIsComplete:(ProgressView *)progress {
-    [self reloadData:YES];
-
-    if (confirm_ != nil) {
-        [underlay_ addSubview:overlay_];
-        [confirm_ removeFromSuperview];
-        [confirm_ release];
-        confirm_ = nil;
+    @synchronized (self) {
+        [self _reloadData];
+
+        if (confirm_ != nil) {
+            [underlay_ addSubview:overlay_];
+            [confirm_ removeFromSuperview];
+            [confirm_ release];
+            confirm_ = nil;
+        }
     }
 }
 
-- (void) navigationBar:(UINavigationBar *)navbar buttonClicked:(int)button {
-    switch (button) {
-        case 0:
-            [self loadNews];
-        break;
-
-        case 1:
-            UIAlertSheet *sheet = [[[UIAlertSheet alloc]
-                initWithTitle:@"About Cydia Packager"
-                buttons:[NSArray arrayWithObjects:@"Close", nil]
-                defaultButtonIndex:0
-                delegate:self
-                context:self
-            ] autorelease];
-
-            [sheet setBodyText:
-                @"Copyright (C) 2008\n"
-                "Jay Freeman (saurik)\n"
-                "saurik@saurik.com\n"
-                "http://www.saurik.com/\n"
-                "\n"
-                "The Okori Group\n"
-                "http://www.theokorigroup.com/\n"
-                "\n"
-                "College of Creative Studies,\n"
-                "University of California,\n"
-                "Santa Barbara\n"
-                "http://www.ccs.ucsb.edu/\n"
-                "\n"
-                "Special Thanks:\n"
-                "bad_, BHSPitMonkey, cash, Cobra,\n"
-                "core, Corona, crashx, cromas,\n"
-                "Darken, dtzWill, Erica, francis,\n"
-                "Godores, jerry, Kingstone, lounger,\n"
-                "mbranes, rockabilly, tman, Wbiggs"
-            ];
+- (void) setPage:(RVPage *)page {
+    [page resetViewAnimated:NO];
+    [page setDelegate:self];
+    [book_ setPage:page];
+}
 
-            [sheet presentSheetFromButtonBar:buttonbar_];
-        break;
-    }
+- (RVPage *) _pageForURL:(NSURL *)url withClass:(Class)_class {
+    BrowserView *browser = [[[_class alloc] initWithBook:book_ database:database_] autorelease];
+    [browser loadURL:url];
+    return browser;
 }
 
-- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
+- (void) _setHomePage {
+    [self setPage:[self _pageForURL:[NSURL URLWithString:@"http://cydia.saurik.com/"] withClass:[HomeView class]]];
 }
 
 - (void) buttonBarItemTapped:(id)sender {
-    UIView *view;
     unsigned tag = [sender tag];
+    if (tag == tag_) {
+        [book_ resetViewAnimated:YES];
+        return;
+    } else if (tag_ == 2 && tag != 2)
+        [install_ resetView];
 
     switch (tag) {
-        case 1: view = featured_; break;
-        case 2: view = install_; break;
-        case 3: view = changes_; break;
-        case 4: view = manage_; break;
-        case 5: view = search_; break;
+        case 1: [self _setHomePage]; break;
 
-        default:
-            _assert(false);
+        case 2: [self setPage:install_]; break;
+        case 3: [self setPage:changes_]; break;
+        case 4: [self setPage:manage_]; break;
+        case 5: [self setPage:search_]; break;
+
+        default: _assert(false);
     }
 
-    if ([view respondsToSelector:@selector(resetView:)])
-        [(id) view resetView:(tag == tag_ ? NO : YES)];
     tag_ = tag;
-    [transition_ transition:0 toView:view];
 }
 
-- (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
-    [scroller_ setContentSize:frame.size];
-    [indicator_ stopAnimation];
-}
+- (void) fixSpringBoard {
+    pid_t pid = ExecFork();
+    if (pid == 0) {
+        sleep(1);
 
-- (void) webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame {
-    [navbar_ setPrompt:title];
-}
+        if (pid_t child = fork()) {
+            waitpid(child, NULL, 0);
+        } else {
+            execlp("launchctl", "launchctl", "unload", SpringBoard_, NULL);
+            perror("launchctl unload");
+            exit(0);
+        }
 
-- (void) webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame {
-    [navbar_ setPrompt:@"Loading..."];
-    [indicator_ startAnimation];
+        execlp("launchctl", "launchctl", "load", SpringBoard_, NULL);
+        perror("launchctl load");
+        exit(0);
+    }
 }
 
 - (void) applicationWillSuspend {
-    if (restart_)
-        if (FW_LEAST(1,1,3))
-            notify_post("com.apple.language.changed");
-        else
-            system("launchctl stop com.apple.SpringBoard");
+    [database_ clean];
+
+    if (reload_) {
+#ifndef __OBJC2__
+        [self fixSpringBoard];
+#endif
+}
 
     [super applicationWillSuspend];
 }
 
-- (void) applicationDidFinishLaunching:(id)unused {
-    _assert(pkgInitConfig(*_config));
-    _assert(pkgInitSystem(*_config, _system));
+- (void) askForSettings {
+    UIAlertSheet *role = [[[UIAlertSheet alloc]
+        initWithTitle:@"Who Are You?"
+        buttons:[NSArray arrayWithObjects:
+            @"User (Graphical Only)",
+            @"Hacker (+ Command Line)",
+            @"Developer (No Filters)",
+        nil]
+        defaultButtonIndex:-1
+        delegate:self
+        context:@"role"
+    ] autorelease];
 
-    confirm_ = nil;
-    restart_ = false;
-    tag_ = 1;
+    [role setBodyText:@"Not all of the packages available via Cydia are designed to be used by all users. Please categorize yourself so that Cydia can apply helpful filters.\n\nThis choice can be changed from \"Settings\" under the \"Manage\" tab."];
+    [role popupAlertAnimated:YES];
+}
 
-    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
-    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+- (void) finish {
+    if (hud_ != nil) {
+        [self setStatusBarShowsProgress:NO];
 
-    [window_ orderFront: self];
-    [window_ makeKey: self];
-    [window_ _setHidden: NO];
+        [hud_ show:NO];
+        [hud_ removeFromSuperview];
+        [hud_ autorelease];
+        hud_ = nil;
 
-    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] delegate:self];
-    [window_ setContentView:progress_];
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
+            perror("launchctl stop");
+        }
 
-    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
-    [progress_ setContentView:underlay_];
+        return;
+    }
 
-    overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
+    if (Role_ == nil) {
+        [self askForSettings];
+        return;
+    }
 
-    if (!bootstrap_)
-        [underlay_ addSubview:overlay_];
+    overlay_ = [[UIView alloc] initWithFrame:[underlay_ bounds]];
 
-    transition_ = [[UITransitionView alloc] initWithFrame:CGRectMake(
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+    book_ = [[CYBook alloc] initWithFrame:CGRectMake(
         0, 0, screenrect.size.width, screenrect.size.height - 48
-    )];
-
-    [overlay_ addSubview:transition_];
-
-    featured_ = [[UIView alloc] initWithFrame:[transition_ bounds]];
-
-    CGSize navsize = [UINavigationBar defaultSizeWithPrompt];
-    CGRect navrect = {{0, 0}, navsize};
-
-    navbar_ = [[UINavigationBar alloc] initWithFrame:navrect];
-    [featured_ addSubview:navbar_];
-
-    [navbar_ setBarStyle:1];
-    [navbar_ setDelegate:self];
-
-    [navbar_ showButtonsWithLeftTitle:@"About" rightTitle:@"Reload"];
-
-    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] autorelease];
-    [pinstripe setImage:[UIImage applicationImageNamed:@"pinstripe.png"]];
-    [featured_ addSubview:pinstripe];
+    ) database:database_];
 
-    scroller_ = [[UIScroller alloc] initWithFrame:subbounds];
-    [featured_ addSubview:scroller_];
+    [book_ setDelegate:self];
 
-    [scroller_ setScrollingEnabled:YES];
-    [scroller_ setAdjustForContentSizeChange:YES];
-    [scroller_ setClipsSubviews:YES];
-    [scroller_ setAllowsRubberBanding:YES];
-    [scroller_ setScrollDecelerationFactor:0.99];
-    [scroller_ setDelegate:self];
-
-    CGRect webrect = [scroller_ bounds];
-    webrect.size.height = 0;
-
-    webview_ = [[UIWebView alloc] initWithFrame:webrect];
-    [scroller_ addSubview:webview_];
-
-    [webview_ setTilingEnabled:YES];
-    [webview_ setTileSize:CGSizeMake(screenrect.size.width, 500)];
-    [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_];
+    [overlay_ addSubview:book_];
 
     NSArray *buttonitems = [NSArray arrayWithObjects:
         [NSDictionary dictionaryWithObjectsAndKeys:
             @"buttonBarItemTapped:", kUIButtonBarButtonAction,
-            @"featured-up.png", kUIButtonBarButtonInfo,
-            @"featured-dn.png", kUIButtonBarButtonSelectedInfo,
+            @"home-up.png", kUIButtonBarButtonInfo,
+            @"home-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:1], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Featured", kUIButtonBarButtonTitle,
+            @"Home", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3826,7 +5720,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             @"install-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:2], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Install", kUIButtonBarButtonTitle,
+            @"Sections", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3846,7 +5740,7 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             @"manage-dn.png", kUIButtonBarButtonSelectedInfo,
             [NSNumber numberWithInt:4], kUIButtonBarButtonTag,
             self, kUIButtonBarButtonTarget,
-            @"Uninstall", kUIButtonBarButtonTitle,
+            @"Manage", kUIButtonBarButtonTitle,
             @"0", kUIButtonBarButtonType,
         nil],
 
@@ -3864,8 +5758,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     buttonbar_ = [[UIButtonBar alloc]
         initInView:overlay_
         withFrame:CGRectMake(
-            0, screenrect.size.height - 48,
-            screenrect.size.width, 48
+            0, screenrect.size.height - ButtonBarHeight_,
+            screenrect.size.width, ButtonBarHeight_
         )
         withItemList:buttonitems
     ];
@@ -3880,65 +5774,236 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
     for (int i = 0; i != 5; ++i)
         [[buttonbar_ viewWithTag:(i + 1)] setFrame:CGRectMake(
-            i * 64 + 2, 1, 60, 48
+            i * 64 + 2, 1, 60, ButtonBarHeight_
         )];
 
     [buttonbar_ showSelectionForButton:1];
-    [transition_ transition:0 toView:featured_];
-
     [overlay_ addSubview:buttonbar_];
 
     [UIKeyboard initImplementationNow];
-
-    CGRect edtrect = [overlay_ bounds];
-    edtrect.origin.y += navsize.height;
-    edtrect.size.height -= navsize.height;
-
     CGSize keysize = [UIKeyboard defaultSize];
-    CGRect keyrect = {{0, [overlay_ bounds].size.height - keysize.height}, keysize};
+    CGRect keyrect = {{0, [overlay_ bounds].size.height}, keysize};
     keyboard_ = [[UIKeyboard alloc] initWithFrame:keyrect];
+    [[UIKeyboardImpl sharedInstance] setSoundsEnabled:(Sounds_Keyboard_ ? YES : NO)];
+    [overlay_ addSubview:keyboard_];
 
-    database_ = [[Database alloc] init];
-    [database_ setDelegate:progress_];
+    install_ = [[InstallView alloc] initWithBook:book_ database:database_];
+    changes_ = [[ChangesView alloc] initWithBook:book_ database:database_];
+    search_ = [[SearchView alloc] initWithBook:book_ database:database_];
+
+    manage_ = (ManageView *) [[self
+        _pageForURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"manage" ofType:@"html"]]
+        withClass:[ManageView class]
+    ] retain];
+
+    if (!bootstrap_)
+        [underlay_ addSubview:overlay_];
 
-    install_ = [[InstallView alloc] initWithFrame:[transition_ bounds]];
-    [install_ setDelegate:self];
+    [self reloadData];
 
-    changes_ = [[ChangesView alloc] initWithFrame:[transition_ bounds]];
-    [changes_ setDelegate:self];
+    if (bootstrap_)
+        [self bootstrap];
+    else
+        [self _setHomePage];
+}
 
-    manage_ = [[ManageView alloc] initWithFrame:[transition_ bounds]];
-    [manage_ setDelegate:self];
+- (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
+    NSString *context = [sheet context];
+    if ([context isEqualToString:@"fixhalf"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [broken_ count]; i != e; ++i) {
+                        Package *broken = [broken_ objectAtIndex:i];
+                        [broken remove];
+
+                        NSString *id = [broken id];
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]);
+                        unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]);
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
 
-    search_ = [[SearchView alloc] initWithFrame:[transition_ bounds]];
-    [search_ setDelegate:self];
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
 
-    [self reloadData:NO];
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"role"]) {
+        switch (button) {
+            case 1: Role_ = @"User"; break;
+            case 2: Role_ = @"Hacker"; break;
+            case 3: Role_ = @"Developer"; break;
 
-    Package *package([database_ packageWithName:@"cydia"]);
-    NSString *application = package == nil ? @"Cydia" : [NSString
-        stringWithFormat:@"Cydia/%@",
-        [package installed]
-    ];
+            default:
+                Role_ = nil;
+                _assert(false);
+        }
 
-    WebView *webview = [webview_ webView];
-    [webview setApplicationNameForUserAgent:application];
-    [webview setFrameLoadDelegate:self];
+        bool reset = Settings_ != nil;
+
+        Settings_ = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+            Role_, @"Role",
+        nil];
+
+        [Metadata_ setObject:Settings_ forKey:@"Settings"];
+
+        Changed_ = true;
+
+        if (reset)
+            [self updateData];
+        else
+            [self finish];
+    } else if ([context isEqualToString:@"upgrade"])
+        switch (button) {
+            case 1:
+                @synchronized (self) {
+                    for (int i = 0, e = [essential_ count]; i != e; ++i) {
+                        Package *essential = [essential_ objectAtIndex:i];
+                        [essential install];
+                    }
+
+                    [self resolve];
+                    [self perform];
+                }
+            break;
+
+            case 2:
+                Ignored_ = YES;
+            break;
+
+            default:
+                _assert(false);
+        }
+
+    [sheet dismiss];
+}
+
+- (void) reorganize {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    system("/usr/libexec/cydia/free.sh");
+    [self performSelectorOnMainThread:@selector(finish) withObject:nil waitUntilDone:NO];
+    [pool release];
+}
+
+- (void) applicationSuspend:(__GSEvent *)event {
+    if (hud_ == nil && ![progress_ isRunning])
+        [super applicationSuspend:event];
+}
+
+- (void) _animateSuspension:(BOOL)arg0 duration:(double)arg1 startTime:(double)arg2 scale:(float)arg3 {
+    if (hud_ == nil)
+        [super _animateSuspension:arg0 duration:arg1 startTime:arg2 scale:arg3];
+}
+
+- (void) _setSuspended:(BOOL)value {
+    if (hud_ == nil)
+        [super _setSuspended:value];
+}
+
+- (UIProgressHUD *) addProgressHUD {
+    UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
+    [hud show:YES];
+    [underlay_ addSubview:hud];
+    return hud;
+}
+
+- (void) applicationDidFinishLaunching:(id)unused {
+    Font12_ = [[UIFont systemFontOfSize:12] retain];
+    Font12Bold_ = [[UIFont boldSystemFontOfSize:12] retain];
+    Font14_ = [[UIFont systemFontOfSize:14] retain];
+    Font18Bold_ = [[UIFont boldSystemFontOfSize:18] retain];
+    Font22Bold_ = [[UIFont boldSystemFontOfSize:22] retain];
 
-    url_ = [NSURL URLWithString:@"http://cydia.saurik.com/"];
-    [self loadNews];
+    _assert(pkgInitConfig(*_config));
+    _assert(pkgInitSystem(*_config, _system));
+
+    confirm_ = nil;
+    tag_ = 1;
+
+    essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+
+    CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
+    window_ = [[UIWindow alloc] initWithContentRect:screenrect];
+
+    [window_ orderFront:self];
+    [window_ makeKey:self];
+    [window_ _setHidden:NO];
+
+    database_ = [[Database alloc] init];
+    progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] database:database_ delegate:self];
+    [database_ setDelegate:progress_];
+    [window_ setContentView:progress_];
+
+    underlay_ = [[UIView alloc] initWithFrame:[progress_ bounds]];
+    [progress_ setContentView:underlay_];
 
     [progress_ resetView];
 
-    if (bootstrap_)
-        [self bootstrap];
+    if (
+        readlink("/Applications", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Ringtones", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/Library/Wallpaper", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/include", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/libexec", NULL, 0) == -1 && errno == EINVAL ||
+        readlink("/usr/share", NULL, 0) == -1 && errno == EINVAL
+    ) {
+        [self setIdleTimerDisabled:YES];
+
+        hud_ = [self addProgressHUD];
+        [hud_ setText:@"Reorganizing\n\nWill Automatically\nRestart When Done"];
+
+        [self setStatusBarShowsProgress:YES];
+
+        [NSThread
+            detachNewThreadSelector:@selector(reorganize)
+            toTarget:self
+            withObject:nil
+        ];
+    } else
+        [self finish];
 }
 
 - (void) showKeyboard:(BOOL)show {
-    if (show)
-        [overlay_ addSubview:keyboard_];
+    CGSize keysize = [UIKeyboard defaultSize];
+    CGRect keydown = {{0, [overlay_ bounds].size.height}, keysize};
+    CGRect keyup = keydown;
+    keyup.origin.y -= keysize.height;
+
+    UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:keyboard_] autorelease];
+    [animation setSignificantRectFields:2];
+
+    if (show) {
+        [animation setStartFrame:keydown];
+        [animation setEndFrame:keyup];
+        [keyboard_ activate];
+    } else {
+        [animation setStartFrame:keyup];
+        [animation setEndFrame:keydown];
+        [keyboard_ deactivate];
+    }
+
+    [[UIAnimator sharedAnimator]
+        addAnimations:[NSArray arrayWithObjects:animation, nil]
+        withDuration:KeyboardTime_
+        start:YES
+    ];
+}
+
+- (void) slideUp:(UIAlertSheet *)alert {
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];
     else
-        [keyboard_ removeFromSuperview];
+        [alert presentSheetInView:overlay_];
 }
 
 @end
@@ -3991,28 +6056,46 @@ id Alloc_(id self, SEL selector) {
     return object;
 }*/
 
+/*IMP dealloc_;
+id Dealloc_(id self, SEL selector) {
+    id object = dealloc_(self, selector);
+    fprintf(stderr, "[%s]D-%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;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     bootstrap_ = argc > 1 && strcmp(argv[1], "--bootstrap") == 0;
 
+    Home_ = NSHomeDirectory();
+
+    {
+        NSString *plist = [Home_ stringByAppendingString:@"/Library/Preferences/com.apple.preferences.sounds.plist"];
+        if (NSDictionary *sounds = [NSDictionary dictionaryWithContentsOfFile:plist])
+            if (NSNumber *keyboard = [sounds objectForKey:@"keyboard"])
+                Sounds_Keyboard_ = [keyboard boolValue];
+    }
+
     setuid(0);
     setgid(0);
 
+    if (unlink("/var/cache/apt/pkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+    if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
+        _assert(errno == ENOENT);
+
     /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
     alloc_ = alloc->method_imp;
     alloc->method_imp = (IMP) &Alloc_;*/
 
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    /*Method dealloc = class_getClassMethod([NSObject class], @selector(dealloc));
+    dealloc_ = dealloc->method_imp;
+    dealloc->method_imp = (IMP) &Dealloc_;*/
 
     if (NSDictionary *sysver = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]) {
         if (NSString *prover = [sysver valueForKey:@"ProductVersion"]) {
-            Firmware_ = strdup([prover cString]);
+            Firmware_ = strdup([prover UTF8String]);
             NSArray *versions = [prover componentsSeparatedByString:@"."];
             int count = [versions count];
             Major_ = count > 0 ? [[versions objectAtIndex:0] intValue] : 0;
@@ -4042,15 +6125,55 @@ int main(int argc, char *argv[]) {
 
     if ((Metadata_ = [[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"]) == NULL)
         Metadata_ = [[NSMutableDictionary alloc] initWithCapacity:2];
-    else
+    else {
+        Settings_ = [Metadata_ objectForKey:@"Settings"];
+
         Packages_ = [Metadata_ objectForKey:@"Packages"];
+        Sections_ = [Metadata_ objectForKey:@"Sections"];
+        Sources_ = [Metadata_ objectForKey:@"Sources"];
+    }
+
+    if (Settings_ != nil)
+        Role_ = [Settings_ objectForKey:@"Role"];
+
+    if (Packages_ == nil) {
+        Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease];
+        [Metadata_ setObject:Packages_ forKey:@"Packages"];
+    }
+
+    if (Sections_ == nil) {
+        Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
+        [Metadata_ setObject:Sections_ forKey:@"Sections"];
+    }
+
+    if (Sources_ == nil) {
+        Sources_ = [[[NSMutableDictionary alloc] initWithCapacity:0] autorelease];
+        [Metadata_ setObject:Sources_ forKey:@"Sources"];
+    }
 
-    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]);
+    Locale_ = CFLocaleCopyCurrent();
+    space_ = CGColorSpaceCreateDeviceRGB();
+
+    Blue_.Set(space_, 0.2, 0.2, 1.0, 1.0);
+    Blueish_.Set(space_, 0x19/255.f, 0x32/255.f, 0x50/255.f, 1.0);
+    Black_.Set(space_, 0.0, 0.0, 0.0, 1.0);
+    Clear_.Set(space_, 0.0, 0.0, 0.0, 0.0);
+    Red_.Set(space_, 1.0, 0.0, 0.0, 1.0);
+    White_.Set(space_, 1.0, 1.0, 1.0, 1.0);
+    Gray_.Set(space_, 0.4, 0.4, 0.4, 1.0);
+
+    Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
+
+    SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease];
+
+    int value = UIApplicationMain(argc, argv, [Cydia class]);
+
+    CGColorSpaceRelease(space_);
+    CFRelease(Locale_);
+
     [pool release];
-    return 0;
+    return value;
 }