X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7600bd6927dd5e26b22dc2b5b797da9977b9294a..3319715bfdf0d11ca8448b64b5a5dc5bc6ece288:/Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index ea1db69c..b6496ed7 100644
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -61,6 +61,7 @@
 #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>
@@ -384,6 +385,11 @@ static const int PulseInterval_ = 50000;
 static const int ButtonBarHeight_ = 48;
 static const float KeyboardTime_ = 0.4f;
 
+#ifndef Cydia_
+#define Cydia_ ""
+#endif
+
+static CGColor Blueish_;
 static CGColor Black_;
 static CGColor Clear_;
 static CGColor Red_;
@@ -412,7 +418,7 @@ CGColorSpaceRef space_;
             bugfix <= BugFix_))
 
 bool bootstrap_;
-bool restart_;
+bool reload_;
 
 static NSMutableDictionary *Metadata_;
 static NSMutableDictionary *Packages_;
@@ -499,6 +505,7 @@ NSString *Simplify(NSString *title) {
 @end
 
 @protocol ConfigurationDelegate
+- (void) repairWithSelector:(SEL)selector;
 - (void) setConfigurationData:(NSString *)data;
 @end
 
@@ -602,6 +609,7 @@ class Progress :
 /* Database Interface {{{ */
 @interface Database : NSObject {
     pkgCacheFile cache_;
+    pkgDepCache::Policy *policy_;
     pkgRecords *records_;
     pkgProblemResolver *resolver_;
     pkgAcquire *fetcher_;
@@ -616,10 +624,12 @@ class Progress :
     Status status_;
     Progress progress_;
 
+    int cydiafd_;
     int statusfd_;
     FILE *input_;
 }
 
+- (void) _readCydia:(NSNumber *)fd;
 - (void) _readStatus:(NSNumber *)fd;
 - (void) _readOutput:(NSNumber *)fd;
 
@@ -629,12 +639,14 @@ class Progress :
 
 - (Database *) init;
 - (pkgCacheFile &) cache;
+- (pkgDepCache::Policy *) policy;
 - (pkgRecords *) records;
 - (pkgProblemResolver *) resolver;
 - (pkgAcquire &) fetcher;
 - (NSArray *) packages;
 - (void) reloadData;
 
+- (void) configure;
 - (void) prepare;
 - (void) perform;
 - (void) upgrade;
@@ -863,11 +875,12 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     NSString *tagline_;
     NSString *icon_;
     NSString *website_;
+    Address *author_;
 
     NSArray *relationships_;
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file;
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database;
 
 - (pkgCache::PkgIterator) iterator;
@@ -882,15 +895,24 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (NSString *) latest;
 - (NSString *) installed;
+
+- (BOOL) valid;
 - (BOOL) upgradable;
 - (BOOL) essential;
 - (BOOL) broken;
 
+- (BOOL) half;
+- (BOOL) halfConfigured;
+- (BOOL) halfInstalled;
+- (BOOL) hasMode;
+- (NSString *) mode;
+
 - (NSString *) id;
 - (NSString *) name;
 - (NSString *) tagline;
 - (NSString *) icon;
 - (NSString *) website;
+- (Address *) author;
 
 - (NSArray *) relationships;
 
@@ -930,6 +952,8 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
         [icon_ release];
     if (website_ != nil)
         [website_ release];
+    if (author_ != nil)
+        [author_ release];
 
     if (relationships_ != nil)
         [relationships_ release];
@@ -937,33 +961,48 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
-- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database version:(pkgCache::VerIterator)version file:(pkgCache::VerFileIterator)file {
+- (Package *) initWithIterator:(pkgCache::PkgIterator)iterator database:(Database *)database {
     if ((self = [super init]) != nil) {
         iterator_ = iterator;
         database_ = database;
 
-        version_ = version;
-        file_ = file;
-
-        latest_ = [[NSString stringWithUTF8String:version_.VerStr()] retain];
-        installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithUTF8String:iterator_.CurrentVer().VerStr()] retain];
+        version_ = [database_ policy]->GetCandidateVer(iterator_);
+        latest_ = version_.end() ? nil : [[NSString stringWithUTF8String:version_.VerStr()] retain];
 
-        pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
+        if (!version_.end())
+            file_ = version_.FileList();
+        else {
+            pkgCache &cache([database_ cache]);
+            file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+        }
 
-        const char *begin, *end;
-        parser->GetRec(begin, end);
+        pkgCache::VerIterator current = iterator_.CurrentVer();
+        installed_ = current.end() ? nil : [[NSString stringWithUTF8String:current.VerStr()] retain];
 
         id_ = [[[NSString stringWithUTF8String:iterator_.Name()] lowercaseString] retain];
-        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];
-        website_ = Scour("Website", begin, end);
-        if (website_ != nil)
-            website_ = [website_ 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];
+            website_ = Scour("Homepage", begin, end);
+            if (website_ == nil)
+                website_ = Scour("Website", begin, end);
+            if (website_ != nil)
+                website_ = [website_ retain];
+            NSString *author = Scour("Author", begin, end);
+            if (author != nil)
+                author_ = [Address addressWithString:author];
+        }
 
         NSMutableDictionary *metadata = [Packages_ objectForKey:id_];
         if (metadata == nil || [metadata count] == 0) {
@@ -978,15 +1017,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 + (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;
+    return [[[Package alloc]
+        initWithIterator:iterator 
+        database:database
+    ] autorelease];
 }
 
 - (pkgCache::PkgIterator) iterator {
@@ -999,15 +1033,19 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (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_->InstalledSize;
+    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()]);
 
@@ -1042,14 +1080,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return installed_;
 }
 
