#include <errno.h>
#include <pcre.h>
+#include <Cytore.hpp>
+
#include "UICaboodle/BrowserView.h"
#include "substrate.h"
while (false); \
[_pool release];
+// Hash Functions/Structures {{{
+extern "C" uint32_t hashlittle(const void *key, size_t length, uint32_t initval = 0);
+
+union SplitHash {
+ uint32_t u32;
+ uint16_t u16[2];
+};
+// }}}
+
static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
void NSLogPoint(const char *fix, const CGPoint &point) {
cache_ = reinterpret_cast<CFStringRef>(CFRetain(rhs.cache_));
}
+ void copy(apr_pool_t *pool) {
+ char *temp(reinterpret_cast<char *>(apr_palloc(pool, size_ + 1)));
+ memcpy(temp, data_, size_);
+ temp[size_] = '\0';
+ data_ = temp;
+ }
+
void set(apr_pool_t *pool, const char *data, size_t size) {
if (size == 0)
clear();
else {
clear_();
- char *temp(reinterpret_cast<char *>(apr_palloc(pool, size + 1)));
- memcpy(temp, data, size);
- temp[size] = '\0';
- data_ = temp;
+ data_ = const_cast<char *>(data);
size_ = size;
+
+ if (pool != NULL)
+ copy(pool);
}
}
_finline operator id() {
return (NSString *) static_cast<CFStringRef>(*this);
}
+
+ _finline operator const char *() {
+ return reinterpret_cast<const char *>(data_);
+ }
};
/* }}} */
/* C++ NSString Algorithm Adapters {{{ */
private:
CGColorRef color_;
+ static CGColorRef Create_(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
+ CGFloat color[] = {red, green, blue, alpha};
+ return CGColorCreate(space, color);
+ }
+
public:
CYColor() :
color_(NULL)
}
CYColor(CGColorSpaceRef space, float red, float green, float blue, float alpha) :
- color_(NULL)
+ color_(Create_(space, red, green, blue, alpha))
{
Set(space, red, green, blue, alpha);
}
void Set(CGColorSpaceRef space, float red, float green, float blue, float alpha) {
Clear();
- float color[] = {red, green, blue, alpha};
- color_ = CGColorCreate(space, (CGFloat *) color);
+ color_ = Create_(space, red, green, blue, alpha);
}
operator CGColorRef() {
static _transient NSMutableDictionary *Sections_;
static _transient NSMutableDictionary *Sources_;
static bool Changed_;
-static NSDate *now_;
+static time_t now_;
static bool IsWildcat_;
/* }}} */
static _finline const char *StripVersion_(const char *version) {
const char *colon(strchr(version, ':'));
- if (colon != NULL)
- version = colon + 1;
- return version;
+ return colon == NULL ? version : colon + 1;
}
NSString *LocalizeSection(NSString *section) {
@end
/* }}} */
+// Cytore Definitions {{{
+struct PackageValue :
+ Cytore::Block
+{
+ Cytore::Offset<PackageValue> next_;
+
+ uint32_t index_ : 23;
+ uint32_t subscribed_ : 1;
+ uint32_t : 8;
+
+ int32_t first_;
+ int32_t last_;
+
+ uint16_t vhash_;
+ uint16_t nhash_;
+
+ char version_[8];
+ char name_[];
+};
+
+struct MetaValue :
+ Cytore::Block
+{
+ Cytore::Offset<PackageValue> packages_[1 << 16];
+};
+
+static Cytore::File<MetaValue> MetaFile_;
+// }}}
+// Cytore Helper Functions {{{
+static PackageValue *PackageFind(const char *name, size_t length) {
+ SplitHash nhash = { hashlittle(name, length) };
+
+ PackageValue *metadata;
+
+ Cytore::Offset<PackageValue> *offset(&MetaFile_->packages_[nhash.u16[0]]);
+ offset: if (offset->IsNull()) {
+ *offset = MetaFile_.New<PackageValue>(length + 1);
+ metadata = &MetaFile_.Get(*offset);
+
+ memcpy(metadata->name_, name, length + 1);
+ metadata->nhash_ = nhash.u16[1];
+ } else {
+ metadata = &MetaFile_.Get(*offset);
+
+ if (metadata->nhash_ != nhash.u16[1] || strncmp(metadata->name_, name, length + 1) != 0) {
+ offset = &metadata->next_;
+ goto offset;
+ }
+ }
+
+ return metadata;
+}
+
+static void PackageImport(const void *key, const void *value, void *context) {
+ char buffer[1024];
+ if (!CFStringGetCString((CFStringRef) key, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+ NSLog(@"failed to import package %@", key);
+ return;
+ }
+
+ PackageValue *metadata(PackageFind(buffer, strlen(buffer)));
+ NSDictionary *package((NSDictionary *) value);
+
+ if (NSNumber *subscribed = [package objectForKey:@"IsSubscribed"])
+ if ([subscribed boolValue])
+ metadata->subscribed_ = true;
+
+ if (NSDate *date = [package objectForKey:@"FirstSeen"]) {
+ time_t time([date timeIntervalSince1970]);
+ if (metadata->first_ > time || metadata->first_ == 0)
+ metadata->first_ = time;
+ }
+
+ if (NSDate *date = [package objectForKey:@"LastSeen"]) {
+ time_t time([date timeIntervalSince1970]);
+ if (metadata->last_ < time || metadata->last_ == 0) {
+ metadata->last_ = time;
+ goto last;
+ }
+ } else if (metadata->last_ == 0) last: {
+ NSString *version([package objectForKey:@"LastVersion"]);
+ if (CFStringGetCString((CFStringRef) version, buffer, sizeof(buffer), kCFStringEncodingUTF8)) {
+ size_t length(strlen(buffer));
+ uint16_t vhash(hashlittle(buffer, length));
+
+ size_t capped(std::min<size_t>(8, length));
+ char *latest(buffer + length - capped);
+
+ strncpy(metadata->version_, latest, sizeof(metadata->version_));
+ metadata->vhash_ = vhash;
+ }
+ }
+}
+// }}}
+
/* Source Class {{{ */
@interface Source : NSObject {
CYString depiction_;
@end
/* }}} */
/* Package Class {{{ */
+struct ParsedPackage {
+ CYString tagline_;
+
+ CYString icon_;
+
+ CYString depiction_;
+ CYString homepage_;
+
+ CYString sponsor_;
+ CYString author_;
+
+ CYString bugs_;
+ CYString support_;
+};
+
@interface Package : NSObject {
- unsigned era_;
+ uint32_t era_ : 29;
+ uint32_t essential_ : 1;
+ uint32_t obsolete_ : 1;
+ uint32_t ignored_ : 1;
+
apr_pool_t *pool_;
+ _transient Database *database_;
+
pkgCache::VerIterator version_;
pkgCache::PkgIterator iterator_;
- _transient Database *database_;
pkgCache::VerFileIterator file_;
- Source *source_;
- bool parsed_;
-
- CYString section_;
- _transient NSString *section$_;
- bool essential_;
- bool obsolete_;
+ CYString id_;
+ CYString name_;
- NSString *latest_;
+ CYString latest_;
CYString installed_;
- CYString id_;
- CYString name_;
- CYString tagline_;
- CYString icon_;
- CYString depiction_;
- CYString homepage_;
+ CYString section_;
+ _transient NSString *section$_;
- CYString sponsor_;
- Address *sponsor$_;
+ Source *source_;
- CYString author_;
- Address *author$_;
+ PackageValue *metadata_;
+ ParsedPackage *parsed_;
- CYString bugs_;
- CYString support_;
NSMutableArray *tags_;
NSString *role_;
-
- NSMutableDictionary *metadata_;
- _transient NSDate *firstSeen_;
- _transient NSDate *lastSeen_;
- bool subscribed_;
}
- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
- (NSString *) shortDescription;
- (unichar) index;
-- (NSMutableDictionary *) metadata;
-- (NSDate *) seen;
-- (BOOL) subscribed;
+- (PackageValue *) metadata;
+- (time_t) seen;
+
+- (bool) subscribed;
+- (bool) setSubscribed:(bool)subscribed;
+
- (BOOL) ignored;
- (NSString *) latest;
- (NSArray *) purposes;
- (bool) isCommercial;
+- (void) setIndex:(size_t)index;
+
- (CYString &) cyname;
- (uint32_t) compareBySection:(NSArray *)sections;
-- (uint32_t) compareForChanges;
-
- (void) install;
- (void) remove;
value.bits.ignored = [self ignored] ? 0 : 1;
value.bits.upgradable = 1;
} else {
- value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
+ value.bits.timestamp = [self seen] >> 2;
value.bits.ignored = 0;
value.bits.upgradable = 0;
}
}
- (void) dealloc {
+ if (parsed_ != NULL)
+ delete parsed_;
+
if (source_ != nil)
[source_ release];
- if (latest_ != nil)
- [latest_ release];
-
- if (sponsor$_ != nil)
- [sponsor$_ release];
- if (author$_ != nil)
- [author$_ release];
if (tags_ != nil)
[tags_ release];
if (role_ != nil)
[role_ release];
- if (metadata_ != nil)
- [metadata_ release];
-
[super dealloc];
}
}
- (void) parse {
- if (parsed_)
+ if (parsed_ != NULL)
return;
- parsed_ = true;
- if (file_.end())
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
return;
+ ParsedPackage *parsed(new ParsedPackage);
+ parsed_ = parsed;
+
_profile(Package$parse)
pkgRecords::Parser *parser;
const char *name_;
CYString *value_;
} names[] = {
- {"icon", &icon_},
- {"depiction", &depiction_},
- {"homepage", &homepage_},
+ {"icon", &parsed->icon_},
+ {"depiction", &parsed->depiction_},
+ {"homepage", &parsed->homepage_},
{"website", &website},
- {"bugs", &bugs_},
- {"support", &support_},
- {"sponsor", &sponsor_},
- {"author", &author_},
+ {"bugs", &parsed->bugs_},
+ {"support", &parsed->support_},
+ {"sponsor", &parsed->sponsor_},
+ {"author", &parsed->author_},
};
for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) {
stop = end;
while (stop != start && stop[-1] == '\r')
--stop;
- tagline_.set(pool_, start, stop - start);
+ parsed->tagline_.set(pool_, start, stop - start);
}
_end
_profile(Package$parse$Retain)
- if (homepage_.empty())
- homepage_ = website;
- if (homepage_ == depiction_)
- homepage_.clear();
+ if (parsed->homepage_.empty())
+ parsed->homepage_ = website;
+ if (parsed->homepage_ == parsed->depiction_)
+ parsed->homepage_.clear();
_end
_end
-}
+} }
- (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database {
if ((self = [super init]) != nil) {
_profile(Package$initWithVersion)
- era_ = [database era];
pool_ = pool;
- version_ = version;
-
- _profile(Package$initWithVersion$ParentPkg)
- iterator_ = version.ParentPkg();
- _end
-
database_ = database;
+ era_ = [database era];
- _profile(Package$initWithVersion$Latest)
- const char *latest(StripVersion_(version_.VerStr()));
- latest_ = (NSString *) CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const uint8_t *>(latest), strlen(latest), kCFStringEncodingASCII, NO);
- _end
+ version_ = version;
- pkgCache::VerIterator current;
- _profile(Package$initWithVersion$Versions)
- current = iterator_.CurrentVer();
- if (!current.end())
- installed_.set(pool_, StripVersion_(current.VerStr()));
+ pkgCache::PkgIterator iterator(version.ParentPkg());
+ iterator_ = iterator;
+ _profile(Package$initWithVersion$Version)
if (!version_.end())
file_ = version_.FileList();
else {
}
_end
- _profile(Package$initWithVersion$Name)
- id_.set(pool_, iterator_.Name());
- name_.set(pool, iterator_.Display());
+ _profile(Package$initWithVersion$Cache)
+ id_.set(NULL, iterator.Name());
+ name_.set(NULL, iterator.Display());
+
+ latest_.set(NULL, StripVersion_(version_.VerStr()));
+
+ pkgCache::VerIterator current(iterator.CurrentVer());
+ if (!current.end())
+ installed_.set(NULL, StripVersion_(current.VerStr()));
_end
- _profile(Package$initWithVersion$lowercaseString)
+ _profile(Package$initWithVersion$Lower)
+ // XXX: do not use tolower() as this is not locale-specific? :(
char *data(id_.data());
for (size_t i(0), e(id_.size()); i != e; ++i)
- // XXX: do not use tolower() as this is not locale-specific? :(
- data[i] |= 0x20;
+ if ((data[i] & 0x20) == 0) {
+ id_.copy(pool);
+ data = id_.data();
+ for (; i != e; ++i)
+ data[i] |= 0x20;
+ break;
+ }
_end
_profile(Package$initWithVersion$Tags)
- pkgCache::TagIterator tag(iterator_.TagList());
+ pkgCache::TagIterator tag(iterator.TagList());
if (!tag.end()) {
tags_ = [[NSMutableArray alloc] initWithCapacity:8];
do {
const char *name(tag.Name());
[tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
+
if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/)
role_ = (NSString *) CYStringCreate(name + 6);
+
+ if (strncmp(name, "cydia::", 7) == 0) {
+ if (strcmp(name + 7, "essential") == 0)
+ essential_ = true;
+ else if (strcmp(name + 7, "obsolete") == 0)
+ obsolete_ = true;
+ }
+
++tag;
} while (!tag.end());
}
_end
- bool changed(false);
-
_profile(Package$initWithVersion$Metadata)
- metadata_ = [Packages_ objectForKey:id_];
-
- if (metadata_ == nil) {
- firstSeen_ = now_;
+ PackageValue *metadata(PackageFind(id_.data(), id_.size()));
+ metadata_ = metadata;
- metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
- firstSeen_, @"FirstSeen",
- latest_, @"LastVersion",
- nil] mutableCopy];
+ const char *latest(version_.VerStr());
+ size_t length(strlen(latest));
- changed = true;
- } else {
- firstSeen_ = [metadata_ objectForKey:@"FirstSeen"];
- lastSeen_ = [metadata_ objectForKey:@"LastSeen"];
+ uint16_t vhash(hashlittle(latest, length));
- if (NSNumber *subscribed = [metadata_ objectForKey:@"IsSubscribed"])
- subscribed_ = [subscribed boolValue];
+ size_t capped(std::min<size_t>(8, length));
+ latest = latest + length - capped;
- NSString *version([metadata_ objectForKey:@"LastVersion"]);
-
- if (firstSeen_ == nil) {
- firstSeen_ = lastSeen_ == nil ? now_ : lastSeen_;
- [metadata_ setObject:firstSeen_ forKey:@"FirstSeen"];
- changed = true;
- }
+ if (metadata->first_ == 0)
+ metadata->first_ = now_;
- if (version == nil) {
- [metadata_ setObject:latest_ forKey:@"LastVersion"];
- changed = true;
- } else if (![version isEqualToString:latest_]) {
- [metadata_ setObject:latest_ forKey:@"LastVersion"];
- lastSeen_ = now_;
- [metadata_ setObject:lastSeen_ forKey:@"LastSeen"];
- changed = true;
- }
- }
-
- metadata_ = [metadata_ retain];
-
- if (changed) {
- [Packages_ setObject:metadata_ forKey:id_];
- Changed_ = true;
- }
+ if (metadata->vhash_ != vhash || strncmp(metadata->version_, latest, sizeof(metadata->version_)) != 0) {
+ metadata->last_ = now_;
+ strncpy(metadata->version_, latest, sizeof(metadata->version_));
+ metadata->vhash_ = vhash;
+ } else if (metadata->last_ == 0)
+ metadata->last_ = metadata->first_;
_end
_profile(Package$initWithVersion$Section)
- section_.set(pool_, iterator_.Section());
+ section_.set(NULL, iterator.Section());
_end
- _profile(Package$initWithVersion$hasTag)
- obsolete_ = [self hasTag:@"cydia::obsolete"];
- essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"];
+ _profile(Package$initWithVersion$Flags)
+ essential_ |= ((iterator->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES);
+ ignored_ = iterator->SelectedState == pkgCache::State::Hold;
_end
_end } return self;
}
if (version.end())
return nil;
- return [[[Package alloc]
- initWithVersion:version
- withZone:zone
- inPool:pool
- database:database
- ] autorelease];
+ Package *package;
+
+ _profile(Package$packageWithIterator$Allocate)
+ package = [Package allocWithZone:zone];
+ _end
+
+ _profile(Package$packageWithIterator$Initialize)
+ package = [package
+ initWithVersion:version
+ withZone:zone
+ inPool:pool
+ database:database
+ ];
+ _end
+
+ _profile(Package$packageWithIterator$Autorelease)
+ package = [package autorelease];
+ _end
+
+ return package;
}
- (pkgCache::PkgIterator) iterator {
}
- (Address *) maintainer {
- if (file_.end())
+@synchronized (database_) {
+ if ([database_ era] != era_ || file_.end())
return nil;
+
pkgRecords::Parser *parser = &[database_ records]->Lookup(file_);
const std::string &maintainer(parser->Maintainer());
return maintainer.empty() ? nil : [Address addressWithString:[NSString stringWithUTF8String:maintainer.c_str()]];
-}
+} }
- (size_t) size {
- return version_.end() ? 0 : version_->InstalledSize;
-}
+@synchronized (database_) {
+ if ([database_ era] != era_ || version_.end())
+ return 0;
+
+ return version_->InstalledSize;
+} }
- (NSString *) longDescription {
@synchronized (database_) {
} }
- (NSString *) shortDescription {
- return tagline_;
+ return parsed_ == NULL ? nil : static_cast<NSString *>(parsed_->tagline_);
}
- (unichar) index {
_end
}
-- (NSMutableDictionary *) metadata {
+- (PackageValue *) metadata {
return metadata_;
}
-- (NSDate *) seen {
- if (subscribed_ && lastSeen_ != nil)
- return lastSeen_;
- return firstSeen_;
+- (time_t) seen {
+ PackageValue *metadata([self metadata]);
+ return metadata->subscribed_ ? metadata->last_ : metadata->first_;
}
-- (BOOL) subscribed {
- return subscribed_;
+- (bool) subscribed {
+ return [self metadata]->subscribed_;
}
-- (BOOL) ignored {
- NSDictionary *metadata([self metadata]);
- if (NSNumber *ignored = [metadata objectForKey:@"IsIgnored"])
- return [ignored boolValue];
- else
+- (bool) setSubscribed:(bool)subscribed {
+ PackageValue *metadata([self metadata]);
+ if (metadata->subscribed_ == subscribed)
return false;
+ metadata->subscribed_ = subscribed;
+ return true;
+}
+
+- (BOOL) ignored {
+ return ignored_;
}
- (NSString *) latest {
NSString *section = [self simpleSection];
UIImage *icon(nil);
- if (!icon_.empty())
- if ([static_cast<id>(icon_) hasPrefix:@"file:///"])
- // XXX: correct escaping
- icon = [UIImage imageAtPath:[static_cast<id>(icon_) substringFromIndex:7]];
+ if (parsed_ != NULL)
+ if (NSString *href = parsed_->icon_)
+ if ([href hasPrefix:@"file:///"])
+ // XXX: correct escaping
+ icon = [UIImage imageAtPath:[href substringFromIndex:7]];
if (icon == nil) if (section != nil)
icon = [UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, section]];
- if (icon == nil) if (source_ != nil) if (NSString *dicon = [source_ defaultIcon])
+ if (icon == nil) if (Source *source = [self source]) if (NSString *dicon = [source defaultIcon])
if ([dicon hasPrefix:@"file:///"])
// XXX: correct escaping
icon = [UIImage imageAtPath:[dicon substringFromIndex:7]];
}
- (NSString *) homepage {
- return homepage_;
+ return parsed_ == NULL ? nil : static_cast<NSString *>(parsed_->homepage_);
}
- (NSString *) depiction {
- return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_];
+ return parsed_ != NULL && !parsed_->depiction_.empty() ? parsed_->depiction_ : [[self source] depictionForPackage:id_];
}
- (Address *) sponsor {
- if (sponsor$_ == nil) {
- if (sponsor_.empty())
- return nil;
- sponsor$_ = [[Address addressWithString:sponsor_] retain];
- } return sponsor$_;
+ return parsed_ == NULL || parsed_->sponsor_.empty() ? nil : [Address addressWithString:parsed_->sponsor_];
}
- (Address *) author {
- if (author$_ == nil) {
- if (author_.empty())
- return nil;
- author$_ = [[Address addressWithString:author_] retain];
- } return author$_;
+ return parsed_ == NULL || parsed_->author_.empty() ? nil : [Address addressWithString:parsed_->author_];
}
- (NSString *) support {
- return !bugs_.empty() ? bugs_ : [[self source] supportForPackage:id_];
+ return parsed_ != NULL && !parsed_->bugs_.empty() ? parsed_->bugs_ : [[self source] supportForPackage:id_];
}
- (NSArray *) files {
return [self hasTag:@"cydia::commercial"];
}
+- (void) setIndex:(size_t)index {
+ if (metadata_->index_ != index)
+ metadata_->index_ = index;
+}
+
- (CYString &) cyname {
return name_.empty() ? id_ : name_;
}
return _not(uint32_t);
}
-- (uint32_t) compareForChanges {
- union {
- uint32_t key;
-
- struct {
- uint32_t timestamp : 30;
- uint32_t ignored : 1;
- uint32_t upgradable : 1;
- } bits;
- } value;
-
- bool upgradable([self upgradableAndEssential:YES]);
- value.bits.upgradable = upgradable ? 1 : 0;
-
- if (upgradable) {
- value.bits.timestamp = 0;
- value.bits.ignored = [self ignored] ? 0 : 1;
- value.bits.upgradable = 1;
- } else {
- value.bits.timestamp = static_cast<uint32_t>([[self seen] timeIntervalSince1970]) >> 2;
- value.bits.ignored = 0;
- value.bits.upgradable = 0;
- }
-
- return _not(uint32_t) - value.key;
-}
-
- (void) clear {
@synchronized (database_) {
pkgProblemResolver *resolver = [database_ resolver];
return era_;
}
+- (void) releasePackages {
+ CFArrayApplyFunction(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast<CFArrayApplierFunction>(&CFRelease), NULL);
+ CFArrayRemoveAllValues(packages_);
+}
+
- (void) dealloc {
// XXX: actually implement this thing
_assert(false);
- NSRecycleZone(zone_);
- // XXX: malloc_destroy_zone(zone_);
+ [self releasePackages];
apr_pool_destroy(pool_);
+ NSRecycleZone(zone_);
[super dealloc];
}
@synchronized (self) {
++era_;
- CFArrayApplyFunction(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast<CFArrayApplierFunction>(&CFRelease), NULL);
- CFArrayRemoveAllValues(packages_);
-
+ [self releasePackages];
sources_.clear();
_error->Discard();
delete policy_;
policy_ = NULL;
- if (now_ != nil) {
- [now_ release];
- now_ = nil;
- }
-
cache_.Close();
apr_pool_clear(pool_);
unlink("/tmp/cydia.chk");
- now_ = [[NSDate date] retain];
+ now_ = [[NSDate date] timeIntervalSince1970];
policy_ = new pkgDepCache::Policy();
records_ = new pkgRecords(cache_);
//[packages_ sortUsingFunction:reinterpret_cast<NSComparisonResult (*)(id, id, void *)>(&PackageNameCompare) context:NULL];
_trace();
+
+ size_t count(CFArrayGetCount(packages_));
+ for (size_t index(0); index != count; ++index)
+ [(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index];
+
+ _trace();
}
} } CYPoolEnd() _trace(); }
- (NSArray *) getInstalledPackages {
NSArray *packages([[Database sharedInstance] packages]);
- NSMutableArray *installed([NSMutableArray arrayWithCapacity:[packages count]]);
+ NSMutableArray *installed([NSMutableArray arrayWithCapacity:1024]);
for (Package *package in packages)
if ([package installed] != nil)
[installed addObject:package];
@end
@implementation ContentView
+
- (id) initWithFrame:(CGRect)frame {
if ((self = [super initWithFrame:frame]) != nil) {
- /* Fix landscape stretching. */
[self setNeedsDisplayOnBoundsChange:YES];
} return self;
}
[super drawRect:rect];
[delegate_ drawContentRect:rect];
}
+
+@end
+/* }}} */
+/* Cydia TableView Cell {{{ */
+@interface CYTableViewCell : UITableViewCell {
+ ContentView *content_;
+ bool highlighted_;
+}
+
+@end
+
+@implementation CYTableViewCell
+
+- (void) dealloc {
+ [content_ release];
+ [super dealloc];
+}
+
+- (void) _updateHighlightColorsForView:(id)view highlighted:(BOOL)highlighted {
+ //NSLog(@"_updateHighlightColorsForView:%@ highlighted:%s [content_=%@]", view, highlighted ? "YES" : "NO", content_);
+
+ if (view == content_) {
+ //NSLog(@"_updateHighlightColorsForView:content_ highlighted:%s", highlighted ? "YES" : "NO", content_);
+ highlighted_ = highlighted;
+ }
+
+ [super _updateHighlightColorsForView:view highlighted:highlighted];
+}
+
+- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
+ //NSLog(@"setSelected:%s animated:%s", selected ? "YES" : "NO", animated ? "YES" : "NO");
+ highlighted_ = selected;
+
+ [super setSelected:selected animated:animated];
+ [content_ setNeedsDisplay];
+}
+
@end
/* }}} */
/* Package Cell {{{ */
-@interface PackageCell : UITableViewCell <
+@interface PackageCell : CYTableViewCell <
ContentDelegate
> {
UIImage *icon_;
NSString *source_;
UIImage *badge_;
Package *package_;
- UIColor *color_;
- ContentView *content_;
- BOOL faded_;
- float fade_;
UIImage *placard_;
}
- (void) dealloc {
[self clearPackage];
- [content_ release];
- [color_ release];
[super dealloc];
}
-- (float) fade {
- return faded_ ? [self selectionPercent] : fade_;
-}
-
- (PackageCell *) init {
CGRect frame(CGRectMake(0, 0, 320, 74));
if ((self = [super initWithFrame:frame reuseIdentifier:@"Package"]) != nil) {
[content_ setDelegate:self];
[content_ setOpaque:YES];
- if ([self respondsToSelector:@selector(selectionPercent)])
- faded_ = YES;
} return self;
}
}
- (void) drawContentRect:(CGRect)rect {
- bool selected([self isSelected]);
+ bool highlighted(highlighted_);
float width([self bounds].size.width);
#if 0
)];
}
- if (selected)
+ if (highlighted)
UISetColor(White_);
- if (!selected)
+ if (!highlighted)
UISetColor(commercial_ ? Purple_ : Black_);
[name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
[source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
- if (!selected)
+ if (!highlighted)
UISetColor(commercial_ ? Purplish_ : Gray_);
[description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
[placard_ drawAtPoint:CGPointMake(width - 52, 9)];
}
-- (void) setSelected:(BOOL)selected animated:(BOOL)fade {
- //[self _setBackgroundColor];
- [super setSelected:selected animated:fade];
- [content_ setNeedsDisplay];
-}
-
+ (int) heightForPackage:(Package *)package {
return 73;
}
@end
/* }}} */
/* Section Cell {{{ */
-@interface SectionCell : UITableViewCell <
+@interface SectionCell : CYTableViewCell <
ContentDelegate
> {
NSString *basic_;
NSString *name_;
NSString *count_;
UIImage *icon_;
- ContentView *content_;
UISwitch *switch_;
BOOL editing_;
}
[self clearSection];
[icon_ release];
[switch_ release];
- [content_ release];
-
[super dealloc];
}
}
- (void) onSwitch:(id)sender {
- NSMutableDictionary *metadata = [Sections_ objectForKey:basic_];
+ NSMutableDictionary *metadata([Sections_ objectForKey:basic_]);
if (metadata == nil) {
metadata = [NSMutableDictionary dictionaryWithCapacity:2];
[Sections_ setObject:metadata forKey:basic_];
}
- Changed_ = true;
[metadata setObject:[NSNumber numberWithBool:([switch_ isOn] == NO)] forKey:@"Hidden"];
+ Changed_ = true;
}
- (void) setSection:(Section *)section editing:(BOOL)editing {
}
- (void) drawContentRect:(CGRect)rect {
- BOOL selected = [self isSelected];
+ bool highlighted(highlighted_);
[icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
- if (selected)
+ if (highlighted)
UISetColor(White_);
- if (!selected)
- UISetColor(Black_);
-
float width(rect.size.width);
if (editing_)
width -= 87;
+ if (!highlighted)
+ UISetColor(Black_);
[name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation];
CGSize size = [count_ sizeWithFont:Font14_];
@end
/* }}} */
/* Source Cell {{{ */
-@interface SourceCell : UITableViewCell <
+@interface SourceCell : CYTableViewCell <
ContentDelegate
> {
UIImage *icon_;
NSString *origin_;
NSString *description_;
NSString *label_;
- ContentView *content_;
}
- (void) setSource:(Source *)source;
- (void) dealloc {
[self clearSource];
- [content_ release];
[super dealloc];
}
} return self;
}
-- (void) setSelected:(BOOL)selected animated:(BOOL)animated {
- [super setSelected:selected animated:animated];
- [content_ setNeedsDisplay];
-}
-
- (void) drawContentRect:(CGRect)rect {
- bool selected([self isSelected]);
+ bool highlighted(highlighted_);
float width(rect.size.width);
if (icon_ != nil)
[icon_ drawInRect:CGRectMake(10, 10, 30, 30)];
- if (selected)
+ if (highlighted)
UISetColor(White_);
- if (!selected)
+ if (!highlighted)
UISetColor(Black_);
[origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
- if (!selected)
+ if (!highlighted)
UISetColor(Blue_);
[label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
- if (!selected)
+ if (!highlighted)
UISetColor(Gray_);
[description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
}
[sections_ removeAllObjects];
-#if 0
+#if 1
UIProgressHUD *hud([delegate_ addProgressHUD]);
- // XXX: localize
- [hud setText:@"Loading Changes"];
+ [hud setText:UCLocalize("LOADING")];
//NSLog(@"HUD:%@::%@", delegate_, hud);
[self yieldToSelector:@selector(_reloadPackages:) withObject:packages];
[delegate_ removeProgressHUD:hud];
#endif
Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
- Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease];
+ Section *ignored = nil;
Section *section = nil;
- NSDate *last = nil;
+ time_t last = 0;
upgrades_ = 0;
bool unseens = false;
if (!uae) {
unseens = true;
- NSDate *seen;
+ time_t seen([package seen]);
- _profile(ChangesController$reloadData$Remember)
- seen = [package seen];
- _end
-
- if (section == nil || last != seen && (seen == nil || [seen compare:last] != NSOrderedSame)) {
+ if (section == nil || last != seen) {
last = seen;
NSString *name;
- if (seen == nil)
- name = UCLocalize("UNKNOWN");
- else {
- name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) seen);
- [name autorelease];
- }
+ name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) [NSDate dateWithTimeIntervalSince1970:seen]);
+ [name autorelease];
_profile(ChangesController$reloadData$Allocate)
name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name];
}
[section addToCount];
- } else if ([package ignored])
+ } else if ([package ignored]) {
+ if (ignored == nil) {
+ ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") row:offset localize:NO] autorelease];
+ }
[ignored addToCount];
- else {
+ } else {
++upgrades_;
[upgradable addToCount];
}
if (package_ == nil)
return 0;
- return 1;
+ return 2;
}
- (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
return UCLocalize("SHOW_ALL_CHANGES_EX");
}
-- (void) onSomething:(BOOL)value withKey:(NSString *)key {
+- (void) onSubscribed:(id)control {
+ bool value([control isOn]);
if (package_ == nil)
return;
-
- NSMutableDictionary *metadata([package_ metadata]);
-
- BOOL before;
- if (NSNumber *number = [metadata objectForKey:key])
- before = [number boolValue];
- else
- before = NO;
-
- if (value != before) {
- [metadata setObject:[NSNumber numberWithBool:value] forKey:key];
- Changed_ = true;
+ if ([package_ setSubscribed:value])
[delegate_ updateData];
- }
-}
-
-- (void) onSubscribed:(id)control {
- [self onSomething:(int) [control isOn] withKey:@"IsSubscribed"];
}
- (void) onIgnored:(id)control {
- [self onSomething:(int) [control isOn] withKey:@"IsIgnored"];
+ // TODO: set Held state - possibly call out to dpkg, etc.
}
- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
nil];
[Metadata_ setObject:Settings_ forKey:@"Settings"];
-
Changed_ = true;
if (rolling)
Database *database_;
int tag_;
-
- UIKeyboard *keyboard_;
- int huds_;
+ int hudcount_;
+ NSURL *starturl_;
SectionsController *sections_;
ChangesController *changes_;
}
- (void) _saveConfig {
+ _trace();
+ MetaFile_.Sync();
+ _trace();
+
if (Changed_) {
- _trace();
NSString *error(nil);
+
if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) {
_trace();
NSError *error(nil);
if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])
NSLog(@"failure to save metadata data: %@", error);
_trace();
+
+ Changed_ = false;
} else {
NSLog(@"failure to serialize metadata: %@", error);
- return;
}
-
- Changed_ = false;
}
}
}
- (BOOL) hudIsShowing {
- return (huds_ > 0);
+ return (hudcount_ > 0);
}
- (void) applicationSuspend:(__GSEvent *)event {
while ([target modalViewController] != nil) target = [target modalViewController];
[[target view] addSubview:hud];
- huds_++;
+ hudcount_++;
return hud;
}
[hud show:NO];
[hud removeFromSuperview];
[window_ setUserInteractionEnabled:YES];
- huds_--;
+ hudcount_--;
}
- (CYViewController *) pageForPackage:(NSString *)name {
return nil;
}
-- (void) applicationOpenURL:(NSURL *)url {
- [super applicationOpenURL:url];
- int tag;
- if (CYViewController *page = [self pageForURL:url hasTag:&tag]) {
+- (BOOL) openCydiaURL:(NSURL *)url {
+ CYViewController *page = nil;
+ int tag = 0;
+
+ NSLog(@"open url: %@", url);
+
+ if ((page = [self pageForURL:url hasTag:&tag])) {
[self setPage:page];
tag_ = tag;
[tabbar_ setSelectedViewController:(tag_ == -1 ? nil : [[tabbar_ viewControllers] objectAtIndex:tag_])];
}
+
+ return !!page;
+}
+
+- (void) applicationOpenURL:(NSURL *)url {
+ [super applicationOpenURL:url];
+ NSLog(@"first: %@", url);
+ if (!loaded_) starturl_ = [url retain];
+ else [self openCydiaURL:url];
}
- (void) applicationWillResignActive:(UIApplication *)application {
}
- (void) applicationDidFinishLaunching:(id)unused {
+_trace();
[CYBrowserController _initialize];
[NSURLProtocol registerClass:[CydiaURLProtocol class]];
[self reloadData];
PrintTimes();
- // Show the home page
- [tabbar_ setSelectedIndex:0];
- _setHomePage(self);
+ // Show the initial page
+ if (starturl_ == nil || ![self openCydiaURL:starturl_]) {
+ [tabbar_ setSelectedIndex:0];
+ _setHomePage(self);
+ }
+
+ [starturl_ release];
+ starturl_ = nil;
+
[window_ setUserInteractionEnabled:YES];
// XXX: does this actually slow anything down?
if (Settings_ != nil)
Role_ = [Settings_ objectForKey:@"Role"];
- if (Packages_ == nil) {
- Packages_ = [[[NSMutableDictionary alloc] initWithCapacity:128] autorelease];
- [Metadata_ setObject:Packages_ forKey:@"Packages"];
- }
-
if (Sections_ == nil) {
Sections_ = [[[NSMutableDictionary alloc] initWithCapacity:32] autorelease];
[Metadata_ setObject:Sections_ forKey:@"Sections"];
}
/* }}} */
+ _trace();
+ MetaFile_.Open("/var/lib/cydia/metadata.cb0");
+ _trace();
+
+ if (Packages_ != nil) {
+ CFDictionaryApplyFunction((CFDictionaryRef) Packages_, &PackageImport, NULL);
+ _trace();
+ [Metadata_ removeObjectForKey:@"Packages"];
+ Packages_ = nil;
+ Changed_ = true;
+ }
+
Finishes_ = [NSArray arrayWithObjects:@"return", @"reopen", @"restart", @"reload", @"reboot", nil];
if (substrate && access("/Library/MobileSubstrate/DynamicLibraries/SimulatedKeyEvents.dylib", F_OK) == 0)
projects / cydia.git / blobdiff