#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>
#include <pcre.h>
/* }}} */
-/* Miscellaneous Messages {{{ */
-@interface NSString (Cydia)
-- (NSString *) stringByAddingPercentEscapes;
-- (NSString *) stringByReplacingCharacter:(unsigned short)arg0 withCharacter:(unsigned short)arg1;
-@end
-/* }}} */
/* iPhoneOS 2.0 Compatibility {{{ */
#ifdef __OBJC2__
@interface UICGColor : NSObject {
#endif
/* }}} */
+@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 {
private:
}
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) {
name_ = [email_r[1] retain];
email_ = [email_r[2] retain];
} else {
- name_ = [[NSString stringWithCString:data length:size] retain];
+ name_ = [[NSString alloc]
+ initWithBytes:data
+ length:size
+ encoding:kCFStringEncodingUTF8
+ ];
+
email_ = nil;
}
} return self;
/* Random Global Variables {{{ */
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_;
static NSString *Home_;
static BOOL Sounds_Keyboard_;
+static BOOL Advanced_;
+static BOOL Loaded_;
+static BOOL Ignored_;
+
const char *Firmware_ = NULL;
const char *Machine_ = NULL;
const char *SerialNumber_ = NULL;
bugfix <= BugFix_))
bool bootstrap_;
-bool restart_;
+bool reload_;
static NSMutableDictionary *Metadata_;
static NSMutableDictionary *Packages_;
- (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;
}
virtual void Fetch(pkgAcquire::ItemDesc &item) {
- [delegate_ setProgressTitle:[NSString stringWithCString:("Downloading " + item.ShortDesc).c_str()]];
+ [delegate_ setProgressTitle:[NSString stringWithUTF8String:("Downloading " + item.ShortDesc).c_str()]];
}
virtual void Done(pkgAcquire::ItemDesc &item) {
)
return;
- [delegate_ setProgressError:[NSString stringWithCString:item.Owner->ErrorText.c_str()]];
+ [delegate_ setProgressError:[NSString stringWithUTF8String:item.Owner->ErrorText.c_str()]];
}
virtual bool Pulse(pkgAcquire *Owner) {
protected:
virtual void Update() {
- [delegate_ setProgressTitle:[NSString stringWithCString:Op.c_str()]];
+ [delegate_ setProgressTitle:[NSString stringWithUTF8String:Op.c_str()]];
[delegate_ setProgressPercent:(Percent / 100)];
}
/* Database Interface {{{ */
@interface Database : NSObject {
pkgCacheFile cache_;
+ pkgDepCache::Policy *policy_;
pkgRecords *records_;
pkgProblemResolver *resolver_;
pkgAcquire *fetcher_;
NSMutableDictionary *sources_;
NSMutableArray *packages_;
- _transient id delegate_;
+ _transient id<ConfigurationDelegate, ProgressDelegate> delegate_;
Status status_;
Progress progress_;
+
+ int cydiafd_;
int statusfd_;
+ FILE *input_;
}
+- (void) _readCydia:(NSNumber *)fd;
- (void) _readStatus:(NSNumber *)fd;
- (void) _readOutput:(NSNumber *)fd;
+- (FILE *) input;
+
- (Package *) packageWithName:(NSString *)name;
- (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;
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];
+ uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
+ distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
+ type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
description_ = nil;
label_ = nil;
value = value.substr(1);
if (name == "Default-Icon")
- defaultIcon_ = [[NSString stringWithCString:value.c_str()] retain];
+ defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];
else if (name == "Description")
- description_ = [[NSString stringWithCString:value.c_str()] retain];
+ description_ = [[NSString stringWithUTF8String:value.c_str()] retain];
else if (name == "Label")
- label_ = [[NSString stringWithCString:value.c_str()] retain];
+ label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
else if (name == "Origin")
- origin_ = [[NSString stringWithCString:value.c_str()] retain];
+ origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
else if (name == "Version")
- version_ = [[NSString stringWithCString:value.c_str()] retain];
+ version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
}
}
} return self;
return defaultIcon_;
}
+@end
+/* }}} */
+/* Relationship Class {{{ */
+@interface Relationship : NSObject {
+ NSString *type_;
+ NSString *id_;
+}
+
+- (NSString *) type;
+- (NSString *) id;
+- (NSString *) name;
+
+@end
+
+@implementation Relationship
+
+- (void) dealloc {
+ [type_ release];
+ [id_ release];
+ [super dealloc];
+}
+
+- (NSString *) type {
+ return type_;
+}
+
+- (NSString *) id {
+ return id_;
+}
+
+- (NSString *) name {
+ _assert(false);
+ return nil;
+}
+
@end
/* }}} */
/* Package Class {{{ */
const char *line = std::find(value, end, '\n');
while (line != value && line[-1] == ' ')
--line;
- return [NSString stringWithCString:value length:(line - value)];
+
+ return [NSString stringWithUTF8Bytes:value length:(line - value)];
} else {
begin = std::find(begin, end, '\n');
if (begin == 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;
+
- (NSString *) section;
- (Address *) maintainer;
- (size_t) size;
- (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;
- (Source *) source;
[icon_ release];
if (website_ != nil)
[website_ release];
+ if (author_ != nil)
+ [author_ release];
+
+ if (relationships_ != nil)
+ [relationships_ release];
[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;
+ version_ = [database_ policy]->GetCandidateVer(iterator_);
+ latest_ = version_.end() ? nil : [[NSString stringWithUTF8String:version_.VerStr()] retain];
- latest_ = [[NSString stringWithCString:version_.VerStr()] retain];
- installed_ = iterator_.CurrentVer().end() ? nil : [[NSString stringWithCString:iterator_.CurrentVer().VerStr()] retain];
-
- pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
-
- const char *begin, *end;
- parser->GetRec(begin, end);
+ if (!version_.end())
+ file_ = version_.FileList();
+ else {
+ pkgCache &cache([database_ cache]);
+ file_ = pkgCache::VerFileIterator(cache, cache.VerFileP);
+ }
- 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];
+ pkgCache::VerIterator current = iterator_.CurrentVer();
+ installed_ = current.end() ? nil : [[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];
+ 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) {
}
+ (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 {
+ return iterator_;
}
- (NSString *) section {
const char *section = iterator_.Section();
- return section == NULL ? nil : [[NSString stringWithCString:section] stringByReplacingCharacter:'_' withCharacter:' '];
+ return section == NULL ? nil : [[NSString stringWithUTF8String:section] stringByReplacingCharacter:'_' withCharacter:' '];
}
- (Address *) maintainer {
+ if (file_.end())
+ return nil;
pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
- return [Address addressWithString:[NSString stringWithCString:parser->Maintainer().c_str()]];
+ 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 stringWithCString:parser->LongDesc().c_str()]);
+ NSString *description([NSString stringWithUTF8String:parser->LongDesc().c_str()]);
NSArray *lines = [description componentsSeparatedByString:@"\n"];
NSMutableArray *trimmed = [NSMutableArray arrayWithCapacity:([lines count] - 1)];
return installed_;
}
+- (BOOL) valid {
+ return !version_.end();
+}
+
- (BOOL) upgradable {
- if (NSString *installed = [self installed])
- return [[self latest] compare:installed] != NSOrderedSame ? YES : NO;
- else
+ pkgCache::VerIterator current = iterator_.CurrentVer();
+
+ if (current.end())
return [self essential];
+ else {
+ pkgCache::VerIterator candidate = [database_ policy]->GetCandidateVer(iterator_);
+ return !candidate.end() && candidate != current;
+ }
}
- (BOOL) essential {
}
- (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 {
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;
}
}
- (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
[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());
+ //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);
+}
- std::istringstream buffer(line.substr(matches[6], matches[7] - matches[6]));
- float percent;
- buffer >> percent;
- [delegate_ setProgressPercent:(percent / 100)];
+- (void) _readStatus:(NSNumber *)fd {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSString *string = [NSString stringWithCString:(data + matches[8]) length:(matches[9] - matches[8])];
- std::string type(line.substr(matches[2], matches[3] - matches[2]));
+ __gnu_cxx::stdio_filebuf<char> ib([fd intValue], std::ios::in);
+ std::istream is(&ib);
+ std::string line;
- if (type == "pmerror")
- [delegate_ setProgressError:string];
- else if (type == "pmstatus")
+ Pcre conffile_r("^status: [^ ]* : conffile-prompt : (.*?) *$");
+ 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 (type == "pmconffile")
- ;
- 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];
std::istream is(&ib);
std::string line;
- while (std::getline(is, line))
- [delegate_ addProgressOutput:[NSString stringWithCString:line.c_str()]];
+ 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;
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];
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);
return cache_;
}
+- (pkgDepCache::Policy *) policy {
+ return policy_;
+}
+
- (pkgRecords *) records {
return records_;
}
- (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)) {
- fprintf(stderr, "repairing corrupted database...\n");
+ std::string error;
+ if (!_error->PopMessage(error))
+ _assert(false);
_error->Discard();
- [self updateWithStatus:status_];
- _assert(cache_.Open(progress_, true));
+ 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_);
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();
[packages_ removeAllObjects];
for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
if (Package *package = [Package packageWithIterator:iterator database:self])
- if ([package source] != nil || [package installed] != nil)
- [packages_ addObject:package];
+ [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_);
}
- (void) upgrade {
- _assert(cache_->DelCount() == 0 && cache_->InstCount() == 0);
- _assert(pkgApplyStatus(cache_));
-
- if (cache_->BrokenCount() != 0) {
- _assert(pkgFixBroken(cache_));
- _assert(cache_->BrokenCount() == 0);
- _assert(pkgMinimizeUpgrade(cache_));
- }
-
_assert(pkgDistUpgrade(cache_));
}
}
- (void) 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 {
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];
bool remove(false);
pkgCacheFile &cache([database_ cache]);
- for (pkgCache::PkgIterator iterator = cache->PkgBegin(); !iterator.end(); ++iterator) {
- Package *package([Package packageWithIterator:iterator database:database_]);
- NSString *name([package 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]);
+ NSString *name([package name]);
+
if (state.NewInstall())
[installing addObject:name];
else if (!state.Delete() && (state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall)
else if (state.Downgrade())
[downgrading addObject:name];
else if (state.Delete()) {
- if (essential)
+ if ([package essential])
remove = true;
[removing addObject:name];
}
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: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 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");
@end
/* }}} */
/* Progress View {{{ */
+Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$");
+
@interface ProgressView : UIView <
+ ConfigurationDelegate,
ProgressDelegate
> {
+ _transient Database *database_;
UIView *view_;
UIView *background_;
UITransitionView *transition_;
- (void) transitionViewDidComplete:(UITransitionView*)view fromView:(UIView*)from toView:(UIView*)to;
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate;
+- (id) initWithFrame:(struct CGRect)frame database:(Database *)database delegate:(id)delegate;
- (void) setContentView:(UIView *)view;
- (void) resetView;
exit(0);
}
-- (ProgressView *) initWithFrame:(struct CGRect)frame delegate:(id)delegate {
+- (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]];
}
- (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];
}
}
- (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:@""];
];
}
+- (void) repairWithSelector:(SEL)selector {
+ [self
+ detachNewThreadSelector:selector
+ toTarget:database_
+ withObject:nil
+ title:@"Repairing..."
+ ];
+}
+
+- (void) setConfigurationData:(NSString *)data {
+ [self
+ performSelectorOnMainThread:@selector(_setConfigurationData:)
+ withObject:data
+ waitUntilDone:YES
+ ];
+}
+
- (void) setProgressError:(NSString *)error {
[self
performSelectorOnMainThread:@selector(_setProgressError:)
];
}
+- (void) _setConfigurationData:(NSString *)data {
+ _assert(conffile_r(data));
+
+ NSString *ofile = conffile_r[1];
+ //NSString *nfile = conffile_r[2];
+
+ 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];
+
+ [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]];
+
+ [sheet popupAlertAnimated:YES];
+}
+
- (void) _setProgressError:(NSString *)error {
UIAlertSheet *sheet = [[[UIAlertSheet alloc]
initWithTitle:@"Package Error"
buttons:[NSArray arrayWithObjects:@"Okay", nil]
defaultButtonIndex:0
delegate:self
- context:self
+ context:@"error"
] autorelease];
[sheet setBodyText:error];
UITextLabel *name_;
UITextLabel *description_;
UITextLabel *source_;
- UIImageView *trusted_;
+ //UIImageView *trusted_;
+ UIImageView *badge_;
+ UITextLabel *status_;
}
- (PackageCell *) init;
- (void) setSelected:(BOOL)selected withFade:(BOOL)fade;
- (void) _setSelectionFadeFraction:(float)fraction;
++ (int) heightForPackage:(Package *)package;
+
@end
@implementation PackageCell
[name_ release];
[description_ release];
[source_ release];
- [trusted_ release];
+ [badge_ release];
+ [status_ release];
+ //[trusted_ release];
[super dealloc];
}
[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);
[name_ setText:[package name]];
[description_ setText:[package tagline]];
- NSString *label;
- bool trusted;
+ NSString *label = nil;
+ bool trusted = false;
if (source != nil) {
label = [source label];
trusted = [source trusted];
- } else if ([[package id] isEqualToString:@"firmware"]) {
+ } else if ([[package id] isEqualToString:@"firmware"])
label = @"Apple";
- trusted = false;
- } else {
+
+ if (label == nil)
label = @"Unknown/Local";
- trusted = false;
- }
- [source_ setText:[NSString stringWithFormat:@"from %@ (%@)", label, Simplify([package section])]];
+ NSString *from = [NSString stringWithFormat:@"from %@", label];
- if (trusted)
- [self addSubview:trusted_];
- else
- [trusted_ removeFromSuperview];
+ NSString *section = Simplify([package section]);
+ if (section != nil && ![section isEqualToString:label])
+ from = [from stringByAppendingString:[NSString stringWithFormat:@" (%@)", section]];
+
+ [source_ setText:from];
+
+ 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 {
[super _setSelectionFadeFraction:fraction];
}
++ (int) heightForPackage:(Package *)package {
+ if ([package hasMode] || [package half])
+ return 96;
+ else
+ return 73;
+}
+
@end
/* }}} */
/* Section Cell {{{ */
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_ sortUsingSelector:@selector(compare:)];
+ 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]]
+ ]];
+ }
}
}
}
- (NSString *) title {
- return @"File Contents";
+ return @"Installed Files";
+}
+
+- (NSString *) backButtonTitle {
+ return @"Files";
}
@end
Package *package_;
NSString *name_;
UITextView *description_;
+ NSMutableArray *buttons_;
}
- (id) initWithBook:(RVBook *)book database:(Database *)database;
if (description_ != nil)
[description_ release];
[table_ release];
+ [buttons_ release];
[super dealloc];
}
}
- (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_;
- (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])
return number;
} else if ([package_ installed] != nil && group-- == 0)
return 2;
- else if (group-- == 0)
- return 4;
- else if ([package_ source] != nil && group-- == 0)
- return 3;
- else _assert(false);
+ else if (group-- == 0) {
+ 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 = 1;
+ if (description != nil && ![description isEqualToString:[source label]])
+ ++number;
+ if ([source origin] != nil)
+ ++number;
+ return number;
+ } else _assert(false);
}
- (UIPreferencesTableCell *) preferencesTable:(UIPreferencesTable *)table cellForRow:(int)row inGroup:(int)group {
UIPreferencesTableCell *cell = [[[UIPreferencesTableCell alloc] init] autorelease];
[cell setShowSelection:NO];
- if (group-- == 0)
- switch (row) {
- case 0:
- [cell setTitle:[package_ name]];
- [cell setValue:[package_ latest]];
- break;
-
- case 1:
- [cell addSubview:description_];
- break;
-
- case 2:
- if ([package_ website] != nil) {
- [cell setTitle:@"More Information"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- break;
- }
- case 3:
- [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
- [cell setValue:@"This package has been signed."];
- break;
-
- default: _assert(false);
- }
- else if ([package_ installed] != nil && group-- == 0)
- switch (row) {
- case 0: {
- [cell setTitle:@"Version"];
- NSString *installed([package_ installed]);
- [cell setValue:(installed == nil ? @"n/a" : installed)];
- } break;
-
- case 1:
- [cell setTitle:@"File Content"];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- break;
-
- default: _assert(false);
- }
- else if (group-- == 0)
- switch (row) {
- case 0:
- [cell setTitle:@"Identifier"];
- [cell setValue:[package_ id]];
- break;
-
- case 1: {
- [cell setTitle:@"Section"];
- NSString *section([package_ section]);
- [cell setValue:(section == nil ? @"n/a" : section)];
- } break;
-
- case 2:
- [cell setTitle:@"Expanded Size"];
- [cell setValue:SizeString([package_ size])];
- break;
-
- case 3:
- [cell setTitle:@"Maintainer"];
- [cell setValue:[[package_ maintainer] name]];
- [cell setShowDisclosure:YES];
- [cell setShowSelection:YES];
- break;
-
- default: _assert(false);
- }
- else if ([package_ source] != nil && group-- == 0)
- switch (row) {
- case 0:
- [cell setTitle:[[package_ source] label]];
- [cell setValue:[[package_ source] version]];
- break;
-
- case 1:
- [cell setValue:[[package_ source] description]];
- break;
-
- case 2:
- [cell setTitle:@"Origin"];
- [cell setValue:[[package_ source] origin]];
- break;
-
- default: _assert(false);
- }
- else _assert(false);
+ if (group-- == 0) {
+ if (row-- == 0) {
+ [cell setTitle:[package_ name]];
+ [cell setValue:[package_ latest]];
+ } 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"];
+ [cell setShowDisclosure:YES];
+ [cell setShowSelection:YES];
+ } else if ([[package_ source] trusted] && row-- == 0) {
+ [cell setIcon:[UIImage applicationImageNamed:@"trusted.png"]];
+ [cell setValue:@"This package has been signed."];
+ } else _assert(false);
+ } else if ([package_ installed] != nil && group-- == 0) {
+ if (row-- == 0) {
+ [cell setTitle:@"Version"];
+ NSString *installed([package_ installed]);
+ [cell setValue:(installed == nil ? @"n/a" : installed)];
+ } else if (row-- == 0) {
+ [cell setTitle:@"Filesystem Content"];
+ [cell setShowDisclosure:YES];
+ [cell setShowSelection:YES];
+ } else _assert(false);
+ } else if (group-- == 0) {
+ if (row-- == 0) {
+ [cell setTitle:@"Identifier"];
+ [cell setValue:[package_ id]];
+ } else if (row-- == 0) {
+ [cell setTitle:@"Section"];
+ NSString *section([package_ section]);
+ [cell setValue:(section == nil ? @"n/a" : section)];
+ } else if ([package_ size] != 0 && row-- == 0) {
+ [cell setTitle:@"Expanded Size"];
+ [cell setValue:SizeString([package_ size])];
+ } else if ([package_ maintainer] != nil && row-- == 0) {
+ [cell setTitle:@"Maintainer"];
+ [cell setValue:[[package_ maintainer] name]];
+ [cell setShowDisclosure:YES];
+ [cell setShowSelection:YES];
+ } else if ([package_ relationships] != nil && row-- == 0) {
+ [cell setTitle:@"Package Relationships"];
+ [cell setShowDisclosure:YES];
+ [cell setShowSelection:YES];
+ } else _assert(false);
+ } else if ([package_ source] != nil && group-- == 0) {
+ Source *source = [package_ source];
+ NSString *description = [source description];
+
+ if (row-- == 0) {
+ 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 ([source origin] != nil && row-- == 0) {
+ [cell setTitle:@"Origin"];
+ [cell setValue:[source origin]];
+ } else _assert(false);
+ } else _assert(false);
return cell;
}
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)
) {
[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_];
}
}
+- (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
- context:self
+ context:@"manage"
] autorelease]];
}
}
- (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 {
[table_ setDataSource:self];
[table_ setDelegate:self];
+
+ buttons_ = [[NSMutableArray alloc] initWithCapacity:4];
} return self;
}
description_ = 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];
-
- [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"];
}
}
- (void) reloadData;
- (void) resetCursor;
+- (UISectionList *) list;
+
- (void) setShouldHideHeaderInShortLists:(BOOL)hide;
@end
}
- (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 {
[[list_ table] scrollPointVisibleAtTopLeft:CGPointMake(0, 0) animated:NO];
}
+- (UISectionList *) list {
+ return list_;
+}
+
- (void) setShouldHideHeaderInShortLists:(BOOL)hide {
[list_ setShouldHideHeaderInShortLists:hide];
}
timeoutInterval:30.0
];
- [request addValue:[NSString stringWithCString:Firmware_] forHTTPHeaderField:@"X-Firmware"];
- [request addValue:[NSString stringWithCString:Machine_] forHTTPHeaderField:@"X-Machine"];
- [request addValue:[NSString stringWithCString:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
+ [request addValue:[NSString stringWithUTF8String:Firmware_] forHTTPHeaderField:@"X-Firmware"];
+ [request addValue:[NSString stringWithUTF8String:Machine_] forHTTPHeaderField:@"X-Machine"];
+ [request addValue:[NSString stringWithUTF8String:SerialNumber_] forHTTPHeaderField:@"X-Serial-Number"];
[self loadRequest:request];
}
buttons:[NSArray arrayWithObjects:@"Close", nil]
defaultButtonIndex:0
delegate:self
- context:self
+ context:@"missing"
] autorelease];
[sheet setBodyText:[NSString stringWithFormat:
//[webview_ setEnabledGestures:2];
CGSize indsize = [UIProgressIndicator defaultSizeForStyle:0];
- indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 43, indsize.width, indsize.height)];
+ indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(281, 42, indsize.width, indsize.height)];
[indicator_ setStyle:0];
Package *package([database_ packageWithName:@"cydia"]);
buttons:[NSArray arrayWithObjects:@"Close", nil]
defaultButtonIndex:0
delegate:self
- context:self
+ context:@"about"
] autorelease];
[sheet setBodyText:
NSMutableArray *packages_;
NSMutableArray *sections_;
UITable *list_;
+ UIView *accessory_;
}
- (id) initWithBook:(RVBook *)book database:(Database *)database;
[packages_ release];
[sections_ release];
[list_ release];
+ [accessory_ release];
[super dealloc];
}
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]
database:database_
title:title
filter:@selector(isUninstalledInSection:)
- with:(section == nil ? nil : [section name])
+ with:name
] autorelease];
[table setDelegate:delegate_];
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];
}
return @"Sections";
}
+- (UIView *) accessoryView {
+ return accessory_;
+}
+
@end
/* }}} */
/* Changes View {{{ */
}
- (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 {
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];
}
}
}
+- (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;
+
+ UIFrameAnimation *animation = [[[UIFrameAnimation alloc] initWithTarget:[table_ list]] autorelease];
+ [animation setSignificantRectFields:8];
+
+ if (show) {
+ [animation setStartFrame:keydown];
+ [animation setEndFrame:keyup];
+ } else {
+ [animation setStartFrame:keyup];
+ [animation setEndFrame:keydown];
+ }
+
+ UIAnimator *animator = [UIAnimator sharedAnimator];
+
+ [animator
+ addAnimations:[NSArray arrayWithObjects:animation, nil]
+ withDuration:(KeyboardTime_ - delay)
+ start:!show
+ ];
+
+ if (show)
+ [animator performSelector:@selector(startAnimation:) withObject:animation afterDelay:delay];
+
+ [delegate_ showKeyboard:show];
+}
+
- (void) textFieldDidBecomeFirstResponder:(UITextField *)field {
- [delegate_ showKeyboard:YES];
+ [self _showKeyboard:YES];
}
- (void) textFieldDidResignFirstResponder:(UITextField *)field {
- [delegate_ showKeyboard:NO];
+ [self _showKeyboard:NO];
}
- (void) keyboardInputChanged:(UIFieldEditor *)editor {
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;
CGRect indrect = {{indoffset, indoffset}, indsize};
indicator_ = [[UIProgressIndicator alloc] initWithFrame:indrect];
- [indicator_ setStyle:2];
+ [indicator_ setStyle:(Advanced_ ? 2 : 3)];
[overlay_ addSubview:indicator_];
CGSize prmsize = {200, indsize.width};
prompt_ = [[UITextLabel alloc] initWithFrame:prmrect];
- [prompt_ setColor:White_];
+ [prompt_ setColor:(Advanced_ ? White_ : Blueish_)];
[prompt_ setBackgroundColor:Clear_];
[prompt_ setFont:font];
ConfirmationView *confirm_;
+ NSMutableArray *essential_;
+ NSMutableArray *broken_;
+
Database *database_;
ProgressView *progress_;
@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"];
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 upgradable])
+ if ([package half])
+ [broken_ addObject:package];
+ if ([package upgradable]) {
+ if ([package essential])
+ [essential_ addObject:package];
++changes;
+ }
}
if (changes != 0) {
[book_ reloadData];
+ if ([packages count] == 0);
+ else if (Loaded_)
+ [self _loaded];
+ else {
+ Loaded_ = YES;
+ [book_ update];
+ }
+
/*[hud show:NO];
[hud removeFromSuperview];*/
}
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"]]];
- (void) confirm {
[overlay_ removeFromSuperview];
- restart_ = true;
+ reload_ = true;
[progress_
detachNewThreadSelector:@selector(perform)
}
- (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;
+
+ case 2:
+ [broken_ removeAllObjects];
+ [self _loaded];
+ break;
+
+ default:
+ _assert(false);
+ }
+ 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) 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 {
confirm_ = nil;
tag_ = 1;
+ essential_ = [[NSMutableArray alloc] initWithCapacity:4];
+ broken_ = [[NSMutableArray alloc] initWithCapacity:4];
+
CGRect screenrect = [UIHardware fullScreenApplicationContentRect];
window_ = [[UIWindow alloc] initWithContentRect:screenrect];
[window_ makeKey: self];
[window_ _setHidden: NO];
- progress_ = [[ProgressView alloc] initWithFrame:[window_ bounds] delegate:self];
+ 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]];
if (!bootstrap_)
[underlay_ addSubview:overlay_];
- database_ = [[Database alloc] init];
- [database_ setDelegate:progress_];
-
book_ = [[CYBook alloc] initWithFrame:CGRectMake(
0, 0, screenrect.size.width, screenrect.size.height - 48
) database:database_];
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
];
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];
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];
[[UIAnimator sharedAnimator]
addAnimations:[NSArray arrayWithObjects:animation, nil]
- withDuration:0.4f
+ withDuration:KeyboardTime_
start:YES
];
}
- (void) slideUp:(UIAlertSheet *)alert {
- [alert presentSheetFromButtonBar:buttonbar_];
+ if (Advanced_)
+ [alert presentSheetFromButtonBar:buttonbar_];
+ else
+ [alert presentSheetInView:overlay_];
}
@end
else
Packages_ = [Metadata_ objectForKey:@"Packages"];
- setenv("CYDIA", "", _not(int));
if (access("/User", F_OK) != 0)
system("/usr/libexec/cydia/firmware.sh");
- system("dpkg --configure -a");
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);
projects / cydia.git / blobdiff