+- (BOOL) valid {
+    return !version_.end();
+}
+
 - (BOOL) upgradable {
     pkgCache::VerIterator current = iterator_.CurrentVer();
 
     if (current.end())
         return [self essential];
     else {
-        pkgDepCache::Policy policy;
-        pkgCache::VerIterator candidate = policy.GetCandidateVer(iterator_);
+        pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
         return !candidate.end() && candidate != current;
     }
 }
@@ -1059,7 +1100,61 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (BOOL) broken {
-    return (*[database_ cache])[iterator_].InstBroken();
+    return [database_ cache][iterator_].InstBroken();
+}
+
+- (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 {
@@ -1082,13 +1177,17 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return website_;
 }
 
+- (Address *) author {
+    return author_;
+}
+
 - (NSArray *) relationships {
     return relationships_;
 }
 
 - (Source *) source {
     if (!cached_) {
-        source_ = [[database_ getSource:file_.File()] retain];
+        source_ = file_.end() ? nil : [[database_ getSource:file_.File()] retain];
         cached_ = true;
     }
 
@@ -1209,15 +1308,21 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (NSNumber *) isSearchedForBy:(NSString *)search {
-    return [NSNumber numberWithBool:[self matches:search]];
+    return [NSNumber numberWithBool:([self valid] && [self matches:search])];
 }
 
 - (NSNumber *) isInstalledInSection:(NSString *)section {
     return [NSNumber numberWithBool:([self installed] != nil && (section == nil || [section isEqualToString:[self section]]))];
 }
 
-- (NSNumber *) isUninstalledInSection:(NSString *)section {
-    return [NSNumber numberWithBool:([self installed] == nil && (section == nil || [section isEqualToString:[self section]]))];
+- (NSNumber *) isUninstalledInSection:(NSString *)name {
+    NSString *section = [self section];
+
+    return [NSNumber numberWithBool:([self valid] && [self installed] == nil && (
+        (name == nil ||
+        section == nil && [name length] == 0 ||
+        [name isEqualToString:section])
+    ))];
 }
 
 @end
@@ -1278,44 +1383,58 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     [super dealloc];
 }
 
-- (void) _readStatus:(NSNumber *)fd {
+- (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;
 
-    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());
-        fprintf(stderr, "%s\n", data);
+        //size_t size = line.size();
+        fprintf(stderr, "C:%s\n", data);
+    }
 
-        _assert(pcre_exec(code, study, data, line.size(), 0, 0, matches, sizeof(matches) / sizeof(matches[0])) >= 0);
+    [pool release];
+    _assert(false);
+}
+
+- (void) _readStatus:(NSNumber *)fd {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-        std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
-        float percent;
-        buffer >> percent;
-        [delegate_ setProgressPercent:(percent / 100)];
+    __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+    std::istream is(&ib);
+    std::string line;
 
-        NSString *string = [NSString stringWithUTF8Bytes:(data + matches[8]) length:(matches[9] - matches[8])];
+    Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+    Pcre pmstatus_r("^([^:]*):([^:]*):([^:]*):(.*)$");
 
-        std::string type(line.substr(matches[2], matches[3] - matches[2]));
+    while (std::getline(is, line)) {
+        const char *data(line.c_str());
+        size_t size = line.size();
+        fprintf(stderr, "S:%s\n", data);
 
-        if (type == "pmerror")
-            [delegate_ setProgressError:string];
-        else if (type == "pmstatus")
+        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 (type == "pmconffile")
-            [delegate_ setConfigurationData:string];
-        else _assert(false);
+        } else if (pmstatus_r(data, size)) {
+            float percent([pmstatus_r[3] floatValue]);
+            [delegate_ setProgressPercent:(percent / 100)];
+
+            NSString *string = pmstatus_r[4];
+            std::string type([pmstatus_r[1] UTF8String]);
+
+            if (type == "pmerror")
+                [delegate_ setProgressError:string];
+            else if (type == "pmstatus")
+                [delegate_ setProgressTitle:string];
+            else if (type == "pmconffile")
+                [delegate_ setConfigurationData:string];
+            else _assert(false);
+        } else _assert(false);
     }
 
     [pool release];
@@ -1329,8 +1448,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     std::istream is(&ib);
     std::string line;
 
-    while (std::getline(is, 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);
@@ -1341,12 +1462,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (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;
@@ -1357,6 +1481,18 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
         int fds[2];
 
+        _assert(pipe(fds) != -1);
+        cydiafd_ = fds[1];
+
+        _config->Set("APT::Keep-Fds::", cydiafd_);
+        setenv("CYDIA", [[[[NSNumber numberWithInt:cydiafd_] stringValue] stringByAppendingString:@" 0"] UTF8String], _not(int));
+
+        [NSThread
+            detachNewThreadSelector:@selector(_readCydia:)
+            toTarget:self
+            withObject:[[NSNumber numberWithInt:fds[0]] retain]
+        ];
+
         _assert(pipe(fds) != -1);
         statusfd_ = fds[1];
 
@@ -1388,6 +1524,10 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     return cache_;
 }
 
+- (pkgDepCache::Policy *) policy {
+    return policy_;
+}
+
 - (pkgRecords *) records {
     return records_;
 }
@@ -1406,36 +1546,45 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 
 - (void) reloadData {
     _error->Discard();
+
     delete list_;
+    list_ = NULL;
     manager_ = NULL;
     delete lock_;
+    lock_ = NULL;
     delete fetcher_;
+    fetcher_ = NULL;
     delete resolver_;
+    resolver_ = NULL;
     delete records_;
-    cache_.Close();
+    records_ = NULL;
+    delete policy_;
+    policy_ = NULL;
 
-    _forever {
-        if (cache_.Open(progress_, true))
-            break;
+    cache_.Close();
 
+    if (!cache_.Open(progress_, true)) {
         std::string error;
         if (!_error->PopMessage(error))
             _assert(false);
-        else do {
-            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. ")
-                // XXX: I hate my life
-                system("dpkg --configure -a");
-            else if (error == "The package lists or status file could not be parsed or opened.")
-                // XXX: does this actually help anyone?
-                [self updateWithStatus:status_];
-            //else if (error == "The list of sources could not be read.")
-            else _assert(false);
-        } while (_error->PopMessage(error));
+        _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_);
@@ -1444,6 +1593,15 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
     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();
@@ -1454,17 +1612,46 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
             ];
     }
 
-    pkgDepCache::Policy policy;
-
     [packages_ removeAllObjects];
     for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
-        if (!policy.GetCandidateVer(iterator).end())
-            if (Package *package = [Package packageWithIterator:iterator database:self])
-                [packages_ addObject:package];
+        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_);
 
@@ -1514,15 +1701,6 @@ NSString *Scour(const char *field, const char *begin, const char *end) {
 }
 
 - (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_));
 }
 
@@ -1651,8 +1829,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:
+                [delegate_ confirm];
+                break;
+            case 2:
+                [self cancel];
+                break;
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"unable"])
+        [self cancel];
+
+    [sheet dismiss];
 }
 
 - (int) numberOfGroupsInPreferencesTable:(UIPreferencesTable *)table {
@@ -1744,7 +1937,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];
@@ -1787,16 +1981,30 @@ void AddTextView(NSMutableDictionary *fields, NSMutableArray *packages, NSString
 
         if (!remove)
             essential_ = nil;
-        else {
+        else if (Advanced_ || true) {
+            essential_ = [[UIAlertSheet alloc]
+                initWithTitle:@"Remove Essential?"
+                buttons:[NSArray arrayWithObjects:
+                    @"Yes (Force Removal)",
+                    @"No (Safe, Recommended)",
+                nil]
+                defaultButtonIndex:1
+                delegate:self
+                context:@"remove"
+            ];
+
+            [essential_ setDestructiveButton:[[essential_ buttons] objectAtIndex:0]];
+            [essential_ setBodyText:@"This operation requires the removal of one or more packages that are required for the continued operation of either Cydia or the iPhoneOS. If you continue you will almost certainly break something past Cydia's ability to fix it. Are you absolutely certain you wish to continue?"];
+        } else {
             essential_ = [[UIAlertSheet alloc]
                 initWithTitle:@"Unable to Comply"
                 buttons:[NSArray arrayWithObjects:@"Okay", nil]
                 defaultButtonIndex:0
                 delegate:self
-                context:@"remove"
+                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 the iPhoneOS. In order to continue and force this operation you will need to be activate the Advanced mode undder to continue and force this operation you will need to be activate the Advanced mode under Settings."];
         }
 
         AddTextView(fields_, installing, @"Installing");
@@ -2021,14 +2229,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             case 1:
                 fprintf(input, "N\n");
                 fflush(input);
-            break;
-
+                break;
             case 2:
                 fprintf(input, "Y\n");
                 fflush(input);
-            break;
-
-            default: _assert(false);
+                break;
+            default:
+                _assert(false);
         }
     }
 
@@ -2052,9 +2259,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (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];
+    UINavigationItem *item = [navbar_ topItem];
+    [item setTitle:title];
 
     [status_ setText:nil];
     [output_ setText:@""];
@@ -2073,6 +2279,15 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     ];
 }
 
+- (void) repairWithSelector:(SEL)selector {
+    [self
+        detachNewThreadSelector:selector
+        toTarget:database_
+        withObject:nil
+        title:@"Repairing..."
+    ];
+}
+
 - (void) setConfigurationData:(NSString *)data {
     [self
         performSelectorOnMainThread:@selector(_setConfigurationData:)
@@ -2175,7 +2390,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UITextLabel *name_;
     UITextLabel *description_;
     UITextLabel *source_;
-    UIImageView *trusted_;
+    //UIImageView *trusted_;
+    UIImageView *badge_;
+    UITextLabel *status_;
 }
 
 - (PackageCell *) init;
@@ -2186,6 +2403,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
 - (void) _setSelectionFadeFraction:(float)fraction;
 
++ (int) heightForPackage:(Package *)package;
+
 @end
 
 @implementation PackageCell
@@ -2195,7 +2414,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [name_ release];
     [description_ release];
     [source_ release];
-    [trusted_ release];
+    [badge_ release];
+    [status_ release];
+    //[trusted_ release];
     [super dealloc];
 }
 
@@ -2219,13 +2440,21 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [description_ setBackgroundColor:Clear_];
         [description_ setFont:small];
 
-        trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
-        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];
+        /*trusted_ = [[UIImageView alloc] initWithFrame:CGRectMake(30, 30, 16, 16)];
+        [trusted_ setImage:[UIImage applicationImageNamed:@"trusted.png"]];*/
+
+        badge_ = [[UIImageView alloc] initWithFrame:CGRectMake(17, 70, 16, 16)];
+
+        status_ = [[UITextLabel alloc] initWithFrame:CGRectMake(48, 68, 280, 20)];
+        [status_ setBackgroundColor:Clear_];
+        [status_ setFont:small];
 
         [self addSubview:icon_];
         [self addSubview:name_];
         [self addSubview:description_];
         [self addSubview:source_];
+        [self addSubview:badge_];
+        [self addSubview:status_];
 
         CFRelease(small);
         CFRelease(large);
@@ -2276,10 +2505,21 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     [source_ setText:from];
 
-    if (trusted)
-        [self addSubview:trusted_];
-    else
-        [trusted_ removeFromSuperview];
+    if (NSString *mode = [package mode]) {
+        [badge_ setImage:[UIImage applicationImageNamed:
+            [mode isEqualToString:@"Remove"] || [mode isEqualToString:@"Purge"] ? @"removing.png" : @"installing.png"
+        ]];
+
+        [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];
+    }
 }
 
 - (void) _setSelected:(float)fraction {
@@ -2316,6 +2556,13 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     [super _setSelectionFadeFraction:fraction];
 }
 
++ (int) heightForPackage:(Package *)package {
+    if ([package hasMode] || [package half])
+        return 96;
+    else
+        return 73;
+}
+
 @end
 /* }}} */
 /* Section Cell {{{ */
@@ -2500,16 +2747,18 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         package_ = [package retain];
         name_ = [[package id] retain];
 
-        NSString *list = [NSString
-            stringWithContentsOfFile:[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.list", name_]
-            encoding:kCFStringEncodingUTF8
-            error:NULL
-        ];
+        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 (list != nil) {
-            [files_ addObjectsFromArray:[list componentsSeparatedByString:@"\n"]];
-            [files_ removeLastObject];
-            [files_ removeObjectAtIndex:0];
+        if ([files_ count] != 0) {
+            if ([[files_ objectAtIndex:0] isEqualToString:@"/."])
+                [files_ removeObjectAtIndex:0];
             [files_ sortUsingSelector:@selector(compareByPath:)];
 
             NSMutableArray *stack = [NSMutableArray arrayWithCapacity:8];
@@ -2562,6 +2811,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     Package *package_;
     NSString *name_;
     UITextView *description_;
+    NSMutableArray *buttons_;
 }
 
 - (id) initWithBook:(RVBook *)book database:(Database *)database;
@@ -2582,6 +2832,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     if (description_ != nil)
         [description_ release];
     [table_ release];
+    [buttons_ release];
     [super dealloc];
 }
 
@@ -2607,7 +2858,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (float) preferencesTable:(UIPreferencesTable *)table heightForRow:(int)row inGroup:(int)group withProposedHeight:(float)proposed {
-    if (group != 0 || row != 1)
+    if (description_ == nil || group != 0 || row != 1)
         return proposed;
     else
         return [description_ visibleTextRect].size.height + TextViewOffset_;
@@ -2615,7 +2866,11 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (int) preferencesTable:(UIPreferencesTable *)table numberOfRowsInGroup:(int)group {
     if (group-- == 0) {
-        int number = 2;
+        int number = 1;
+        if ([package_ author] != nil)
+            ++number;
+        if (description_ != nil)
+            ++number;
         if ([package_ website] != nil)
             ++number;
         if ([[package_ source] trusted])
@@ -2624,16 +2879,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     } else if ([package_ installed] != nil && group-- == 0)
         return 2;
     else if (group-- == 0) {
-        int number = 4;
+        int number = 2;
+        if ([package_ size] != 0)
+            ++number;
+        if ([package_ maintainer] != nil)
+            ++number;
         if ([package_ relationships] != nil)
             ++number;
         return number;
     } else if ([package_ source] != nil && group-- == 0) {
         Source *source = [package_ source];
         NSString *description = [source description];
-        int number = 2;
+        int number = 1;
         if (description != nil && ![description isEqualToString:[source label]])
             ++number;
+        if ([source origin] != nil)
+            ++number;
         return number;
     } else _assert(false);
 }
@@ -2646,7 +2907,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         if (row-- == 0) {
             [cell setTitle:[package_ name]];
             [cell setValue:[package_ latest]];
-        } else if (row-- == 0) {
+        } else if ([package_ author] != nil && row-- == 0) {
+            [cell setTitle:@"Author"];
+            [cell setValue:[[package_ author] name]];
+            [cell setShowDisclosure:YES];
+            [cell setShowSelection:YES];
+        } else if (description_ != nil && row-- == 0) {
             [cell addSubview:description_];
         } else if ([package_ website] != nil && row-- == 0) {
             [cell setTitle:@"More Information"];
@@ -2674,10 +2940,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
             [cell setTitle:@"Section"];
             NSString *section([package_ section]);
             [cell setValue:(section == nil ? @"n/a" : section)];
-        } else if (row-- == 0) {
+        } else if ([package_ size] != 0 && row-- == 0) {
             [cell setTitle:@"Expanded Size"];
             [cell setValue:SizeString([package_ size])];
-        } else if (row-- == 0) {
+        } else if ([package_ maintainer] != nil && row-- == 0) {
             [cell setTitle:@"Maintainer"];
             [cell setValue:[[package_ maintainer] name]];
             [cell setShowDisclosure:YES];
@@ -2692,11 +2958,14 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         NSString *description = [source description];
 
         if (row-- == 0) {
-            [cell setTitle:[source label]];
+            NSString *label = [source label];
+            if (label == nil)
+                label = [source uri];
+            [cell setTitle:label];
             [cell setValue:[source version]];
         } else if (description != nil && ![description isEqualToString:[source label]] && row-- == 0) {
             [cell setValue:description];
-        } else if (row-- == 0) {
+        } else if ([source origin] != nil && row-- == 0) {
             [cell setTitle:@"Origin"];
             [cell setValue:[source origin]];
         } else _assert(false);
@@ -2709,22 +2978,27 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     return YES;
 }
 
+// XXX: this is now unmaintainable
 - (void) tableRowSelected:(NSNotification *)notification {
     int row = [table_ selectedRow];
     NSString *website = [package_ website];
+    Address *author = [package_ author];
     BOOL trusted = [[package_ source] trusted];
     NSString *installed = [package_ installed];
+    Address *maintainer = [package_ maintainer];
 
-    if (row == 7
+    if (maintainer != nil && row == 7
+        + (author == nil ? 0 : 1)
         + (website == nil ? 0 : 1)
         + (trusted ? 1 : 0)
         + (installed == nil ? 0 : 3)
-    )
+    ) {
         [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
-            [[package_ maintainer] email],
+            [maintainer email],
             [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
         ]]];
-    else if (installed && row == 5
+    } else if (installed && row == 5
+        + (author == nil ? 0 : 1)
         + (website == nil ? 0 : 1)
         + (trusted ? 1 : 0)
     ) {
@@ -2732,7 +3006,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         [files setDelegate:delegate_];
         [files setPackage:package_];
         [book_ pushPage:files];
-    } else if (website != nil && row == 3) {
+    } else if (author != nil && row == 2) {
+        [delegate_ openURL:[NSURL URLWithString:[NSString stringWithFormat:@"mailto:%@?subject=%@",
+            [author email],
+            [[NSString stringWithFormat:@"regarding apt package \"%@\"", [package_ name]] stringByAddingPercentEscapes]
+        ]]];
+    } else if (website != nil && row == (author == nil ? 3 : 4)) {
         NSURL *url = [NSURL URLWithString:website];
         BrowserView *browser = [[[BrowserView alloc] initWithBook:book_ database:database_] autorelease];
         [browser setDelegate:delegate_];
@@ -2741,31 +3020,42 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     }
 }
 
+- (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);
+}
+
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
-    switch (button) {
-        case 1: [delegate_ installPackage:package_]; break;
-        case 2: [delegate_ removePackage:package_]; break;
-    }
+    int count = [buttons_ count];
+    _assert(count != 0);
+    _assert(button <= count + 1);
+
+    if (count != button - 1)
+        [self _clickButtonWithName:[buttons_ objectAtIndex:(button - 1)]];
 
     [sheet dismiss];
 }
 
 - (void) _rightButtonClicked {
-    if ([package_ installed] == nil)
-        [delegate_ installPackage:package_];
-    else {
-        NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:6];
+    int count = [buttons_ count];
+    _assert(count != 0);
 
-        if ([package_ upgradable])
-            [buttons addObject:@"Upgrade"];
-        else
-            [buttons addObject:@"Reinstall"];
-
-        [buttons addObject:@"Remove"];
+    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:@"Manage Package"
+            initWithTitle:nil
             buttons:buttons
             defaultButtonIndex:2
             delegate:self
@@ -2775,8 +3065,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (NSString *) rightButtonTitle {
-    _assert(package_ != nil);
-    return [package_ installed] == nil ? @"Install" : @"Modify";
+    int count = [buttons_ count];
+    return count == 0 ? nil : count != 1 ? @"Modify" : [buttons_ objectAtIndex:0];
 }
 
 - (NSString *) title {
@@ -2792,6 +3082,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         [table_ setDataSource:self];
         [table_ setDelegate:self];
+
+        buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
     } return self;
 }
 
@@ -2811,6 +3103,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         description_ = nil;
     }
 
+    [buttons_ removeAllObjects];
+
     if (package != nil) {
         package_ = [package retain];
         name_ = [[package id] retain];
@@ -2818,11 +3112,22 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         NSString *description([package description]);
         if (description == nil)
             description = [package tagline];
-        description_ = [GetTextView(description, 12, true) retain];
-
-        [description_ setTextColor:Black_];
+        if (description != nil) {
+            description_ = [GetTextView(description, 12, true) retain];
+            [description_ setTextColor:Black_];
+        }
 
         [table_ reloadData];
+
+        if ([package_ source] == nil);
+        else if ([package_ installed] == nil)
+            [buttons_ addObject:@"Install"];
+        else if ([package_ upgradable])
+            [buttons_ addObject:@"Upgrade"];
+        else
+            [buttons_ addObject:@"Reinstall"];
+        if ([package_ installed] != nil)
+            [buttons_ addObject:@"Remove"];
     }
 }
 
@@ -2893,7 +3198,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
@@ -3367,14 +3672,23 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         return;
 
     Section *section;
+    NSString *name;
     NSString *title;
 
     if (row == 0) {
         section = nil;
+        name = nil;
         title = @"All Packages";
     } else {
         section = [sections_ objectAtIndex:(row - 1)];
-        title = [section name];
+        name = [section name];
+
+        if (name != nil)
+            title = name;
+        else {
+            name = @"";
+            title = @"(No Section)";
+        }
     }
 
     PackageTable *table = [[[PackageTable alloc]
@@ -3382,7 +3696,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
         database:database_
         title:title
         filter:@selector(isUninstalledInSection:)
-        with:(section == nil ? nil : [section name])
+        with:name
     ] autorelease];
 
     [table setDelegate:delegate_];
@@ -3424,7 +3738,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     for (size_t i(0); i != [packages count]; ++i) {
         Package *package([packages objectAtIndex:i]);
-        if ([package installed] == nil)
+        if ([package valid] && [package installed] == nil)
             [packages_ addObject:package];
     }
 
@@ -3507,7 +3821,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (float) table:(UITable *)table heightForRow:(int)row {
-    return 73;
+    return [PackageCell heightForPackage:[packages_ objectAtIndex:row]];
 }
 
 - (UITableCell *) table:(UITable *)table cellForRow:(int)row column:(UITableColumn *)col reusing:(UITableCell *)reusing {
@@ -3579,7 +3893,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     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 upgradable])
             [packages_ addObject:package];
     }
 
@@ -4011,7 +4325,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
         prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
 
-        [prompt_ setColor:(Advanced_ ? White_ : Black_)];
+        [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
         [prompt_ setBackgroundColor:Clear_];
         [prompt_ setFont:font];
 
@@ -4107,7 +4421,9 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     UIButtonBar *buttonbar_;
 
     ConfirmationView *confirm_;
+
     NSMutableArray *essential_;
+    NSMutableArray *broken_;
 
     Database *database_;
     ProgressView *progress_;
@@ -4126,6 +4442,39 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 @implementation Cydia
 
+- (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];
+
+        [sheet setBodyText:@"When the shell scripts associated with packages fail, they are left in a 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];
+
+        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 packages are not upgraded you are likely to encounter errors."];
+        [sheet popupAlertAnimated:YES];
+    }
+}
+
 - (void) _reloadData {
     /*UIProgressHUD *hud = [[UIProgressHUD alloc] initWithWindow:window_];
     [hud setText:@"Reloading Data"];
@@ -4140,11 +4489,15 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     }
 
     size_t changes(0);
+
     [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 upgradable]) {
             if ([package essential])
                 [essential_ addObject:package];
@@ -4182,21 +4535,12 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
     [book_ reloadData];
 
-    if (!Loaded_)
+    if ([packages count] == 0);
+    else if (Loaded_)
+        [self _loaded];
+    else {
         Loaded_ = YES;
-    else if (!Ignored_ && [essential_ count] != 0) {
-        int count = [essential_ count];
-
-        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 packages are not upgraded you are likely to encounter errors."];
-        [sheet popupAlertAnimated:YES];
+        [book_ update];
     }
 
     /*[hud show:NO];
@@ -4281,7 +4625,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) confirm {
     [overlay_ removeFromSuperview];
-    restart_ = true;
+    reload_ = true;
 
     [progress_
         detachNewThreadSelector:@selector(perform)
@@ -4322,7 +4666,35 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 
 - (void) alertSheet:(UIAlertSheet *)sheet buttonClicked:(int)button {
     NSString *context = [sheet context];
-    if ([context isEqualToString:@"upgrade"])
+    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;
+
+            case 2:
+                [broken_ removeAllObjects];
+                [self _loaded];
+            break;
+
+            default:
+                _assert(false);
+        }
+    else if ([context isEqualToString:@"upgrade"])
         switch (button) {
             case 1:
                 @synchronized (self) {
@@ -4340,7 +4712,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
                 Ignored_ = YES;
             break;
 
-            default: _assert(false);
+            default:
+                _assert(false);
         }
 
     [sheet dismiss];
@@ -4383,11 +4756,16 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 - (void) applicationWillSuspend {
     [super 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_) {
+        pid_t pid = ExecFork();
+        if (pid == 0) {
+            sleep(1);
+            execlp("launchctl", "launchctl", "stop", "com.apple.SpringBoard", NULL);
+            exit(0);
+        }
+    }
 }
 
 - (void) applicationDidFinishLaunching:(id)unused {
@@ -4398,6 +4776,7 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     tag_ = 1;
 
     essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+    broken_ = [[NSMutableArray alloc] initWithCapacity:4];
 
     CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
     window_ = [[UIWindow alloc] initWithContentRect:screenrect];
@@ -4516,10 +4895,8 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
     manage_ = [[ManageView alloc] initWithBook:book_ database:database_];
     search_ = [[SearchView alloc] initWithBook:book_ database:database_];
 
-    [self reloadData];
-    [book_ update];
-
     [progress_ resetView];
+    [self reloadData];
 
     if (bootstrap_)
         [self bootstrap];
@@ -4554,7 +4931,10 @@ Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
 }
 
 - (void) slideUp:(UIAlertSheet *)alert {
-    [alert presentSheetFromButtonBar:buttonbar_];
+    if (Advanced_)
+        [alert presentSheetFromButtonBar:buttonbar_];
+    else
+        [alert presentSheetInView:overlay_];
 }
 
 @end
@@ -4674,12 +5054,12 @@ int main(int argc, char *argv[]) {
     else
         Packages_ = [Metadata_ objectForKey:@"Packages"];
 
-    setenv("CYDIA", "", _not(int));
     if (access("/User", F_OK) != 0)
         system("/usr/libexec/cydia/firmware.sh");
 
     space_ = CGColorSpaceCreateDeviceRGB();
 
+    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);