/* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2013 Jay Freeman (saurik)
+ * Copyright (C) 2008-2014 Jay Freeman (saurik)
*/
/* GNU General Public License, Version 3 {{{ */
#include "CyteKit/UCPlatform.h"
#include "CyteKit/Localize.h"
+#include <unicode/ustring.h>
+#include <unicode/utrans.h>
+
#include <objc/objc.h>
#include <objc/runtime.h>
#include <CoreFoundation/CFInternal.h>
#endif
-#include <CoreFoundation/CFPriv.h>
#include <CoreFoundation/CFUniChar.h>
#include <SystemConfiguration/SystemConfiguration.h>
#include <algorithm>
#include <iomanip>
+#include <set>
#include <sstream>
#include <string>
void Print() {
if (total_ != 0)
- std::cerr << std::setw(5) << count_ << ", " << std::setw(7) << total_ << " : " << name_ << std::endl;
+ std::cerr << std::setw(7) << count_ << ", " << std::setw(8) << total_ << " : " << name_ << std::endl;
total_ = 0;
count_ = 0;
}
#define ForRelease 1
#define TraceLogging (1 && !ForRelease)
-#define HistogramInsertionSort (!ForRelease ? 0 : 0)
+#define HistogramInsertionSort (0 && !ForRelease)
#define ProfileTimes (0 && !ForRelease)
#define ForSaurik (0 && !ForRelease)
#define LogBrowser (0 && !ForRelease)
#define ManualRefresh (1 && !ForRelease)
#define ShowInternals (0 && !ForRelease)
#define AlwaysReload (0 && !ForRelease)
-#define TryIndexedCollation (0 && !ForRelease)
#if !TraceLogging
#undef _trace
};
// }}}
+struct Root {
+ static bool root_;
+
+ Root(bool real) {
+ _assert(!root_);
+ root_ = true;
+ _trace();
+ _assert(setreuid(real ? 0 : 501, 0) != -1);
+ _assert(setregid(real ? 0 : 501, 0) != -1);
+ }
+
+ ~Root() {
+ root_ = false;
+ _trace();
+ _assert(setregid(501, 501) != -1);
+ _assert(setreuid(501, 501) != -1);
+ }
+
+ operator bool() const {
+ return true;
+ }
+};
+
+bool Root::root_;
+
+#define _root(real) \
+ if (__attribute__((__unused__)) const Root &root = Root(real))
+
static NSString *Colon_;
NSString *Elision_;
static NSString *Error_;
static NSString *Warning_;
static NSString *Cache_;
+#define Cache(file) \
+ [NSString stringWithFormat:@"%@/%s", Cache_, file]
static void (*$SBSSetInterceptsMenuButtonForever)(bool);
/* NSForcedOrderingSearch doesn't work on the iPhone */
static const NSStringCompareOptions MatchCompareOptions_ = NSLiteralSearch | NSCaseInsensitiveSearch;
static const NSStringCompareOptions LaxCompareOptions_ = NSNumericSearch | NSDiacriticInsensitiveSearch | NSWidthInsensitiveSearch | NSCaseInsensitiveSearch;
-static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareLocalized | kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
+static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareNumerically | kCFCompareWidthInsensitive | kCFCompareForcedOrdering;
/* Insertion Sort {{{ */
static _H<NSString> Product_;
static _H<NSString> Safari_;
+static _H<NSLocale> CollationLocale_;
+static _H<NSArray> CollationThumbs_;
+static std::vector<NSInteger> CollationOffset_;
+static _H<NSArray> CollationTitles_;
+static _H<NSArray> CollationStarts_;
+static UTransliterator *CollationTransl_;
+//static Function<NSString *, NSString *> CollationModify_;
+
+typedef std::basic_string<UChar> ustring;
+static ustring CollationString_;
+
+#define CUC const ustring &str(*reinterpret_cast<const ustring *>(rep))
+#define UC ustring &str(*reinterpret_cast<ustring *>(rep))
+static struct UReplaceableCallbacks CollationUCalls_ = {
+ .length = [](const UReplaceable *rep) -> int32_t { CUC;
+ return str.size();
+ },
+
+ .charAt = [](const UReplaceable *rep, int32_t offset) -> UChar { CUC;
+ //fprintf(stderr, "charAt(%d) : %d\n", offset, str.size());
+ if (offset >= str.size())
+ return 0xffff;
+ return str[offset];
+ },
+
+ .char32At = [](const UReplaceable *rep, int32_t offset) -> UChar32 { CUC;
+ //fprintf(stderr, "char32At(%d) : %d\n", offset, str.size());
+ if (offset >= str.size())
+ return 0xffff;
+ UChar32 c;
+ U16_GET(str.data(), 0, offset, str.size(), c);
+ return c;
+ },
+
+ .replace = [](UReplaceable *rep, int32_t start, int32_t limit, const UChar *text, int32_t length) -> void { UC;
+ //fprintf(stderr, "replace(%d, %d, %d) : %d\n", start, limit, length, str.size());
+ str.replace(start, limit - start, text, length);
+ },
+
+ .extract = [](UReplaceable *rep, int32_t start, int32_t limit, UChar *dst) -> void { UC;
+ //fprintf(stderr, "extract(%d, %d) : %d\n", start, limit, str.size());
+ str.copy(dst, limit - start, start);
+ },
+
+ .copy = [](UReplaceable *rep, int32_t start, int32_t limit, int32_t dest) -> void { UC;
+ //fprintf(stderr, "copy(%d, %d, %d) : %d\n", start, limit, dest, str.size());
+ str.replace(dest, 0, str, start, limit - start);
+ },
+};
+
static CFLocaleRef Locale_;
static NSArray *Languages_;
static CGColorSpaceRef space_;
return (end - begin) * fraction + begin;
}
+static inline double Retina(double value) {
+ value *= ScreenScale_;
+ value = round(value);
+ value /= ScreenScale_;
+ return value;
+}
+
+static inline CGRect Retina(CGRect value) {
+ value.origin.x *= ScreenScale_;
+ value.origin.y *= ScreenScale_;
+ value.size.width *= ScreenScale_;
+ value.size.height *= ScreenScale_;
+ value = CGRectIntegral(value);
+ value.origin.x /= ScreenScale_;
+ value.origin.y /= ScreenScale_;
+ value.size.width /= ScreenScale_;
+ value.size.height /= ScreenScale_;
+ return value;
+}
+
static _finline const char *StripVersion_(const char *version) {
const char *colon(strchr(version, ':'));
return colon == NULL ? version : colon + 1;
NSString *Simplify(NSString *title) {
const char *data = [title UTF8String];
- size_t size = [title length];
+ size_t size = [title lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
static Pcre square_r("^\\[(.*)\\]$");
if (square_r(data, size))
@class CYPackageController;
+@protocol SourceDelegate
+- (void) setFetch:(NSNumber *)fetch;
+@end
+
+@protocol FetchDelegate
+- (bool) isSourceCancelled;
+- (void) startSourceFetch:(NSString *)uri;
+- (void) stopSourceFetch:(NSString *)uri;
+@end
+
@protocol CydiaDelegate
- (void) returnToCydia;
- (void) saveState;
- (void) removePackage:(Package *)package;
- (void) beginUpdate;
- (BOOL) updating;
+- (bool) requestUpdate;
- (void) distUpgrade;
- (void) loadData;
- (void) updateData;
@end
/* }}} */
-/* Status Delegation {{{ */
-class Status :
+/* CancelStatus {{{ */
+class CancelStatus :
public pkgAcquireStatus
{
private:
- _transient NSObject<ProgressDelegate> *delegate_;
bool cancelled_;
public:
- Status() :
- delegate_(nil),
+ CancelStatus() :
cancelled_(false)
{
}
- void setDelegate(NSObject<ProgressDelegate> *delegate) {
- delegate_ = delegate;
+ virtual bool MediaChange(std::string media, std::string drive) {
+ return false;
}
- NSObject<ProgressDelegate> *getDelegate() const {
- return delegate_;
+ virtual void IMSHit(pkgAcquire::ItemDesc &desc) {
+ Done(desc);
}
- virtual bool MediaChange(std::string media, std::string drive) {
- return false;
+ virtual bool Pulse_(pkgAcquire *Owner) = 0;
+
+ virtual bool Pulse(pkgAcquire *Owner) {
+ if (pkgAcquireStatus::Pulse(Owner) && Pulse_(Owner))
+ return true;
+ else {
+ cancelled_ = true;
+ return false;
+ }
+ }
+
+ _finline bool WasCancelled() const {
+ return cancelled_;
+ }
+};
+/* }}} */
+/* DelegateStatus {{{ */
+class CydiaStatus :
+ public CancelStatus
+{
+ private:
+ _transient NSObject<ProgressDelegate> *delegate_;
+
+ public:
+ CydiaStatus() :
+ delegate_(nil)
+ {
}
- virtual void IMSHit(pkgAcquire::ItemDesc &item) {
- Done(item);
+ void setDelegate(NSObject<ProgressDelegate> *delegate) {
+ delegate_ = delegate;
}
- virtual void Fetch(pkgAcquire::ItemDesc &item) {
- NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]);
+ virtual void Fetch(pkgAcquire::ItemDesc &desc) {
+ NSString *name([NSString stringWithUTF8String:desc.ShortDesc.c_str()]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:UCLocalize("DOWNLOADING_"), name] ofType:kCydiaProgressEventTypeStatus forItemDesc:desc]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
- virtual void Done(pkgAcquire::ItemDesc &item) {
- NSString *name([NSString stringWithUTF8String:item.ShortDesc.c_str()]);
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:Colon_, UCLocalize("DONE"), name] ofType:kCydiaProgressEventTypeStatus forItem:item]);
+ virtual void Done(pkgAcquire::ItemDesc &desc) {
+ NSString *name([NSString stringWithUTF8String:desc.ShortDesc.c_str()]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithFormat:Colon_, UCLocalize("DONE"), name] ofType:kCydiaProgressEventTypeStatus forItemDesc:desc]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
- virtual void Fail(pkgAcquire::ItemDesc &item) {
+ virtual void Fail(pkgAcquire::ItemDesc &desc) {
if (
- item.Owner->Status == pkgAcquire::Item::StatIdle ||
- item.Owner->Status == pkgAcquire::Item::StatDone
+ desc.Owner->Status == pkgAcquire::Item::StatIdle ||
+ desc.Owner->Status == pkgAcquire::Item::StatDone
)
return;
- std::string &error(item.Owner->ErrorText);
+ std::string &error(desc.Owner->ErrorText);
if (error.empty())
return;
- CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:kCydiaProgressEventTypeError forItem:item]);
+ CydiaProgressEvent *event([CydiaProgressEvent eventWithMessage:[NSString stringWithUTF8String:error.c_str()] ofType:kCydiaProgressEventTypeError forItemDesc:desc]);
[delegate_ performSelectorOnMainThread:@selector(addProgressEvent:) withObject:event waitUntilDone:YES];
}
- virtual bool Pulse(pkgAcquire *Owner) {
- bool value = pkgAcquireStatus::Pulse(Owner);
-
+ virtual bool Pulse_(pkgAcquire *Owner) {
double percent(
double(CurrentBytes + CurrentItems) /
double(TotalBytes + TotalItems)
[NSNumber numberWithDouble:CurrentCPS], @"Speed",
nil] waitUntilDone:YES];
- if (value && ![delegate_ isProgressCancelled])
- return true;
- else {
- cancelled_ = true;
- return false;
- }
- }
-
- _finline bool WasCancelled() const {
- return cancelled_;
+ return ![delegate_ isProgressCancelled];
}
virtual void Start() {
_transient NSObject<DatabaseDelegate> *delegate_;
_transient NSObject<ProgressDelegate> *progress_;
- Status status_;
+ CydiaStatus status_;
int cydiafd_;
int statusfd_;
- (bool) upgrade;
- (void) update;
-- (void) updateWithStatus:(Status &)status;
+- (void) updateWithStatus:(CancelStatus &)status;
- (void) setDelegate:(NSObject<DatabaseDelegate> *)delegate;
- (NSObject<ProgressDelegate> *) progressDelegate;
- (Source *) getSource:(pkgCache::PkgFileIterator)file;
+- (void) setFetch:(bool)fetch forURI:(const char *)uri;
+- (void) resetFetch;
- (NSString *) mappedSectionForPointer:(const char *)pointer;
@end
/* }}} */
+/* SourceStatus {{{ */
+class SourceStatus :
+ public CancelStatus
+{
+ private:
+ _transient NSObject<FetchDelegate> *delegate_;
+ _transient Database *database_;
+ std::set<std::string> fetches_;
+
+ public:
+ SourceStatus(NSObject<FetchDelegate> *delegate, Database *database) :
+ delegate_(delegate),
+ database_(database)
+ {
+ }
+
+ void Set(bool fetch, const std::string &uri) {
+ if (fetch) {
+ if (!fetches_.insert(uri).second)
+ return;
+ } else {
+ if (fetches_.erase(uri) == 0)
+ return;
+ }
+
+ //printf("Set(%s, %s)\n", fetch ? "true" : "false", uri.c_str());
+ [database_ setFetch:fetch forURI:uri.c_str()];
+ }
+
+ _finline void Set(bool fetch, pkgAcquire::Item *item) {
+ /*unsigned long ID(fetch ? 1 : 0);
+ if (item->ID == ID)
+ return;
+ item->ID = ID;*/
+ Set(fetch, item->DescURI());
+ }
+
+ void Log(const char *tag, pkgAcquire::Item *item) {
+ //printf("%s(%s) S:%u Q:%u\n", tag, item->DescURI().c_str(), item->Status, item->QueueCounter);
+ }
+
+ virtual void Fetch(pkgAcquire::ItemDesc &desc) {
+ Log("Fetch", desc.Owner);
+ Set(true, desc.Owner);
+ }
+
+ virtual void Done(pkgAcquire::ItemDesc &desc) {
+ Log("Done", desc.Owner);
+ Set(false, desc.Owner);
+ }
+
+ virtual void Fail(pkgAcquire::ItemDesc &desc) {
+ Log("Fail", desc.Owner);
+ Set(false, desc.Owner);
+ }
+
+ virtual bool Pulse_(pkgAcquire *Owner) {
+ std::set<std::string> fetches;
+ for (pkgAcquire::ItemCIterator item(Owner->ItemsBegin()); item != Owner->ItemsEnd(); ++item) {
+ bool fetch;
+ if ((*item)->QueueCounter == 0)
+ fetch = false;
+ else switch ((*item)->Status) {
+ case pkgAcquire::Item::StatFetching:
+ fetches.insert((*item)->DescURI());
+ fetch = true;
+ break;
+
+ default:
+ fetch = false;
+ break;
+ }
+
+ Log(fetch ? "Pulse<true>" : "Pulse<false>", *item);
+ Set(fetch, *item);
+ }
+
+ std::vector<std::string> stops;
+ std::set_difference(fetches_.begin(), fetches_.end(), fetches.begin(), fetches.end(), std::back_insert_iterator<std::vector<std::string>>(stops));
+ for (std::vector<std::string>::const_iterator stop(stops.begin()); stop != stops.end(); ++stop) {
+ //printf("Stop(%s)\n", stop->c_str());
+ Set(false, *stop);
+ }
+
+ return ![delegate_ isSourceCancelled];
+ }
+
+ virtual void Stop() {
+ pkgAcquireStatus::Stop();
+ [database_ resetFetch];
+ }
+};
+/* }}} */
/* ProgressEvent Implementation {{{ */
@implementation CydiaProgressEvent
return event;
}
-+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItem:(pkgAcquire::ItemDesc &)item {
++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItemDesc:(pkgAcquire::ItemDesc &)desc {
CydiaProgressEvent *event([self eventWithMessage:message ofType:type]);
- NSString *description([NSString stringWithUTF8String:item.Description.c_str()]);
+ NSString *description([NSString stringWithUTF8String:desc.Description.c_str()]);
NSArray *fields([description componentsSeparatedByString:@" "]);
[event setItem:fields];
[event setVersion:[fields objectAtIndex:3]];
}
- [event setURL:[NSString stringWithUTF8String:item.URI.c_str()]];
+ [event setURL:[NSString stringWithUTF8String:desc.URI.c_str()]];
return event;
}
PackageValue *metadata;
Cytore::Offset<PackageValue> *offset(&MetaFile_->packages_[nhash.u16[0]]);
- offset: if (offset->IsNull()) {
+ for (;; offset = &metadata->next_) { if (offset->IsNull()) {
*offset = MetaFile_.New<PackageValue>(length + 1);
metadata = &MetaFile_.Get(*offset);
memset(metadata, 0, sizeof(*metadata));
}
- memcpy(metadata->name_, name, length + 1);
+ memcpy(metadata->name_, name, length);
+ metadata->name_[length] = '\0';
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;
- }
- }
+ if (metadata->nhash_ != nhash.u16[1])
+ continue;
+ if (strncmp(metadata->name_, name, length) != 0)
+ continue;
+ if (metadata->name_[length] != '\0')
+ continue;
+ } break; }
return metadata;
}
_H<NSMutableDictionary> record_;
BOOL trusted_;
+
+ std::set<std::string> fetches_;
+ std::set<std::string> files_;
+ _transient NSObject<SourceDelegate> *delegate_;
}
- (Source *) initWithMetaIndex:(metaIndex *)index forDatabase:(Database *)database inPool:(apr_pool_t *)pool;
- (NSString *) defaultIcon;
- (NSURL *) iconURL;
+- (void) setFetch:(bool)fetch forURI:(const char *)uri;
+- (void) resetFetch;
+
@end
@implementation Source
debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
if (dindex != NULL) {
- base_.set(pool, dindex->MetaIndexURI(""));
+ std::string file(dindex->MetaIndexURI(""));
+ base_.set(pool, file);
+
+ pkgAcquire acquire;
+ _profile(Source$setMetaIndex$GetIndexes)
+ dindex->GetIndexes(&acquire, true);
+ _end
+ _profile(Source$setMetaIndex$DescURI)
+ for (pkgAcquire::ItemIterator item(acquire.ItemsBegin()); item != acquire.ItemsEnd(); item++) {
+ std::string file((*item)->DescURI());
+ files_.insert(file);
+ if (file.length() < sizeof("Packages.bz2") || file.substr(file.length() - sizeof("Packages.bz2")) != "/Packages.bz2")
+ continue;
+ file = file.substr(0, file.length() - 4);
+ files_.insert(file);
+ files_.insert(file + ".gz");
+ files_.insert(file + "Index");
+ }
+ _end
FileFd fd;
if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
database_ = database;
index_ = index;
+ _profile(Source$initWithMetaIndex$setMetaIndex)
[self setMetaIndex:index inPool:pool];
+ _end
} return self;
}
return defaultIcon_;
}
+- (void) setDelegate:(NSObject<SourceDelegate> *)delegate {
+ delegate_ = delegate;
+}
+
+- (bool) fetch {
+ return !fetches_.empty();
+}
+
+- (void) setFetch:(bool)fetch forURI:(const char *)uri {
+ if (!fetch) {
+ if (fetches_.erase(uri) == 0)
+ return;
+ } else if (files_.find(uri) == files_.end())
+ return;
+ else if (!fetches_.insert(uri).second)
+ return;
+
+ [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:[self fetch]] waitUntilDone:NO];
+}
+
+- (void) resetFetch {
+ fetches_.clear();
+ [delegate_ performSelectorOnMainThread:@selector(setFetch:) withObject:[NSNumber numberWithBool:NO] waitUntilDone:NO];
+}
+
@end
/* }}} */
/* CydiaOperation Class {{{ */
@interface Package : NSObject {
uint32_t era_ : 25;
- uint32_t role_ : 3;
+ @public uint32_t role_ : 3;
uint32_t essential_ : 1;
uint32_t obsolete_ : 1;
uint32_t ignored_ : 1;
CYString id_;
CYString name_;
+ CYString transform_;
CYString latest_;
CYString installed_;
+ time_t upgraded_;
const char *section_;
_transient NSString *section$_;
- (void) install;
- (void) remove;
-- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query;
-- (bool) isUnfilteredAndSelectedForBy:(NSString *)search;
-- (bool) isInstalledAndUnfiltered:(NSNumber *)number;
-- (bool) isVisibleInSection:(NSString *)section source:(Source *)source;
-- (bool) isVisibleInSource:(Source *)source;
-
@end
uint32_t PackageChangesRadix(Package *self, void *) {
return _not(uint32_t) - value.key;
}
+CYString &(*PackageName)(Package *self, SEL sel);
+
uint32_t PackagePrefixRadix(Package *self, void *context) {
size_t offset(reinterpret_cast<size_t>(context));
- CYString &name([self cyname]);
+ CYString &name(PackageName(self, @selector(cyname)));
size_t size(name.size());
if (size == 0)
return OSSwapInt32(*reinterpret_cast<uint32_t *>(data));
}
-CYString &(*PackageName)(Package *self, SEL sel);
-
-CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) {
+CFComparisonResult StringNameCompare(CFStringRef lhn, CFStringRef rhn, size_t length) {
_profile(PackageNameCompare)
- CYString &lhi(PackageName(lhs, @selector(cyname)));
- CYString &rhi(PackageName(rhs, @selector(cyname)));
- CFStringRef lhn(lhi), rhn(rhi);
-
if (lhn == NULL)
- return rhn == NULL ? NSOrderedSame : NSOrderedAscending;
+ return rhn == NULL ? kCFCompareEqualTo : kCFCompareLessThan;
else if (rhn == NULL)
- return NSOrderedDescending;
+ return kCFCompareGreaterThan;
+
+ CFIndex length(CFStringGetLength(lhn));
_profile(PackageNameCompare$NumbersLast)
- if (!lhi.empty() && !rhi.empty()) {
+ if (length != 0 && CFStringGetLength(rhn) != 0) {
UniChar lhc(CFStringGetCharacterAtIndex(lhn, 0));
UniChar rhc(CFStringGetCharacterAtIndex(rhn, 0));
bool lha(CFUniCharIsMemberOf(lhc, kCFUniCharLetterCharacterSet));
if (lha != CFUniCharIsMemberOf(rhc, kCFUniCharLetterCharacterSet))
- return lha ? NSOrderedAscending : NSOrderedDescending;
+ return lha ? kCFCompareLessThan : kCFCompareGreaterThan;
}
_end
- CFIndex length = CFStringGetLength(lhn);
-
_profile(PackageNameCompare$Compare)
- return CFStringCompareWithOptionsAndLocale(lhn, rhn, CFRangeMake(0, length), LaxCompareFlags_, Locale_);
+ return CFStringCompareWithOptionsAndLocale(lhn, rhn, CFRangeMake(0, length), LaxCompareFlags_, (CFLocaleRef) (id) CollationLocale_);
_end
_end
}
-CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *context) {
- return PackageNameCompare(*lhs, *rhs, context);
+_finline CFComparisonResult StringNameCompare(NSString *lhn, NSString*rhn, size_t length) {
+ return StringNameCompare((CFStringRef) lhn, (CFStringRef) rhn, length);
+}
+
+CFComparisonResult PackageNameCompare(Package *lhs, Package *rhs, void *arg) {
+ CYString &lhn(PackageName(lhs, @selector(cyname)));
+ NSString *rhn(PackageName(rhs, @selector(cyname)));
+ return StringNameCompare(lhn, rhn, lhn.size());
+}
+
+CFComparisonResult PackageNameCompare_(Package **lhs, Package **rhs, void *arg) {
+ return PackageNameCompare(*lhs, *rhs, arg);
}
struct PackageNameOrdering :
std::binary_function<Package *, Package *, bool>
{
_finline bool operator ()(Package *lhs, Package *rhs) const {
- return PackageNameCompare(lhs, rhs, NULL) == NSOrderedAscending;
+ return PackageNameCompare(lhs, rhs, NULL) == kCFCompareLessThan;
}
};
@"state",
@"support",
@"tags",
+ @"upgraded",
@"warnings",
nil];
}
installed_.set(NULL, StripVersion_(current.VerStr()));
_end
+ _profile(Package$initWithVersion$Transliterate) do {
+ if (CollationTransl_ == NULL)
+ break;
+ if (name_.empty())
+ break;
+
+ _profile(Package$initWithVersion$Transliterate$utf8)
+ const uint8_t *data(reinterpret_cast<const uint8_t *>(name_.data()));
+ for (size_t i(0), e(name_.size()); i != e; ++i)
+ if (data[i] >= 0x80)
+ goto extended;
+ break; extended:;
+ _end
+
+ UErrorCode code(U_ZERO_ERROR);
+ int32_t length;
+
+ _profile(Package$initWithVersion$Transliterate$u_strFromUTF8WithSub)
+ CollationString_.resize(name_.size());
+ u_strFromUTF8WithSub(&CollationString_[0], CollationString_.size(), &length, name_.data(), name_.size(), 0xfffd, NULL, &code);
+ if (!U_SUCCESS(code))
+ break;
+ CollationString_.resize(length);
+ _end
+
+ _profile(Package$initWithVersion$Transliterate$utrans_trans)
+ length = CollationString_.size();
+ utrans_trans(CollationTransl_, reinterpret_cast<UReplaceable *>(&CollationString_), &CollationUCalls_, 0, &length, &code);
+ if (!U_SUCCESS(code))
+ break;
+ _assert(CollationString_.size() == length);
+ _end
+
+ _profile(Package$initWithVersion$Transliterate$u_strToUTF8WithSub$preflight)
+ u_strToUTF8WithSub(NULL, 0, &length, CollationString_.data(), CollationString_.size(), 0xfffd, NULL, &code);
+ if (code == U_BUFFER_OVERFLOW_ERROR)
+ code = U_ZERO_ERROR;
+ else if (!U_SUCCESS(code))
+ break;
+ _end
+
+ char *transform;
+ _profile(Package$initWithVersion$Transliterate$apr_palloc)
+ transform = static_cast<char *>(apr_palloc(pool_, length));
+ _end
+ _profile(Package$initWithVersion$Transliterate$u_strToUTF8WithSub$transform)
+ u_strToUTF8WithSub(transform, length, NULL, CollationString_.data(), CollationString_.size(), 0xfffd, NULL, &code);
+ if (!U_SUCCESS(code))
+ break;
+ _end
+
+ transform_.set(NULL, transform, length);
+ } while (false); _end
+
_profile(Package$initWithVersion$Tags)
pkgCache::TagIterator tag(iterator.TagList());
if (!tag.end()) {
_profile(Package$initWithVersion$Metadata)
const char *mixed(iterator.Name());
size_t size(strlen(mixed));
- char lower[size + 1];
+ static const size_t prefix(sizeof("/var/lib/dpkg/info/") - 1);
+ char lower[prefix + size + 5 + 1];
for (size_t i(0); i != size; ++i)
- lower[i] = mixed[i] | 0x20;
- lower[size] = '\0';
+ lower[prefix + i] = mixed[i] | 0x20;
+
+ if (!installed_.empty()) {
+ memcpy(lower, "/var/lib/dpkg/info/", prefix);
+ memcpy(lower + prefix + size, ".list", 6);
+ struct stat info;
+ if (stat(lower, &info) != -1)
+ upgraded_ = info.st_birthtime;
+ }
- PackageValue *metadata(PackageFind(lower, size));
+ PackageValue *metadata(PackageFind(lower + prefix, size));
metadata_ = metadata;
id_.set(NULL, metadata->name_, size);
- (BOOL) hasMode {
@synchronized (database_) {
if ([database_ era] != era_ || iterator_.end())
- return nil;
+ return NO;
pkgDepCache::StateCache &state([database_ cache][iterator_]);
return state.Mode != pkgDepCache::ModeKeep;
if ([dicon hasPrefix:@"file:///"])
icon = [UIImage imageAtPath:[[dicon substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
if (icon == nil)
- icon = [UIImage applicationImageNamed:@"unknown.png"];
+ icon = [UIImage imageNamed:@"unknown.png"];
return icon;
}
bool user = false;
bool _private = false;
bool stash = false;
+ bool dsstore = false;
bool repository = [[self section] isEqualToString:@"Repositories"];
_private = true;
else if (!stash && [file isEqualToString:@"/var/stash"])
stash = true;
+ else if (!dsstore && [file hasSuffix:@"/.DS_Store"])
+ dsstore = true;
/* XXX: this is not sensitive enough. only some folders are valid. */
if (cydia && !repository)
[warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/private"]];
if (stash)
[warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @"/var/stash"]];
+ if (dsstore)
+ [warnings addObject:[NSString stringWithFormat:UCLocalize("FILES_INSTALLED_TO"), @".DS_Store"]];
}
return [warnings count] == 0 ? nil : warnings;
return source_ == (Source *) [NSNull null] ? nil : source_;
}
+- (time_t) upgraded {
+ return upgraded_;
+}
+
+- (uint32_t) recent {
+ return std::numeric_limits<uint32_t>::max() - upgraded_;
+}
+
- (uint32_t) rank {
return rank_;
}
string = [self name];
length = [string length];
+ if (length != 0)
for (NSString *term in query) {
range = [string rangeOfString:term options:MatchCompareOptions_];
if (range.location != NSNotFound)
string = [self id];
length = [string length];
+ if (length != 0)
for (NSString *term in query) {
range = [string rangeOfString:term options:MatchCompareOptions_];
if (range.location != NSNotFound)
length = [string length];
NSUInteger stop(std::min<NSUInteger>(length, 200));
+ if (length != 0)
for (NSString *term in query) {
range = [string rangeOfString:term options:MatchCompareOptions_ range:NSMakeRange(0, stop)];
if (range.location != NSNotFound)
}
- (CYString &) cyname {
- return name_.empty() ? id_ : name_;
+ return !transform_.empty() ? transform_ : !name_.empty() ? name_ : id_;
}
- (uint32_t) compareBySection:(NSArray *)sections {
cache->MarkDelete(iterator_, true);
} }
-- (bool) isUnfilteredAndSearchedForBy:(NSArray *)query {
- _profile(Package$isUnfilteredAndSearchedForBy)
- bool value(true);
-
- _profile(Package$isUnfilteredAndSearchedForBy$Unfiltered)
- value &= [self unfiltered];
- _end
-
- _profile(Package$isUnfilteredAndSearchedForBy$Match)
- value &= [self matches:query];
- _end
-
- return value;
- _end
-}
-
-- (bool) isUnfilteredAndSelectedForBy:(NSString *)search {
- if ([search length] == 0)
- return false;
-
- _profile(Package$isUnfilteredAndSelectedForBy)
- bool value(true);
-
- _profile(Package$isUnfilteredAndSelectedForBy$Unfiltered)
- value &= [self unfiltered];
- _end
-
- _profile(Package$isUnfilteredAndSelectedForBy$Match)
- value &= [[self name] compare:search options:MatchCompareOptions_ range:NSMakeRange(0, [search length])] == NSOrderedSame;
- _end
-
- return value;
- _end
-}
-
-- (bool) isInstalledAndUnfiltered:(NSNumber *)number {
- return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]);
-}
-
-- (bool) isVisibleInSection:(NSString *)name source:(Source *)source {
- NSString *section([self section]);
-
- return (
- name == nil ||
- section == nil && [name length] == 0 ||
- [name isEqualToString:section]
- ) && (
- source == nil ||
- [self source] == source
- ) && [self visible];
-}
-
-- (bool) isVisibleInSource:(Source *)source {
- return [self source] == source && [self visible];
-}
-
@end
/* }}} */
/* Section Class {{{ */
@interface Section : NSObject {
_H<NSString> name_;
- unichar index_;
size_t row_;
size_t count_;
_H<NSString> localized_;
- (Section *) initWithName:(NSString *)name localized:(NSString *)localized;
- (Section *) initWithName:(NSString *)name localize:(BOOL)localize;
- (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize;
-- (Section *) initWithIndex:(unichar)index row:(size_t)row;
+
- (NSString *) name;
-- (unichar) index;
+- (void) setName:(NSString *)name;
- (size_t) row;
- (size_t) count;
- (Section *) initWithName:(NSString *)name row:(size_t)row localize:(BOOL)localize {
if ((self = [super init]) != nil) {
name_ = name;
- index_ = '\0';
row_ = row;
if (localize)
localized_ = LocalizeSection(name_);
} return self;
}
-/* XXX: localize the index thingees */
-- (Section *) initWithIndex:(unichar)index row:(size_t)row {
- if ((self = [super init]) != nil) {
- name_ = [NSString stringWithCharacters:&index length:1];
- index_ = index;
- row_ = row;
- } return self;
-}
-
- (NSString *) name {
return name_;
}
-- (unichar) index {
- return index_;
+- (void) setName:(NSString *)name {
+ name_ = name;
}
- (size_t) row {
NSString *title(UCLocalize("DATABASE"));
list_ = new pkgSourceList();
+ _profile(reloadDataWithInvocation$ReadMainList)
if ([self popErrorWithTitle:title forOperation:list_->ReadMainList()])
return;
+ _end
+ _profile(reloadDataWithInvocation$Source$initWithMetaIndex)
for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
Source *object([[[Source alloc] initWithMetaIndex:*source forDatabase:self inPool:pool_] autorelease]);
[sourceList_ addObject:object];
}
+ _end
+
+ _root(true) _system->Lock();
_trace();
OpProgress progress;
+ bool opened;
open:
- if (!cache_.Open(progress, true)) {
+ _profile(reloadDataWithInvocation$pkgCacheFile)
+ opened = cache_.Open(progress, false);
+ _end
+ if (!opened) {
// XXX: what if there are errors, but Open() == true? this should be merged with popError:
while (!_error->empty()) {
std::string error;
}
}
+ _system->UnLock();
return;
}
_trace();
return;
}
+ _profile(reloadDataWithInvocation$pkgApplyStatus)
if ([self popErrorWithTitle:title forOperation:pkgApplyStatus(cache_)])
return;
+ _end
if (cache_->BrokenCount() != 0) {
+ _profile(pkgApplyStatus$pkgFixBroken)
if ([self popErrorWithTitle:title forOperation:pkgFixBroken(cache_)])
return;
+ _end
if (cache_->BrokenCount() != 0) {
[delegate_ addProgressEventOnMainThread:[CydiaProgressEvent eventWithMessage:UCLocalize("STILL_BROKEN_EX") ofType:kCydiaProgressEventTypeError] forTask:title];
return;
}
+ _profile(pkgApplyStatus$pkgMinimizeUpgrade)
if ([self popErrorWithTitle:title forOperation:pkgMinimizeUpgrade(cache_)])
return;
+ _end
}
for (Source *object in (id) sourceList_) {
packages.reserve(std::max(10000U, [packages_ count] + 1000));
packages_ = nil;*/
- _trace();
-
+ _profile(reloadDataWithInvocation$packageWithIterator)
for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self])
//packages.push_back(package);
CFArrayAppendValue(packages_, CFRetain(package));
+ _end
- _trace();
/*if (packages.empty())
packages_ = [[NSArray alloc] init];
packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()];
_trace();*/
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(16)];
+ _profile(reloadDataWithInvocation$radix$8)
+ [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(8)];
+ _end
+
+ _profile(reloadDataWithInvocation$radix$4)
[(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(4)];
- [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];
+ _end
- /*_trace();
- PrintTimes();
- _trace();*/
+ _profile(reloadDataWithInvocation$radix$0)
+ [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackagePrefixRadix) withContext:reinterpret_cast<void *>(0)];
+ _end
- _trace();
+ _profile(reloadDataWithInvocation$insertion)
+ CFArrayInsertionSortValues(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare), NULL);
+ _end
- /*if (!packages.empty())
- CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare_), NULL);*/
- //std::sort(packages.begin(), packages.end(), PackageNameOrdering());
+ /*_profile(reloadDataWithInvocation$CFQSortArray)
+ CFQSortArray(&packages.front(), packages.size(), sizeof(packages.front()), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare_), NULL);
+ _end*/
- //CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare), NULL);
+ /*_profile(reloadDataWithInvocation$stdsort)
+ std::sort(packages.begin(), packages.end(), PackageNameOrdering());
+ _end*/
- CFArrayInsertionSortValues(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare), NULL);
+ /*_profile(reloadDataWithInvocation$CFArraySortValues)
+ CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast<CFComparatorFunction>(&PackageNameCompare), NULL);
+ _end*/
- //[packages_ sortUsingFunction:reinterpret_cast<NSComparisonResult (*)(id, id, void *)>(&PackageNameCompare) context:NULL];
+ /*_profile(reloadDataWithInvocation$sortUsingFunction)
+ [packages_ sortUsingFunction:reinterpret_cast<NSComparisonResult (*)(id, id, void *)>(&PackageNameCompare) context:NULL];
+ _end*/
- _trace();
size_t count(CFArrayGetCount(packages_));
MetaFile_->active_ = count;
-
for (size_t index(0); index != count; ++index)
[(Package *) CFArrayGetValueAtIndex(packages_, index) setIndex:index];
-
- _trace();
}
} }
- (void) configure {
NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_];
_trace();
- system([dpkg UTF8String]);
+ _root(true) system([dpkg UTF8String]);
_trace();
}
RestartSubstrate_ = true;
_system->UnLock();
- pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_);
+ pkgPackageManager::OrderResult result;
+ _root(true) result = manager_->DoInstall(statusfd_);
if ([self popErrorWithTitle:title])
return;
[self updateWithStatus:status_];
}
-- (void) updateWithStatus:(Status &)status {
+- (void) updateWithStatus:(CancelStatus &)status {
NSString *title(UCLocalize("REFRESHING_DATA"));
pkgSourceList list;
return i == sourceMap_.end() ? nil : i->second;
}
+- (void) setFetch:(bool)fetch forURI:(const char *)uri {
+ for (Source *source in (id) sourceList_)
+ [source setFetch:fetch forURI:uri];
+}
+
+- (void) resetFetch {
+ for (Source *source in (id) sourceList_)
+ [source resetFetch];
+}
+
- (NSString *) mappedSectionForPointer:(const char *)section {
_H<NSString> *mapped;
_assert(close(fds[0]) != -1);
_assert(close(fds[1]) != -1);
/* XXX: this should probably not use du */
- execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL);
+ _root(true) execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL);
exit(1);
} else {
_assert(close(fds[1]) != -1);
reason = @"virtual";
}
- NSDictionary *version(start.TargetVer() == 0 ? [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys:
+ NSDictionary *version(start.TargetVer() == 0 ? (NSDictionary *) [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithUTF8String:start.CompType()], @"operator",
[NSString stringWithUTF8String:start.TargetVer()], @"value",
nil]);
pid_t pid(ExecFork());
if (pid == 0) {
- execl("/usr/bin/sbreload", "sbreload", NULL);
+ _root(true) execl("/usr/bin/sbreload", "sbreload", NULL);
perror("sbreload");
exit(0);
rect.origin.x = 19 - rect.size.width / 2;
rect.origin.y = 19 - rect.size.height / 2;
- [icon_ drawInRect:rect];
+ [icon_ drawInRect:Retina(rect)];
}
if (badge_ != nil) {
rect.origin.x = 25 - rect.size.width / 2;
rect.origin.y = 25 - rect.size.height / 2;
- [badge_ drawInRect:rect];
+ [badge_ drawInRect:Retina(rect)];
}
if (highlighted && kCFCoreFoundationVersionNumber < 800)
if (!highlighted)
UISetColor(commercial_ ? Purple_ : Black_);
- [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+ [name_ drawAtPoint:CGPointMake(36, 8) forWidth:(width - (placard_ == nil ? 68 : 94)) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail];
if (placard_ != nil)
[placard_ drawAtPoint:CGPointMake(width - 52, 11)];
rect.origin.x = 25 - rect.size.width / 2;
rect.origin.y = 25 - rect.size.height / 2;
- [icon_ drawInRect:rect];
+ [icon_ drawInRect:Retina(rect)];
}
if (badge_ != nil) {
rect.origin.x = 36 - rect.size.width / 2;
rect.origin.y = 36 - rect.size.height / 2;
- [badge_ drawInRect:rect];
+ [badge_ drawInRect:Retina(rect)];
}
if (highlighted && kCFCoreFoundationVersionNumber < 800)
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];
+ [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail];
+ [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:NSLineBreakByTruncatingTail];
if (!highlighted)
UISetColor(commercial_ ? Purplish_ : Gray_);
- [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];
+ [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:NSLineBreakByTruncatingTail];
if (placard_ != nil)
[placard_ drawAtPoint:CGPointMake(width - 52, 9)];
- (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) {
- icon_ = [UIImage applicationImageNamed:@"folder.png"];
+ icon_ = [UIImage imageNamed:@"folder.png"];
// XXX: this initial frame is wrong, but is fixed later
switch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)] autorelease];
[switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged];
section_ = [section localized];
name_ = section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : (NSString *) section_;
- count_ = [NSString stringWithFormat:@"%d", [section count]];
+ count_ = [NSString stringWithFormat:@"%zd", [section count]];
if (editing_)
[switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO];
if (!highlighted)
UISetColor(Black_);
- [name_ drawAtPoint:CGPointMake(48, 12) forWidth:(width - 58) withFont:Font18_ lineBreakMode:UILineBreakModeTailTruncation];
+ [name_ drawAtPoint:CGPointMake(48, 12) forWidth:(width - 58) withFont:Font18_ lineBreakMode:NSLineBreakByTruncatingTail];
CGSize size = [count_ sizeWithFont:Font14_];
UISetColor(Folder_);
if (count_ != nil)
- [count_ drawAtPoint:CGPointMake(10 + (30 - size.width) / 2, 18) withFont:Font12Bold_];
+ [count_ drawAtPoint:CGPointMake(Retina(10 + (30 - size.width) / 2), 18) withFont:Font12Bold_];
}
@end
_H<Package> package_;
_H<NSString> name_;
bool commercial_;
- _H<NSMutableArray> buttons_;
+ std::vector<std::pair<_H<NSString>, _H<NSString>>> buttons_;
_H<UIBarButtonItem> button_;
}
return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", (id) name_]];
}
-/* XXX: this is not safe at all... localization of /fail/ */
- (void) _clickButtonWithName:(NSString *)name {
- if ([name isEqualToString:UCLocalize("CLEAR")])
+ if ([name isEqualToString:@"CLEAR"])
[delegate_ clearPackage:package_];
- else if ([name isEqualToString:UCLocalize("INSTALL")])
+ else if ([name isEqualToString:@"INSTALL"])
[delegate_ installPackage:package_];
- else if ([name isEqualToString:UCLocalize("REINSTALL")])
+ else if ([name isEqualToString:@"REINSTALL"])
[delegate_ installPackage:package_];
- else if ([name isEqualToString:UCLocalize("REMOVE")])
+ else if ([name isEqualToString:@"REMOVE"])
[delegate_ removePackage:package_];
- else if ([name isEqualToString:UCLocalize("UPGRADE")])
+ else if ([name isEqualToString:@"UPGRADE"])
[delegate_ installPackage:package_];
else _assert(false);
}
if ([context isEqualToString:@"modify"]) {
if (button != [sheet cancelButtonIndex]) {
- NSString *buttonName = [buttons_ objectAtIndex:button];
- [self _clickButtonWithName:buttonName];
+ [self _clickButtonWithName:buttons_[button].first];
}
[sheet dismissWithClickedButtonIndex:-1 animated:YES];
#if !AlwaysReload
- (void) _customButtonClicked {
- int count([buttons_ count]);
+ size_t count(buttons_.size());
if (count == 0)
return;
if (count == 1)
- [self _clickButtonWithName:[buttons_ objectAtIndex:0]];
+ [self _clickButtonWithName:buttons_[0].first];
else {
NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:count];
- [buttons addObjectsFromArray:buttons_];
+ for (const auto &button : buttons_)
+ [buttons addObject:button.second];
UIActionSheet *sheet = [[[UIActionSheet alloc]
initWithTitle:nil
}
#endif
+- (void) setPageColor:(UIColor *)color {
+ return [super setPageColor:nil];
+}
+
- (id) initWithDatabase:(Database *)database forPackage:(NSString *)name withReferrer:(NSString *)referrer {
if ((self = [super init]) != nil) {
database_ = database;
- buttons_ = [NSMutableArray arrayWithCapacity:4];
name_ = name == nil ? @"" : [NSString stringWithString:name];
[self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/package/%@", UI_, (id) name_]] withReferrer:referrer];
} return self;
package_ = [database_ packageWithName:name_];
- [buttons_ removeAllObjects];
+ buttons_.clear();
if (package_ != nil) {
[(Package *) package_ parse];
commercial_ = [package_ isCommercial];
if ([package_ mode] != nil)
- [buttons_ addObject:UCLocalize("CLEAR")];
+ buttons_.push_back(std::make_pair(@"CLEAR", UCLocalize("CLEAR")));
if ([package_ source] == nil);
else if ([package_ upgradableAndEssential:NO])
- [buttons_ addObject:UCLocalize("UPGRADE")];
+ buttons_.push_back(std::make_pair(@"UPGRADE", UCLocalize("UPGRADE")));
else if ([package_ uninstalled])
- [buttons_ addObject:UCLocalize("INSTALL")];
+ buttons_.push_back(std::make_pair(@"INSTALL", UCLocalize("INSTALL")));
else
- [buttons_ addObject:UCLocalize("REINSTALL")];
+ buttons_.push_back(std::make_pair(@"REINSTALL", UCLocalize("REINSTALL")));
if (![package_ uninstalled])
- [buttons_ addObject:UCLocalize("REMOVE")];
+ buttons_.push_back(std::make_pair(@"REMOVE", UCLocalize("REMOVE")));
}
NSString *title;
- switch ([buttons_ count]) {
+ switch (buttons_.size()) {
case 0: title = nil; break;
- case 1: title = [buttons_ objectAtIndex:0]; break;
+ case 1: title = buttons_[0].second; break;
default: title = UCLocalize("MODIFY"); break;
}
_transient Database *database_;
unsigned era_;
_H<NSArray> packages_;
- _H<NSMutableArray> sections_;
+ _H<NSArray> sections_;
_H<UITableView, 2> list_;
- _H<NSMutableArray> index_;
- _H<NSMutableDictionary> indices_;
+
+ _H<NSArray> thumbs_;
+ std::vector<NSInteger> offset_;
+
_H<NSString> title_;
unsigned reloading_;
}
- (void) resetCursor;
- (void) clearData;
+- (NSArray *) sectionsForPackages:(NSMutableArray *)packages;
+
@end
@implementation PackageListController
UIViewAnimationCurve curve;
[self getKeyboardCurve:&curve duration:&duration forNotification:notification];
- CGRect kbframe = CGRectMake(round(center.x - bounds.size.width / 2.0), round(center.y - bounds.size.height / 2.0), bounds.size.width, bounds.size.height);
+ CGRect kbframe = CGRectMake(Retina(center.x - bounds.size.width / 2), Retina(center.y - bounds.size.height / 2), bounds.size.width, bounds.size.height);
UIViewController *base = self;
while ([base parentOrPresentingViewController] != nil)
base = [base parentOrPresentingViewController];
[[self navigationController] pushViewController:view animated:YES];
}
-#if TryIndexedCollation
-+ (BOOL) hasIndexedCollation {
- return NO; // XXX: objc_getClass("UILocalizedIndexedCollation") != nil;
-}
-#endif
-
- (NSInteger) numberOfSectionsInTableView:(UITableView *)list {
NSInteger count([sections_ count]);
return count == 0 ? 1 : count;
}
- (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {
- if (![self showsSections])
- return nil;
-
- return index_;
+ return thumbs_;
}
- (NSInteger) tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index {
-#if TryIndexedCollation
- if ([[self class] hasIndexedCollation]) {
- return [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionForSectionIndexTitleAtIndex:index];
- }
-#endif
-
- return index;
+ return offset_[index];
}
- (void) updateHeight {
packages_ = nil;
sections_ = nil;
- index_ = nil;
- indices_ = nil;
+
+ thumbs_ = nil;
+ offset_.clear();
[super releaseSubviews];
}
return;
}
- NSArray *packages;
+ NSMutableArray *packages;
reload:
if ([self shouldYield]) {
goto reload;
reloading_ = 0;
+ thumbs_ = nil;
+ offset_.clear();
+
packages_ = packages;
- indices_ = [NSMutableDictionary dictionaryWithCapacity:32];
- sections_ = [NSMutableArray arrayWithCapacity:16];
+ if ([self showsSections])
+ sections_ = [self sectionsForPackages:packages];
+ else {
+ Section *section([[[Section alloc] initWithName:nil row:0 localize:NO] autorelease]);
+ [section setCount:[packages_ count]];
+ sections_ = [NSArray arrayWithObject:section];
+ }
- Section *section = nil;
+ [self updateHeight];
-#if TryIndexedCollation
- if ([[self class] hasIndexedCollation]) {
- index_ = [[objc_getClass("UILocalizedIndexedCollation") currentCollation] sectionIndexTitles];
+ _profile(PackageTable$reloadData$List)
+ [(UITableView *) list_ setDataSource:self];
+ [list_ reloadData];
+ _end
+}
- id collation = [objc_getClass("UILocalizedIndexedCollation") currentCollation];
- NSArray *titles = [collation sectionIndexTitles];
- int secidx = -1;
+ PrintTimes();
+}
- _profile(PackageTable$reloadData$Section)
- for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
- Package *package;
- int index;
+- (NSArray *) sectionsForPackages:(NSMutableArray *)packages {
+ Section *prefix([[[Section alloc] initWithName:nil row:0 localize:NO] autorelease]);
+ size_t end([packages count]);
- _profile(PackageTable$reloadData$Section$Package)
- package = [packages_ objectAtIndex:offset];
- index = [collation sectionForObject:package collationStringSelector:@selector(name)];
- _end
+ NSMutableArray *sections([NSMutableArray arrayWithCapacity:16]);
+ Section *section(prefix);
- while (secidx < index) {
- secidx += 1;
+ thumbs_ = CollationThumbs_;
+ offset_ = CollationOffset_;
- _profile(PackageTable$reloadData$Section$Allocate)
- section = [[[Section alloc] initWithName:[titles objectAtIndex:secidx] row:offset localize:NO] autorelease];
- _end
+ size_t offset(0);
+ size_t offsets([CollationStarts_ count]);
- _profile(PackageTable$reloadData$Section$Add)
- [sections_ addObject:section];
- _end
- }
+ NSString *start([CollationStarts_ objectAtIndex:offset]);
+ size_t length([start length]);
- [section addToCount];
- }
- _end
- } else
-#endif
- {
- index_ = [NSMutableArray arrayWithCapacity:32];
+ for (size_t index(0); index != end; ++index) {
+ if (start != nil) {
+ Package *package([packages objectAtIndex:index]);
+ NSString *name(PackageName(package, @selector(cyname)));
- bool sectioned([self showsSections]);
- if (!sectioned) {
- section = [[[Section alloc] initWithName:nil localize:false] autorelease];
- [sections_ addObject:section];
- }
+ //while ([start compare:name options:NSNumericSearch range:NSMakeRange(0, length) locale:CollationLocale_] != NSOrderedDescending) {
+ while (StringNameCompare(start, name, length) != kCFCompareGreaterThan) {
+ NSString *title([CollationTitles_ objectAtIndex:offset]);
+ section = [[[Section alloc] initWithName:title row:index localize:NO] autorelease];
+ [sections addObject:section];
- _profile(PackageTable$reloadData$Section)
- for (size_t offset(0), end([packages_ count]); offset != end; ++offset) {
- Package *package;
- unichar index;
-
- _profile(PackageTable$reloadData$Section$Package)
- package = [packages_ objectAtIndex:offset];
- index = [package index];
- _end
-
- if (sectioned && (section == nil || [section index] != index)) {
- _profile(PackageTable$reloadData$Section$Allocate)
- section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
- _end
-
- [index_ addObject:[section name]];
- //[indices_ setObject:[NSNumber numberForInt:[sections_ count]] forKey:index];
+ start = ++offset == offsets ? nil : [CollationStarts_ objectAtIndex:offset];
+ if (start == nil)
+ break;
+ length = [start length];
+ }
+ }
- _profile(PackageTable$reloadData$Section$Add)
- [sections_ addObject:section];
- _end
- }
+ [section addToCount];
+ }
- [section addToCount];
- }
- _end
+ for (; offset != offsets; ++offset) {
+ NSString *title([CollationTitles_ objectAtIndex:offset]);
+ Section *section([[[Section alloc] initWithName:title row:end localize:NO] autorelease]);
+ [sections addObject:section];
}
- [self updateHeight];
+ if ([prefix count] != 0) {
+ Section *suffix([sections lastObject]);
+ [prefix setName:[suffix name]];
+ [suffix setName:nil];
+ [sections insertObject:prefix atIndex:(offsets - 1)];
+ }
- _profile(PackageTable$reloadData$List)
- [(UITableView *) list_ setDataSource:self];
- [list_ reloadData];
- _end
-} }
+ return sections;
+}
- (void) reloadData {
[super reloadData];
@end
/* }}} */
/* Filtered Package List Controller {{{ */
+typedef Function<bool, Package *> PackageFilter;
+typedef Function<void, NSMutableArray *> PackageSorter;
@interface FilteredPackageListController : PackageListController {
- SEL filter_;
- IMP imp_;
- _H<NSObject> object_;
- _H<NSObject> stuff_;
+ PackageFilter filter_;
+ PackageSorter sorter_;
}
-- (void) setObject:(id)object;
-- (void) setStuff:(id)object;
-- (void) setObject:(id)object andStuff:(id)stuff;
-
-- (void) setObject:(id)object forFilter:(SEL)filter;
-- (void) setObject:(id)object andStuff:(id)stuff forFilter:(SEL)filter;
+- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(PackageFilter)filter;
-- (SEL) filter;
-- (void) setFilter:(SEL)filter;
-
-- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object;
+- (void) setFilter:(PackageFilter)filter;
+- (void) setSorter:(PackageSorter)sorter;
@end
@implementation FilteredPackageListController
-- (SEL) filter {
- return filter_;
-}
-
-- (void) setFilter:(SEL)filter {
+- (void) setFilter:(PackageFilter)filter {
@synchronized (self) {
filter_ = filter;
-
- /* XXX: this is an unsafe optimization of doomy hell */
- Method method(class_getInstanceMethod([Package class], filter));
- _assert(method != NULL);
- imp_ = method_getImplementation(method);
- _assert(imp_ != NULL);
-} }
-
-- (void) setObject:(id)object {
-@synchronized (self) {
- object_ = object;
-} }
-
-- (void) setStuff:(id)stuff {
-@synchronized (self) {
- stuff_ = stuff;
-} }
-
-- (void) setObject:(id)object andStuff:(id)stuff {
-@synchronized (self) {
- object_ = object;
- stuff_ = stuff;
} }
-- (void) setObject:(id)object forFilter:(SEL)filter {
+- (void) setSorter:(PackageSorter)sorter {
@synchronized (self) {
- [self setFilter:filter];
- object_ = object;
-} }
-
-- (void) setObject:(id)object andStuff:(id)stuff forFilter:(SEL)filter {
-@synchronized (self) {
- [self setFilter:filter];
- object_ = object;
- stuff_ = stuff;
+ sorter_ = sorter;
} }
- (NSMutableArray *) _reloadPackages {
@synchronized (database_) {
era_ = [database_ era];
- NSArray *packages([database_ packages]);
+ NSArray *packages([database_ packages]);
NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);
- IMP imp;
- SEL filter;
- _H<NSObject> object;
- _H<NSObject> stuff;
+ PackageFilter filter;
+ PackageSorter sorter;
@synchronized (self) {
- imp = imp_;
filter = filter_;
- object = object_;
- stuff = stuff_;
+ sorter = sorter_;
}
_profile(PackageTable$reloadData$Filter)
for (Package *package in packages)
- if ([package valid] && (*reinterpret_cast<bool (*)(id, SEL, id, id)>(imp))(package, filter, object, stuff))
+ if ([package valid] && filter(package))
[filtered addObject:package];
_end
+ if (sorter)
+ sorter(filtered);
return filtered;
} }
-- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object {
+- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(PackageFilter)filter {
if ((self = [super initWithDatabase:database title:title]) != nil) {
[self setFilter:filter];
- object_ = object;
- } return self;
-}
-
-- (id) initWithDatabase:(Database *)database title:(NSString *)title filter:(SEL)filter with:(id)object with:(id)stuff {
- if ((self = [super initWithDatabase:database title:title]) != nil) {
- [self setFilter:filter];
- object_ = object;
- stuff_ = stuff;
} return self;
}
[alert setCancelButtonIndex:0];
[alert setMessage:
- @"Copyright \u00a9 2008-2013\n"
+ @"Copyright \u00a9 2008-2014\n"
"SaurikIT, LLC\n"
"\n"
"Jay Freeman (saurik)\n"
@end
/* }}} */
-/* Refresh Bar {{{ */
-@interface RefreshBar : UINavigationBar {
- _H<UIProgressIndicator> indicator_;
- _H<UITextLabel> prompt_;
- _H<UINavigationButton> cancel_;
-}
-
-@end
-
-@implementation RefreshBar
-
-- (void) positionViews {
- CGRect frame = [cancel_ frame];
- frame.size = [cancel_ sizeThatFits:frame.size];
- frame.origin.x = [self frame].size.width - frame.size.width - 5;
- frame.origin.y = ([self frame].size.height - frame.size.height) / 2;
- [cancel_ setFrame:frame];
-
- CGSize indsize([UIProgressIndicator defaultSizeForStyle:[indicator_ activityIndicatorViewStyle]]);
- unsigned indoffset = ([self frame].size.height - indsize.height) / 2;
- CGRect indrect = {{indoffset, indoffset}, indsize};
- [indicator_ setFrame:indrect];
-
- CGSize prmsize = {215, indsize.height + 4};
- CGRect prmrect = {{
- indoffset * 2 + indsize.width,
- unsigned([self frame].size.height - prmsize.height) / 2 - 1
- }, prmsize};
- [prompt_ setFrame:prmrect];
-}
-
-- (void) setFrame:(CGRect)frame {
- [super setFrame:frame];
- [self positionViews];
-}
-
-- (id) initWithFrame:(CGRect)frame delegate:(id)delegate {
- if ((self = [super initWithFrame:frame]) != nil) {
- [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
-
- [self setBarStyle:UIBarStyleBlack];
-
- UIBarStyle barstyle([self _barStyle:NO]);
- bool ugly(barstyle == UIBarStyleDefault);
-
- UIProgressIndicatorStyle style = ugly ?
- UIProgressIndicatorStyleMediumBrown :
- UIProgressIndicatorStyleMediumWhite;
-
- indicator_ = [[[UIProgressIndicator alloc] initWithFrame:CGRectZero] autorelease];
- [(UIProgressIndicator *) indicator_ setStyle:style];
- [indicator_ startAnimation];
- [self addSubview:indicator_];
-
- prompt_ = [[[UITextLabel alloc] initWithFrame:CGRectZero] autorelease];
- [prompt_ setColor:[UIColor colorWithCGColor:(ugly ? Blueish_ : Off_)]];
- [prompt_ setBackgroundColor:[UIColor clearColor]];
- [prompt_ setFont:[UIFont systemFontOfSize:15]];
- [self addSubview:prompt_];
-
- cancel_ = [[[UINavigationButton alloc] initWithTitle:UCLocalize("CANCEL") style:UINavigationButtonStyleHighlighted] autorelease];
- [cancel_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
- [cancel_ addTarget:delegate action:@selector(cancelPressed) forControlEvents:UIControlEventTouchUpInside];
- [cancel_ setBarStyle:barstyle];
-
- [self positionViews];
- } return self;
-}
-
-- (void) setCancellable:(bool)cancellable {
- if (cancellable)
- [self addSubview:cancel_];
- else
- [cancel_ removeFromSuperview];
-}
-
-- (void) start {
- [prompt_ setText:UCLocalize("UPDATING_DATABASE")];
-}
-
-- (void) stop {
- [self setCancellable:NO];
-}
-
-- (void) setPrompt:(NSString *)prompt {
- [prompt_ setText:prompt];
-}
-
-- (void) setProgress:(float)progress {
-}
-
-@end
-/* }}} */
-
/* Cydia Navigation Controller Interface {{{ */
@interface UINavigationController (Cydia)
/* Cydia Tab Bar Controller {{{ */
@interface CydiaTabBarController : CyteTabBarController <
UITabBarControllerDelegate,
- ProgressDelegate
+ FetchDelegate
> {
_transient Database *database_;
- _H<RefreshBar, 1> refreshbar_;
- bool dropped_;
+ _H<UIActivityIndicatorView> indicator_;
+
bool updating_;
// XXX: ok, "updatedelegate_"?...
_transient NSObject<CydiaDelegate> *updatedelegate_;
}
- (NSArray *) navigationURLCollection;
-- (void) dropBar:(BOOL)animated;
- (void) beginUpdate;
-- (void) raiseBar:(BOOL)animated;
- (BOOL) updating;
@end
return items;
}
-- (void) dealloc {
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- [super dealloc];
-}
-
- (id) initWithDatabase:(Database *)database {
if ((self = [super init]) != nil) {
database_ = database;
[self setDelegate:self];
- [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarFrameChanged:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteTiny] autorelease];
+ [indicator_ setOrigin:CGPointMake(kCFCoreFoundationVersionNumber >= 800 ? 2 : 4, 2)];
- refreshbar_ = [[[RefreshBar alloc] initWithFrame:CGRectMake(0, 0, [[self view] frame].size.width, [UINavigationBar defaultSize].height) delegate:self] autorelease];
+ [[self view] setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
} return self;
}
}
- (void) beginUpdate {
- [(RefreshBar *) refreshbar_ start];
- [self dropBar:YES];
+ if (updating_)
+ return;
+
+ UIViewController *controller([[self viewControllers] objectAtIndex:1]);
+ UITabBarItem *item([controller tabBarItem]);
+
+ [item setBadgeValue:@""];
+ UIView *badge(MSHookIvar<UIView *>([item view], "_badge"));
+
+ [indicator_ startAnimating];
+ [badge addSubview:indicator_];
[updatedelegate_ retainNetworkActivityIndicator];
updating_ = true;
- (void) performUpdate {
NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
- Status status;
- status.setDelegate(self);
+ SourceStatus status(self, database_);
[database_ updateWithStatus:status];
[self
updating_ = false;
[updatedelegate_ releaseNetworkActivityIndicator];
- [self raiseBar:YES];
- [refreshbar_ stop];
+ UIViewController *controller([[self viewControllers] objectAtIndex:1]);
+ [[controller tabBarItem] setBadgeValue:nil];
+
+ [indicator_ removeFromSuperview];
+ [indicator_ stopAnimating];
[updatedelegate_ performSelector:selector withObject:nil afterDelay:0];
}
return updating_;
}
-- (void) addProgressEvent:(CydiaProgressEvent *)event {
- [refreshbar_ setPrompt:[event compoundMessage]];
-}
-
-- (bool) isProgressCancelled {
+- (bool) isSourceCancelled {
return !updating_;
}
-- (void) setProgressCancellable:(NSNumber *)cancellable {
- [refreshbar_ setCancellable:(updating_ && [cancellable boolValue])];
-}
-
-- (void) setProgressPercent:(NSNumber *)percent {
- [refreshbar_ setProgress:[percent floatValue]];
+- (void) startSourceFetch:(NSString *)uri {
}
-- (void) setProgressStatus:(NSDictionary *)status {
- if (status != nil)
- [self setProgressPercent:[status objectForKey:@"Percent"]];
+- (void) stopSourceFetch:(NSString *)uri {
}
- (void) setUpdateDelegate:(id)delegate {
updatedelegate_ = delegate;
}
-- (UIView *) transitionView {
- if (![self respondsToSelector:@selector(_transitionView)])
- return MSHookIvar<id>(self, "_viewControllerTransitionView");
- else if (kCFCoreFoundationVersionNumber < 800)
- return [self _transitionView];
- else
- return [[[self _transitionView] superview] superview];
-}
-
-- (void) dropBar:(BOOL)animated {
- if (dropped_)
- return;
- dropped_ = true;
-
- UIView *transition([self transitionView]);
- [[self view] addSubview:refreshbar_];
-
- CGRect barframe([refreshbar_ frame]);
-
- if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iPhoneOS_3_0) // XXX: _UIApplicationLinkedOnOrAfter(4)
- barframe.origin.y = 0;
- else if (kCFCoreFoundationVersionNumber < 800)
- barframe.origin.y = CYStatusBarHeight();
- else
- barframe.origin.y = 0; //-barframe.size.height + CYStatusBarHeight();
-
- [refreshbar_ setFrame:barframe];
-
- CGRect viewframe = [transition frame];
-
-if (kCFCoreFoundationVersionNumber < 800) {
- if (animated)
- [UIView beginAnimations:nil context:NULL];
-
- float adjust(barframe.size.height);
- if (kCFCoreFoundationVersionNumber >= 800)
- adjust -= CYStatusBarHeight();
- viewframe.origin.y += adjust;
- viewframe.size.height -= adjust;
- [transition setFrame:viewframe];
-
- if (animated)
- [UIView commitAnimations];
-}
-
- // Ensure bar has the proper width for our view, it might have changed
- barframe.size.width = viewframe.size.width;
- [refreshbar_ setFrame:barframe];
-}
-
-- (void) raiseBar:(BOOL)animated {
- if (!dropped_)
- return;
- dropped_ = false;
-
- UIView *transition([self transitionView]);
- [refreshbar_ removeFromSuperview];
-
- CGRect barframe([refreshbar_ frame]);
-
-if (kCFCoreFoundationVersionNumber < 800) {
- if (animated)
- [UIView beginAnimations:nil context:NULL];
-
- CGRect viewframe = [transition frame];
- float adjust(barframe.size.height);
- if (kCFCoreFoundationVersionNumber >= 800)
- adjust -= CYStatusBarHeight();
- viewframe.origin.y -= adjust;
- viewframe.size.height += adjust;
- [transition setFrame:viewframe];
-
- if (animated)
- [UIView commitAnimations];
-}
-}
-
-- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
- bool dropped(dropped_);
-
- if (dropped)
- [self raiseBar:NO];
-
- [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-
- if (dropped)
- [self dropBar:NO];
-}
-
-- (void) statusBarFrameChanged:(NSNotification *)notification {
- if (dropped_) {
- [self raiseBar:NO];
- [self dropBar:NO];
- }
-}
-
@end
/* }}} */
path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [path stringByReplacingOccurrencesOfString:@" " withString:@"_"]]]);
if (icon == nil)
- icon = [UIImage applicationImageNamed:@"unknown.png"];
+ icon = [UIImage imageNamed:@"unknown.png"];
[self _returnPNGWithImage:icon forRequest:request];
} else fail: {
[client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]];
else
title = UCLocalize("NO_SECTION");
- if ((self = [super initWithDatabase:database title:title filter:@selector(isVisibleInSection:source:) with:section with:source]) != nil) {
+ if ((self = [super initWithDatabase:database title:title]) != nil) {
key_ = [source key];
section_ = section;
} return self;
}
- (void) reloadData {
- [super setStuff:[database_ sourceWithKey:key_]];
+ Source *source([database_ sourceWithKey:key_]);
+ _H<NSString> name(section_);
+
+ [self setFilter:[=](Package *package) {
+ NSString *section([package section]);
+
+ return (
+ name == nil ||
+ section == nil && [name length] == 0 ||
+ [name isEqualToString:section]
+ ) && (
+ source == nil ||
+ [package source] == source
+ ) && [package visible];
+ }];
+
[super reloadData];
}
/* }}} */
/* Changes Controller {{{ */
-@interface ChangesController : CyteViewController <
- UITableViewDataSource,
- UITableViewDelegate
-> {
- _transient Database *database_;
- unsigned era_;
- _H<NSMutableArray> packages_;
- _H<NSMutableArray> sections_;
- _H<UITableView, 2> list_;
+@interface ChangesController : FilteredPackageListController {
unsigned upgrades_;
}
@implementation ChangesController
-- (NSURL *) navigationURL {
- return [NSURL URLWithString:@"cydia://changes"];
-}
-
-- (void) viewDidAppear:(BOOL)animated {
- [super viewDidAppear:animated];
- [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
-}
-
-- (NSInteger) numberOfSectionsInTableView:(UITableView *)list {
- NSInteger count([sections_ count]);
- return count == 0 ? 1 : count;
-}
-
-- (NSString *) tableView:(UITableView *)list titleForHeaderInSection:(NSInteger)section {
- if ([sections_ count] == 0)
- return nil;
- return [[sections_ objectAtIndex:section] name];
+- (NSURL *) referrerURL {
+ return [NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/changes/", UI_]];
}
-- (NSInteger) tableView:(UITableView *)list numberOfRowsInSection:(NSInteger)section {
- if ([sections_ count] == 0)
- return 0;
- return [[sections_ objectAtIndex:section] count];
+- (NSURL *) navigationURL {
+ return [NSURL URLWithString:@"cydia://changes"];
}
- (Package *) packageAtIndexPath:(NSIndexPath *)path {
return [[[packages_ objectAtIndex:([section row] + row)] retain] autorelease];
} }
-- (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path {
- PackageCell *cell((PackageCell *) [table dequeueReusableCellWithIdentifier:@"Package"]);
- if (cell == nil)
- cell = [[[PackageCell alloc] init] autorelease];
-
- Package *package([database_ packageWithName:[[self packageAtIndexPath:path] id]]);
- [cell setPackage:package asSummary:false];
- return cell;
-}
-
-- (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path {
- Package *package([self packageAtIndexPath:path]);
- CYPackageController *view([[[CYPackageController alloc] initWithDatabase:database_ forPackage:[package id] withReferrer:[NSString stringWithFormat:@"%@/#!/changes/", UI_]] autorelease]);
- [view setDelegate:delegate_];
- [[self navigationController] pushViewController:view animated:YES];
- return path;
-}
-
- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
NSString *context([alert context]);
[alert dismissWithClickedButtonIndex:-1 animated:YES];
}
+- (void) setLeftBarButtonItem {
+ if ([delegate_ updating])
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CANCEL")
+ style:UIBarButtonItemStyleDone
+ target:self
+ action:@selector(cancelButtonClicked)
+ ] autorelease] animated:YES];
+ else
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("REFRESH")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(refreshButtonClicked)
+ ] autorelease] animated:YES];
+}
+
- (void) refreshButtonClicked {
- if (IsReachable("cydia.saurik.com")) {
- [delegate_ beginUpdate];
- [[self navigationItem] setLeftBarButtonItem:nil animated:YES];
- } else {
- UIAlertView *alert = [[[UIAlertView alloc]
- initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")]
- message:@"Host Unreachable" // XXX: Localize
- delegate:self
- cancelButtonTitle:UCLocalize("OK")
- otherButtonTitles:nil
- ] autorelease];
+ if ([delegate_ requestUpdate])
+ [self setLeftBarButtonItem];
+}
- [alert setContext:@"norefresh"];
- [alert show];
- }
+- (void) cancelButtonClicked {
+ [delegate_ cancelUpdate];
}
- (void) upgradeButtonClicked {
[[self navigationItem] setRightBarButtonItem:nil animated:YES];
}
-- (void) loadView {
- UIView *view([[[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]] autorelease]);
- [view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
- [self setView:view];
-
- list_ = [[[UITableView alloc] initWithFrame:[view bounds] style:UITableViewStylePlain] autorelease];
- [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- [list_ setRowHeight:73];
- [(UITableView *) list_ setDataSource:self];
- [list_ setDelegate:self];
- [view addSubview:list_];
+- (bool) shouldYield {
+ return true;
}
-- (void) viewDidLoad {
- [super viewDidLoad];
-
- [[self navigationItem] setTitle:UCLocalize("CHANGES")];
+- (bool) shouldBlock {
+ return true;
}
-- (void) releaseSubviews {
- list_ = nil;
-
- packages_ = nil;
- sections_ = nil;
+- (void) useFilter {
+@synchronized (self) {
+ [self setFilter:[](Package *package) {
+ return [package upgradableAndEssential:YES] || [package visible];
+ }];
- [super releaseSubviews];
-}
+ [self setSorter:[](NSMutableArray *packages) {
+ [packages radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackageChangesRadix) withContext:NULL];
+ }];
+} }
- (id) initWithDatabase:(Database *)database {
- if ((self = [super init]) != nil) {
- database_ = database;
+ if ((self = [super initWithDatabase:database title:UCLocalize("CHANGES")]) != nil) {
+ [self useFilter];
} return self;
}
-- (NSMutableArray *) _reloadPackages {
-@synchronized (database_) {
- era_ = [database_ era];
- NSArray *packages([database_ packages]);
-
- NSMutableArray *filtered([NSMutableArray arrayWithCapacity:[packages count]]);
-
- _trace();
- _profile(ChangesController$_reloadPackages$Filter)
- for (Package *package in packages)
- if ([package upgradableAndEssential:YES] || [package visible])
- CFArrayAppendValue((CFMutableArrayRef) filtered, package);
- _end
- _trace();
- _profile(ChangesController$_reloadPackages$radixSort)
- [filtered radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(&PackageChangesRadix) withContext:NULL];
- _end
- _trace();
-
- return filtered;
-} }
-
-- (void) _reloadData {
- NSMutableArray *packages;
-
- reload:
- if (true) {
- UIProgressHUD *hud([delegate_ addProgressHUD]);
- [hud setText:UCLocalize("LOADING")];
- //NSLog(@"HUD:%@::%@", delegate_, hud);
- packages = [self yieldToSelector:@selector(_reloadPackages)];
- [delegate_ removeProgressHUD:hud];
- } else {
- packages = [self _reloadPackages];
- }
+- (void) viewDidLoad {
+ [super viewDidLoad];
+ [self setLeftBarButtonItem];
+}
-@synchronized (database_) {
- if (era_ != [database_ era])
- goto reload;
+- (void) viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+ [self setLeftBarButtonItem];
+}
- packages_ = packages;
- sections_ = [NSMutableArray arrayWithCapacity:16];
+- (void) reloadData {
+ [self setLeftBarButtonItem];
+ [super reloadData];
+}
+
+- (NSArray *) sectionsForPackages:(NSMutableArray *)packages {
+ NSMutableArray *sections([NSMutableArray arrayWithCapacity:16]);
Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease];
Section *ignored = nil;
CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle));
- for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) {
- Package *package = [packages_ objectAtIndex:offset];
+ for (size_t offset = 0, count = [packages count]; offset != count; ++offset) {
+ Package *package = [packages objectAtIndex:offset];
BOOL uae = [package upgradableAndEssential:YES];
_profile(ChangesController$reloadData$Allocate)
name = [NSString stringWithFormat:UCLocalize("NEW_AT"), name];
section = [[[Section alloc] initWithName:name row:offset localize:NO] autorelease];
- [sections_ addObject:section];
+ [sections addObject:section];
_end
}
CFRelease(formatter);
if (unseens) {
- Section *last = [sections_ lastObject];
+ Section *last = [sections lastObject];
size_t count = [last count];
- [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)];
- [sections_ removeLastObject];
+ [packages removeObjectsInRange:NSMakeRange([packages count] - count, count)];
+ [sections removeLastObject];
}
if ([ignored count] != 0)
- [sections_ insertObject:ignored atIndex:0];
+ [sections insertObject:ignored atIndex:0];
if (upgrades_ != 0)
- [sections_ insertObject:upgradable atIndex:0];
+ [sections insertObject:upgradable atIndex:0];
[list_ reloadData];
action:@selector(upgradeButtonClicked)
] autorelease]) animated:YES];
- [[self navigationItem] setLeftBarButtonItem:([delegate_ updating] ? nil : [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("REFRESH")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(refreshButtonClicked)
- ] autorelease]) animated:YES];
-
- PrintTimes();
-} }
-
-- (void) reloadData {
- [super reloadData];
- [self performSelector:@selector(_reloadData) withObject:nil afterDelay:0];
+ return sections;
}
@end
> {
_H<UISearchBar, 1> search_;
BOOL searchloaded_;
+ bool summary_;
}
- (id) initWithDatabase:(Database *)database query:(NSString *)query;
}
- (void) useSearch {
- [self setObject:[self termsForQuery:[search_ text]] forFilter:@selector(isUnfilteredAndSearchedForBy:)];
+ _H<NSArray> query([self termsForQuery:[search_ text]]);
+ summary_ = false;
+
+@synchronized (self) {
+ [self setFilter:[=](Package *package) {
+ if (![package unfiltered])
+ return false;
+ if (![package matches:query])
+ return false;
+ return true;
+ }];
+
+ [self setSorter:[](NSMutableArray *packages) {
+ [packages radixSortUsingSelector:@selector(rank)];
+ }];
+}
+
[self clearData];
[self reloadData];
}
+- (void) usePrefix:(NSString *)prefix {
+ _H<NSString> query(prefix);
+ summary_ = true;
+
+@synchronized (self) {
+ [self setFilter:[=](Package *package) {
+ if ([query length] == 0)
+ return false;
+ if (![package unfiltered])
+ return false;
+ if ([[package name] compare:query options:MatchCompareOptions_ range:NSMakeRange(0, [query length])] != NSOrderedSame)
+ return false;
+ return true;
+ }];
+
+ [self setSorter:nullptr];
+}
+
+ [self reloadData];
+}
+
- (void) searchBarTextDidBeginEditing:(UISearchBar *)searchBar {
- [self setObject:[search_ text] forFilter:@selector(isUnfilteredAndSelectedForBy:)];
[self clearData];
- [self reloadData];
+ [self usePrefix:[search_ text]];
}
- (void) searchBarButtonClicked:(UISearchBar *)searchBar {
}
- (void) searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)text {
- [self setObject:text forFilter:@selector(isUnfilteredAndSelectedForBy:)];
- [self reloadData];
+ [self usePrefix:text];
}
- (bool) shouldYield {
}
- (bool) shouldBlock {
- return [self filter] == @selector(isUnfilteredAndSearchedForBy:);
+ return !summary_;
}
- (bool) isSummarized {
- return [self filter] == @selector(isUnfilteredAndSelectedForBy:);
+ return summary_;
}
- (bool) showsSections {
return false;
}
-- (NSMutableArray *) _reloadPackages {
- NSMutableArray *packages([super _reloadPackages]);
- if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
- [packages radixSortUsingSelector:@selector(rank)];
- return packages;
-}
-
- (id) initWithDatabase:(Database *)database query:(NSString *)query {
- if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH") filter:@selector(isUnfilteredAndSearchedForBy:) with:[self termsForQuery:query]])) {
+ if ((self = [super initWithDatabase:database title:UCLocalize("SEARCH")])) {
search_ = [[[UISearchBar alloc] init] autorelease];
+ [search_ setPlaceholder:UCLocalize("SEARCH_EX")];
[search_ setDelegate:self];
+ UITextField *textField;
+ if ([search_ respondsToSelector:@selector(searchField)])
+ textField = [search_ searchField];
+ else
+ textField = MSHookIvar<UITextField *>(search_, "_searchField");
+
+ [textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
+ [textField setEnablesReturnKeyAutomatically:NO];
+ [[self navigationItem] setTitleView:textField];
+
if (query != nil)
[search_ setText:query];
+ [self useSearch];
} return self;
}
searchloaded_ = YES;
[search_ setFrame:CGRectMake(0, 0, [[self view] bounds].size.width, 44.0f)];
[search_ layoutSubviews];
- [search_ setPlaceholder:UCLocalize("SEARCH_EX")];
-
- UITextField *textField;
- if ([search_ respondsToSelector:@selector(searchField)])
- textField = [search_ searchField];
- else
- textField = MSHookIvar<UITextField *>(search_, "_searchField");
-
- [textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
- [textField setEnablesReturnKeyAutomatically:NO];
- [[self navigationItem] setTitleView:textField];
}
if ([self isSummarized])
}
- (void) reloadData {
- id object([search_ text]);
- if ([self filter] == @selector(isUnfilteredAndSearchedForBy:))
- object = [self termsForQuery:object];
-
- [self setObject:object];
[self resetCursor];
-
[super reloadData];
}
pid_t pid(ExecFork());
if (pid == 0) {
- FILE *dpkg(popen("dpkg --set-selections", "w"));
+ FILE *dpkg(nullptr); // XXX: this is due to _root's if
+ _root(true) dpkg = popen("dpkg --set-selections", "w");
fwrite(package, strlen(package), 1, dpkg);
if (on)
/* Installed Controller {{{ */
@interface InstalledController : FilteredPackageListController {
- BOOL expert_;
+ bool sectioned_;
}
- (id) initWithDatabase:(Database *)database;
-
-- (void) updateRoleButton;
- (void) queueStatusDidChange;
@end
return [NSURL URLWithString:@"cydia://installed"];
}
+- (void) useRecent {
+ sectioned_ = false;
+
+@synchronized (self) {
+ [self setFilter:[](Package *package) {
+ return ![package uninstalled] && package->role_ < 7;
+ }];
+
+ [self setSorter:[](NSMutableArray *packages) {
+ [packages radixSortUsingSelector:@selector(recent)];
+ }];
+} }
+
+- (void) useFilter:(UISegmentedControl *)segmented {
+ NSInteger selected([segmented selectedSegmentIndex]);
+ if (selected == 2)
+ return [self useRecent];
+ bool simple(selected == 0);
+ sectioned_ = true;
+
+@synchronized (self) {
+ [self setFilter:[=](Package *package) {
+ return ![package uninstalled] && package->role_ <= (simple ? 1 : 3);
+ }];
+
+ [self setSorter:nullptr];
+} }
+
+- (NSArray *) sectionsForPackages:(NSMutableArray *)packages {
+ if (sectioned_)
+ return [super sectionsForPackages:packages];
+
+ CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterLongStyle, kCFDateFormatterNoStyle));
+
+ NSMutableArray *sections([NSMutableArray arrayWithCapacity:16]);
+ Section *section(nil);
+ time_t last(0);
+
+ for (size_t offset(0), count([packages count]); offset != count; ++offset) {
+ Package *package([packages objectAtIndex:offset]);
+
+ time_t upgraded([package upgraded]);
+ if (upgraded < 1168364520)
+ upgraded = 0;
+ else
+ upgraded -= upgraded % (60 * 60 * 24);
+
+ if (section == nil || upgraded != last) {
+ last = upgraded;
+
+ NSString *name;
+ if (upgraded == 0)
+ continue; // XXX: name = UCLocalize("...");
+ else {
+ name = (NSString *) CFDateFormatterCreateStringWithDate(NULL, formatter, (CFDateRef) [NSDate dateWithTimeIntervalSince1970:upgraded]);
+ [name autorelease];
+ }
+
+ section = [[[Section alloc] initWithName:name row:offset localize:NO] autorelease];
+ [sections addObject:section];
+ }
+
+ [section addToCount];
+ }
+
+ CFRelease(formatter);
+ return sections;
+}
+
- (id) initWithDatabase:(Database *)database {
- if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {
- [self updateRoleButton];
+ if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED")]) != nil) {
+ UISegmentedControl *segmented([[[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:UCLocalize("USER"), UCLocalize("EXPERT"), UCLocalize("RECENT"), nil]] autorelease]);
+ [segmented setSelectedSegmentIndex:0];
+ [segmented setSegmentedControlStyle:UISegmentedControlStyleBar];
+ [[self navigationItem] setTitleView:segmented];
+
+ [segmented addTarget:self action:@selector(modeChanged:) forEvents:UIControlEventValueChanged];
+ [self useFilter:segmented];
+
[self queueStatusDidChange];
} return self;
}
- (void) queueStatusDidChange {
#if !AlwaysReload
if (Queuing_) {
- [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
initWithTitle:UCLocalize("QUEUE")
style:UIBarButtonItemStyleDone
target:self
action:@selector(queueButtonClicked)
] autorelease]];
} else {
- [[self navigationItem] setLeftBarButtonItem:nil];
+ [[self navigationItem] setRightBarButtonItem:nil];
}
#endif
}
-- (void) updateRoleButton {
- [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:(expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE"))
- style:(expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
- target:self
- action:@selector(roleButtonClicked)
- ] autorelease]];
-}
-
-- (void) roleButtonClicked {
- [self setObject:[NSNumber numberWithBool:expert_]];
+- (void) modeChanged:(UISegmentedControl *)segmented {
+ [self useFilter:segmented];
[self reloadData];
- expert_ = !expert_;
-
- [self updateRoleButton];
}
@end
/* Source Cell {{{ */
@interface SourceCell : CyteTableViewCell <
- CyteTableViewCellDelegate
+ CyteTableViewCellDelegate,
+ SourceDelegate
> {
+ _H<Source, 1> source_;
_H<NSURL> url_;
_H<UIImage> icon_;
_H<NSString> origin_;
_H<NSString> label_;
+ _H<UIActivityIndicatorView> indicator_;
}
- (void) setSource:(Source *)source;
+- (void) setFetch:(NSNumber *)fetch;
@end
}
- (void) setSource:(Source *)source {
- icon_ = [UIImage applicationImageNamed:@"unknown.png"];
+ source_ = source;
+ [source_ setDelegate:self];
+
+ [self setFetch:[NSNumber numberWithBool:[source_ fetch]]];
+
+ icon_ = [UIImage imageNamed:@"unknown.png"];
origin_ = [source name];
label_ = [source rooturi];
}
- (void) setAllSource {
- icon_ = [UIImage applicationImageNamed:@"folder.png"];
+ source_ = nil;
+ [indicator_ stopAnimating];
+
+ icon_ = [UIImage imageNamed:@"folder.png"];
origin_ = UCLocalize("ALL_SOURCES");
label_ = UCLocalize("ALL_SOURCES_EX");
[content_ setNeedsDisplay];
[content_ setDelegate:self];
[content_ setOpaque:YES];
+ indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGraySmall] autorelease];
+ [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin];// | UIViewAutoresizingFlexibleBottomMargin];
+ [content addSubview:indicator_];
+
[[content_ layer] setContentsGravity:kCAGravityTopLeft];
} return self;
}
+- (void) layoutSubviews {
+ [super layoutSubviews];
+
+ UIView *content([self contentView]);
+ CGRect bounds([content bounds]);
+
+ CGRect frame([indicator_ frame]);
+ frame.origin.x = bounds.size.width - frame.size.width;
+ frame.origin.y = Retina((bounds.size.height - frame.size.height) / 2);
+
+ if (kCFCoreFoundationVersionNumber < 800)
+ frame.origin.x -= 8;
+ [indicator_ setFrame:frame];
+}
+
- (NSString *) accessibilityLabel {
return origin_;
}
rect.origin.x = 26 - rect.size.width / 2;
rect.origin.y = 26 - rect.size.height / 2;
- [icon_ drawInRect:rect];
+ [icon_ drawInRect:Retina(rect)];
}
if (highlighted && kCFCoreFoundationVersionNumber < 800)
if (!highlighted)
UISetColor(Black_);
- [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 61) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+ [origin_ drawAtPoint:CGPointMake(52, 8) forWidth:(width - 49) withFont:Font18Bold_ lineBreakMode:NSLineBreakByTruncatingTail];
if (!highlighted)
UISetColor(Gray_);
- [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 61) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];
+ [label_ drawAtPoint:CGPointMake(52, 29) forWidth:(width - 49) withFont:Font12_ lineBreakMode:NSLineBreakByTruncatingTail];
+}
+
+- (void) setFetch:(NSNumber *)fetch {
+ if ([fetch boolValue])
+ [indicator_ startAnimating];
+ else
+ [indicator_ stopAnimating];
}
@end
_H<UIProgressHUD> hud_;
_H<NSError> error_;
- //NSURLConnection *installer_;
NSURLConnection *trivial_bz2_;
NSURLConnection *trivial_gz_;
- //NSURLConnection *automatic_;
BOOL cydia_;
}
}
- (void) dealloc {
- //[self _releaseConnection:installer_];
[self _releaseConnection:trivial_gz_];
[self _releaseConnection:trivial_bz2_];
- //[self _releaseConnection:automatic_];
[super dealloc];
}
}
}
+- (void) tableView:(UITableView *)tableView didEndEditingRowAtIndexPath:(NSIndexPath *)indexPath {
+ [self updateButtonsForEditingStatusAnimated:YES];
+}
+
- (void) complete {
[delegate_ addTrivialSource:href_];
href_ = nil;
case 1: {
NSString *href = [[alert textField] text];
- //installer_ = [[self _requestHRef:href method:@"GET"] retain];
+ static Pcre href_r("^http(s?)://[^# ]*$");
+ if (!href_r(href)) {
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("INVALID_URL")]
+ message:UCLocalize("INVALID_URL_EX")
+ delegate:self
+ cancelButtonTitle:UCLocalize("OK")
+ otherButtonTitles:nil
+ ] autorelease];
+
+ [alert setContext:@"badurl"];
+ [alert show];
+
+ break;
+ }
if (![href hasSuffix:@"/"])
href_ = [href stringByAppendingString:@"/"];
trivial_bz2_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.bz2"] method:@"HEAD"] retain];
trivial_gz_ = [[self _requestHRef:[href_ stringByAppendingString:@"Packages.gz"] method:@"HEAD"] retain];
- //trivial_bz2_ = [[self _requestHRef:[href stringByAppendingString:@"dists/Release"] method:@"HEAD"] retain];
cydia_ = false;
}
}
+- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated {
+ BOOL editing([list_ isEditing]);
+
+ if (editing)
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("ADD")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(addButtonClicked)
+ ] autorelease] animated:animated];
+ else if ([delegate_ updating])
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("CANCEL")
+ style:UIBarButtonItemStyleDone
+ target:self
+ action:@selector(cancelButtonClicked)
+ ] autorelease] animated:animated];
+ else
+ [[self navigationItem] setLeftBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:UCLocalize("REFRESH")
+ style:UIBarButtonItemStylePlain
+ target:self
+ action:@selector(refreshButtonClicked)
+ ] autorelease] animated:animated];
+
+ [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
+ initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT"))
+ style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
+ target:self
+ action:@selector(editButtonClicked)
+ ] autorelease] animated:animated];
+}
+
- (void) loadView {
list_ = [[[UITableView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame] style:UITableViewStylePlain] autorelease];
[list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
- (void) reloadData {
[super reloadData];
+ [self updateButtonsForEditingStatusAnimated:YES];
@synchronized (database_) {
era_ = [database_ era];
[self showAddSourcePrompt];
}
-- (void) updateButtonsForEditingStatusAnimated:(BOOL)animated {
- BOOL editing([list_ isEditing]);
-
- [[self navigationItem] setLeftBarButtonItem:(editing ? [[[UIBarButtonItem alloc]
- initWithTitle:UCLocalize("ADD")
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(addButtonClicked)
- ] autorelease] : [[self navigationItem] backBarButtonItem]) animated:animated];
+- (void) refreshButtonClicked {
+ if ([delegate_ requestUpdate])
+ [self updateButtonsForEditingStatusAnimated:YES];
+}
- [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
- initWithTitle:(editing ? UCLocalize("DONE") : UCLocalize("EDIT"))
- style:(editing ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
- target:self
- action:@selector(editButtonClicked)
- ] autorelease] animated:animated];
+- (void) cancelButtonClicked {
+ [delegate_ cancelUpdate];
}
- (void) editButtonClicked {
spinner_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge] autorelease];
CGRect spinrect = [spinner_ frame];
- spinrect.origin.x = ([[self view] frame].size.width / 2) - (spinrect.size.width / 2);
+ spinrect.origin.x = Retina([[self view] frame].size.width / 2 - spinrect.size.width / 2);
spinrect.origin.y = [[self view] frame].size.height - 80.0f;
[spinner_ setFrame:spinrect];
[spinner_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin];
captrect.size.width = [[self view] frame].size.width;
captrect.size.height = 40.0f;
captrect.origin.x = 0;
- captrect.origin.y = ([[self view] frame].size.height / 2) - (captrect.size.height * 2);
+ captrect.origin.y = Retina([[self view] frame].size.height / 2 - captrect.size.height * 2);
caption_ = [[[UILabel alloc] initWithFrame:captrect] autorelease];
[caption_ setText:UCLocalize("PREPARING_FILESYSTEM")];
[caption_ setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
[caption_ setTextColor:[UIColor whiteColor]];
[caption_ setBackgroundColor:[UIColor clearColor]];
[caption_ setShadowColor:[UIColor blackColor]];
- [caption_ setTextAlignment:UITextAlignmentCenter];
+ [caption_ setTextAlignment:NSTextAlignmentCenter];
[view addSubview:caption_];
CGRect statusrect;
statusrect.size.width = [[self view] frame].size.width;
statusrect.size.height = 30.0f;
statusrect.origin.x = 0;
- statusrect.origin.y = ([[self view] frame].size.height / 2) - statusrect.size.height;
+ statusrect.origin.y = Retina([[self view] frame].size.height / 2 - statusrect.size.height);
status_ = [[[UILabel alloc] initWithFrame:statusrect] autorelease];
[status_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
[status_ setText:UCLocalize("EXIT_WHEN_COMPLETE")];
[status_ setTextColor:[UIColor whiteColor]];
[status_ setBackgroundColor:[UIColor clearColor]];
[status_ setShadowColor:[UIColor blackColor]];
- [status_ setTextAlignment:UITextAlignmentCenter];
+ [status_ setTextAlignment:NSTextAlignmentCenter];
[view addSubview:status_];
}
@interface Cydia : UIApplication <
ConfirmationControllerDelegate,
DatabaseDelegate,
- CydiaDelegate,
- UINavigationControllerDelegate,
- UITabBarControllerDelegate
+ CydiaDelegate
> {
_H<UIWindow> window_;
_H<CydiaTabBarController> tabbar_;
- _H<CydiaLoadingViewController> emulated_;
+ _H<CyteTabBarController> emulated_;
_H<NSMutableArray> essential_;
_H<NSMutableArray> broken_;
[tabbar_ beginUpdate];
}
+- (void) cancelUpdate {
+ [tabbar_ cancelUpdate];
+}
+
+- (bool) requestUpdate {
+ if (IsReachable("cydia.saurik.com")) {
+ [self beginUpdate];
+ return true;
+ } else {
+ UIAlertView *alert = [[[UIAlertView alloc]
+ initWithTitle:[NSString stringWithFormat:Colon_, Error_, UCLocalize("REFRESH")]
+ message:@"Host Unreachable" // XXX: Localize
+ delegate:self
+ cancelButtonTitle:UCLocalize("OK")
+ otherButtonTitles:nil
+ ] autorelease];
+
+ [alert setContext:@"norefresh"];
+ [alert show];
+
+ return false;
+ }
+}
+
- (BOOL) updating {
return [tabbar_ updating];
}
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])
+ _root(true) if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])
NSLog(@"failure to save metadata data: %@", error);
_trace();
}
}
- CydiaWriteSources();
+ _root(true) CydiaWriteSources();
}
// Navigation controller for the queuing badge.
}
- (void) reloadDataWithInvocation:(NSInvocation *)invocation {
+_profile(reloadDataWithInvocation)
@synchronized (self) {
UIProgressHUD *hud(loaded_ ? [self addProgressHUD] : nil);
if (hud != nil)
[essential_ removeAllObjects];
[broken_ removeAllObjects];
+ _profile(reloadDataWithInvocation$Essential)
NSArray *packages([database_ packages]);
for (Package *package in packages) {
if ([package half])
++changes;
}
}
+ _end
UITabBarItem *changesItem = [[[tabbar_ viewControllers] objectAtIndex:2] tabBarItem];
if (changes != 0) {
if (hud != nil)
[self removeProgressHUD:hud];
-} }
+}
+_end
+
+ PrintTimes();
+}
- (void) updateData {
[self _updateData];
if (emulated_ == nil)
return;
- [window_ addSubview:[tabbar_ view]];
if ([window_ respondsToSelector:@selector(setRootViewController:)])
[window_ setRootViewController:tabbar_];
- [[emulated_ view] removeFromSuperview];
+ else {
+ [window_ addSubview:[tabbar_ view]];
+ [[emulated_ view] removeFromSuperview];
+ }
+
emulated_ = nil;
[window_ setUserInteractionEnabled:YES];
}
- (void) _uicache {
_trace();
- system("su -c /usr/bin/uicache mobile");
+ system("/usr/bin/uicache");
_trace();
}
} else if ([context isEqualToString:@"fixhalf"]) {
if (button == [alert cancelButtonIndex]) {
@synchronized (self) {
- for (Package *broken in (id) broken_) {
+ _root(false) for (Package *broken in (id) broken_) {
[broken remove];
NSString *id = [broken id];
return false;
}
+ if ([tabbar_ modalViewController] != nil)
+ return false;
+
// Use external process status API internally.
// This is probably a really bad idea.
// XXX: what is the point of this? does this solve anything at all?
- (void) stash {
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque];
UpdateExternalStatus(1);
- [self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/free.sh"];
+ _root(true) [self yieldToSelector:@selector(system:) withObject:@"/usr/libexec/cydia/free.sh"];
UpdateExternalStatus(0);
[self removeStashController];
NSMutableArray *items;
if (kCFCoreFoundationVersionNumber < 800) {
items = [NSMutableArray arrayWithObjects:
- [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage imageNamed:@"home.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage imageNamed:@"install.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage imageNamed:@"changes.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage imageNamed:@"manage.png"] tag:0] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage imageNamed:@"search.png"] tag:0] autorelease],
nil];
} else {
items = [NSMutableArray arrayWithObjects:
- [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home7.png"] selectedImage:[UIImage applicationImageNamed:@"home7s.png"]] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install7.png"] selectedImage:[UIImage applicationImageNamed:@"install7s.png"]] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes7.png"] selectedImage:[UIImage applicationImageNamed:@"changes7s.png"]] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease],
- [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search7.png"] selectedImage:[UIImage applicationImageNamed:@"search7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage imageNamed:@"home7.png"] selectedImage:[UIImage imageNamed:@"home7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage imageNamed:@"install7.png"] selectedImage:[UIImage imageNamed:@"install7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage imageNamed:@"changes7.png"] selectedImage:[UIImage imageNamed:@"changes7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage imageNamed:@"manage7.png"] selectedImage:[UIImage imageNamed:@"manage7s.png"]] autorelease],
+ [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage imageNamed:@"search7.png"] selectedImage:[UIImage imageNamed:@"search7s.png"]] autorelease],
nil];
}
[NSURLCache setSharedURLCache:[[[CYURLCache alloc]
initWithMemoryCapacity:524288
diskCapacity:10485760
- diskPath:[NSString stringWithFormat:@"%@/SDURLCache", Cache_]
+ diskPath:Cache("SDURLCache")
] autorelease]];
[CydiaWebViewController _initialize];
[window_ setUserInteractionEnabled:NO];
[self setupViewControllers];
- emulated_ = [[[CydiaLoadingViewController alloc] init] autorelease];
- [window_ addSubview:[emulated_ view]];
+ CydiaLoadingViewController *loading([[[CydiaLoadingViewController alloc] init] autorelease]);
+ UINavigationController *navigation([[[UINavigationController alloc] init] autorelease]);
+ [navigation setViewControllers:[NSArray arrayWithObject:loading]];
+
+ emulated_ = [[[CyteTabBarController alloc] init] autorelease];
+ [emulated_ setViewControllers:[NSArray arrayWithObject:navigation]];
+ [emulated_ setSelectedIndex:0];
+
+ if ([emulated_ respondsToSelector:@selector(concealTabBarSelection)])
+ [emulated_ concealTabBarSelection];
+
if ([window_ respondsToSelector:@selector(setRootViewController:)])
[window_ setRootViewController:emulated_];
+ else
+ [window_ addSubview:[emulated_ view]];
[self performSelector:@selector(loadData) withObject:nil afterDelay:0];
_trace();
[self reloadDataWithInvocation:nil];
[self refreshIfPossible];
- PrintTimes();
-
[self disemulate];
int savedIndex = [[Metadata_ objectForKey:@"InterfaceIndex"] intValue];
// (Try to) show the startup URL.
if (starturl_ != nil) {
- [self openCydiaURL:starturl_ forExternal:NO];
+ [self openCydiaURL:starturl_ forExternal:YES];
starturl_ = nil;
}
}
return object;
}*/
-static NSSet *MobilizedFiles_;
-
-static NSURL *MobilizeURL(NSURL *url) {
- NSString *path([url path]);
- if ([path hasPrefix:@"/var/root/"]) {
- NSString *file([path substringFromIndex:10]);
- if ([MobilizedFiles_ containsObject:file])
- url = [NSURL fileURLWithPath:[@"/var/mobile/" stringByAppendingString:file] isDirectory:NO];
- }
-
- return url;
-}
-
-Class $CFXPreferencesPropertyListSource;
-@class CFXPreferencesPropertyListSource;
-
-MSHook(BOOL, CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, CFXPreferencesPropertyListSource *self, SEL _cmd) {
- NSURL *&url(MSHookIvar<NSURL *>(self, "_url")), *old(url);
- NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
- url = MobilizeURL(url);
- BOOL value(_CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(self, _cmd));
- //NSLog(@"%@ %s", [url absoluteString], value ? "YES" : "NO");
- url = old;
- [pool release];
- return value;
-}
-
-MSHook(void *, CFXPreferencesPropertyListSource$createPlistFromDisk, CFXPreferencesPropertyListSource *self, SEL _cmd) {
- NSURL *&url(MSHookIvar<NSURL *>(self, "_url")), *old(url);
- NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
- url = MobilizeURL(url);
- void *value(_CFXPreferencesPropertyListSource$createPlistFromDisk(self, _cmd));
- //NSLog(@"%@ %@", [url absoluteString], value);
- url = old;
- [pool release];
- return value;
-}
-
Class $NSURLConnection;
MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest *request, id delegate, BOOL usesCache, int64_t maxContentLength, BOOL startImmediately, NSDictionary *connectionProperties) {
MSHook(id, NSUserDefaults$objectForKey$, NSUserDefaults *self, SEL _cmd, NSString *key) {
if ([key respondsToSelector:@selector(isEqualToString:)] && [key isEqualToString:@"WebKitLocalStorageDatabasePathPreferenceKey"])
- return [NSString stringWithFormat:@"%@/LocalStorage", Cache_];
+ return Cache("LocalStorage");
return _NSUserDefaults$objectForKey$(self, _cmd, key);
}
int main(int argc, char *argv[]) {
+ seteuid(501);
+
NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]);
_trace();
PackageName = reinterpret_cast<CYString &(*)(Package *, SEL)>(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname))));
- MobilizedFiles_ = [NSMutableSet setWithObjects:
- @"Library/Preferences/com.apple.Accessibility.plist",
- @"Library/Preferences/com.apple.preferences.sounds.plist",
- nil];
-
/* Library Hacks {{{ */
class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16");
if (Method method = class_getInstanceMethod($WAKWindow, @selector(screenSize)))
method_setImplementation(method, (IMP) &$WAKWindow$screenSize);
- $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSource");
-
- Method CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(class_getInstanceMethod($CFXPreferencesPropertyListSource, @selector(_backingPlistChangedSinceLastSync)));
- if (CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync != NULL) {
- _CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync = reinterpret_cast<BOOL (*)(CFXPreferencesPropertyListSource *, SEL)>(method_getImplementation(CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync));
- method_setImplementation(CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, reinterpret_cast<IMP>(&$CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync));
- }
-
- Method CFXPreferencesPropertyListSource$createPlistFromDisk(class_getInstanceMethod($CFXPreferencesPropertyListSource, @selector(createPlistFromDisk)));
- if (CFXPreferencesPropertyListSource$createPlistFromDisk != NULL) {
- _CFXPreferencesPropertyListSource$createPlistFromDisk = reinterpret_cast<void *(*)(CFXPreferencesPropertyListSource *, SEL)>(method_getImplementation(CFXPreferencesPropertyListSource$createPlistFromDisk));
- method_setImplementation(CFXPreferencesPropertyListSource$createPlistFromDisk, reinterpret_cast<IMP>(&$CFXPreferencesPropertyListSource$createPlistFromDisk));
- }
-
$NSURLConnection = objc_getClass("NSURLConnection");
Method NSURLConnection$init$(class_getInstanceMethod($NSURLConnection, @selector(_initWithRequest:delegate:usesCache:maxContentLength:startImmediately:connectionProperties:)));
if (NSURLConnection$init$ != NULL) {
std::setlocale(LC_ALL, lang);
}
/* }}} */
+ /* Index Collation {{{ */
+ if (Class $UILocalizedIndexedCollation = objc_getClass("UILocalizedIndexedCollation")) { @try {
+ NSBundle *bundle([NSBundle bundleForClass:$UILocalizedIndexedCollation]);
+ NSString *path([bundle pathForResource:@"UITableViewLocalizedSectionIndex" ofType:@"plist"]);
+ //path = @"/System/Library/Frameworks/UIKit.framework/.lproj/UITableViewLocalizedSectionIndex.plist";
+ NSDictionary *dictionary([NSDictionary dictionaryWithContentsOfFile:path]);
+ _H<UILocalizedIndexedCollation> collation([[[$UILocalizedIndexedCollation alloc] initWithDictionary:dictionary] autorelease]);
+
+ CollationLocale_ = MSHookIvar<NSLocale *>(collation, "_locale");
+
+ if (kCFCoreFoundationVersionNumber >= 800 && [[CollationLocale_ localeIdentifier] isEqualToString:@"zh@collation=stroke"]) {
+ CollationThumbs_ = [NSArray arrayWithObjects:@"1",@"•",@"4",@"•",@"7",@"•",@"10",@"•",@"13",@"•",@"16",@"•",@"19",@"A",@"•",@"E",@"•",@"I",@"•",@"M",@"•",@"R",@"•",@"V",@"•",@"Z",@"#",nil];
+ for (NSInteger offset : (NSInteger[]) {0,1,3,4,6,7,9,10,12,13,15,16,18,25,26,29,30,33,34,37,38,42,43,46,47,50,51})
+ CollationOffset_.push_back(offset);
+ CollationTitles_ = [NSArray arrayWithObjects:@"1 畫",@"2 畫",@"3 畫",@"4 畫",@"5 畫",@"6 畫",@"7 畫",@"8 畫",@"9 畫",@"10 畫",@"11 畫",@"12 畫",@"13 畫",@"14 畫",@"15 畫",@"16 畫",@"17 畫",@"18 畫",@"19 畫",@"20 畫",@"21 畫",@"22 畫",@"23 畫",@"24 畫",@"25 畫以上",@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil];
+ CollationStarts_ = [NSArray arrayWithObjects:@"一",@"丁",@"丈",@"不",@"且",@"丞",@"串",@"並",@"亭",@"乘",@"乾",@"傀",@"亂",@"僎",@"僵",@"儐",@"償",@"叢",@"儳",@"嚴",@"儷",@"儻",@"囌",@"囑",@"廳",@"a",@"b",@"c",@"d",@"e",@"f",@"g",@"h",@"i",@"j",@"k",@"l",@"m",@"n",@"o",@"p",@"q",@"r",@"s",@"t",@"u",@"v",@"w",@"x",@"y",@"z",@"ʒ",nil];
+ } else {
+
+ CollationThumbs_ = [collation sectionIndexTitles];
+ for (size_t index(0), end([CollationThumbs_ count]); index != end; ++index)
+ CollationOffset_.push_back([collation sectionForSectionIndexTitleAtIndex:index]);
+
+ CollationTitles_ = [collation sectionTitles];
+ CollationStarts_ = MSHookIvar<NSArray *>(collation, "_sectionStartStrings");
+
+ NSString *&transform(MSHookIvar<NSString *>(collation, "_transform"));
+ if (&transform != NULL && transform != nil) {
+ /*if ([collation respondsToSelector:@selector(transformedCollationStringForString:)])
+ CollationModify_ = [=](NSString *value) { return [collation transformedCollationStringForString:value]; };*/
+ const UChar *uid(reinterpret_cast<const UChar *>([transform cStringUsingEncoding:NSUnicodeStringEncoding]));
+ UErrorCode code(U_ZERO_ERROR);
+ CollationTransl_ = utrans_openU(uid, -1, UTRANS_FORWARD, NULL, 0, NULL, &code);
+ if (!U_SUCCESS(code))
+ NSLog(@"%s", u_errorName(code));
+ }
+
+ }
+ } @catch (NSException *e) {
+ NSLog(@"%@", e);
+ goto hard;
+ } } else hard: {
+ CollationLocale_ = [[[NSLocale alloc] initWithLocaleIdentifier:@"en@collation=dictionary"] autorelease];
+
+ CollationThumbs_ = [NSArray arrayWithObjects:@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil];
+ for (NSInteger offset(0); offset != 28; ++offset)
+ CollationOffset_.push_back(offset);
+
+ CollationTitles_ = [NSArray arrayWithObjects:@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil];
+ CollationStarts_ = [NSArray arrayWithObjects:@"a",@"b",@"c",@"d",@"e",@"f",@"g",@"h",@"i",@"j",@"k",@"l",@"m",@"n",@"o",@"p",@"q",@"r",@"s",@"t",@"u",@"v",@"w",@"x",@"y",@"z",@"ʒ",nil];
+ }
+ /* }}} */
apr_app_initialize(&argc, const_cast<const char * const **>(&argv), NULL);
App_ = [[NSBundle mainBundle] bundlePath];
Advanced_ = YES;
- setuid(0);
- setgid(0);
-
- if (access("/var/mobile/Library/Keyboard/UserDictionary.sqlite", F_OK) == 0)
- system("mkdir -p /var/root/Library/Keyboard; cp -af /var/mobile/Library/Keyboard/UserDictionary.sqlite /var/root/Library/Keyboard/");
-
- Cache_ = [[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia", @"/var/root"] retain];
+ Cache_ = [[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia", @"/var/mobile"] retain];
/*Method alloc = class_getClassMethod([NSObject class], @selector(alloc));
alloc_ = alloc->method_imp;
else
Machine_ = machine;
+ int64_t usermem(0);
+ size = sizeof(usermem);
+ if (sysctlbyname("hw.usermem", &usermem, &size, NULL, 0) == -1)
+ usermem = 0;
+
SerialNumber_ = (NSString *) CYIOGetValue("IOService:/", @"IOPlatformSerialNumber");
ChipID_ = [CYHex((NSData *) CYIOGetValue("IODeviceTree:/chosen", @"unique-chip-id"), true) uppercaseString];
BBSNum_ = CYHex((NSData *) CYIOGetValue("IOService:/AppleARMPE/baseband", @"snum"), false);
Changed_ = true;
}
+
+ _H<NSMutableArray> broken([NSMutableArray array]);
+ for (NSString *key in (id) Sources_)
+ if ([key rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"# "]].location != NSNotFound)
+ [broken addObject:key];
+ if ([broken count] != 0) {
+ for (NSString *key in (id) broken)
+ [Sources_ removeObjectForKey:key];
+ Changed_ = true;
+ } broken = nil;
/* }}} */
- CydiaWriteSources();
+ _root(true) CydiaWriteSources();
_trace();
- MetaFile_.Open("/var/lib/cydia/metadata.cb0");
+ _root(true) MetaFile_.Open("/var/lib/cydia/metadata.cb0");
_trace();
if (Packages_ != nil) {
if (access("/User", F_OK) != 0 || version != 6) {
_trace();
- system("/usr/libexec/cydia/firmware.sh");
+ _root(true) system("/usr/libexec/cydia/firmware.sh");
_trace();
}
- _assert([[NSFileManager defaultManager]
- createDirectoryAtPath:@"/var/cache/apt/archives/partial"
- withIntermediateDirectories:YES
- attributes:nil
- error:NULL
- ]);
-
if (access("/tmp/cydia.chk", F_OK) == 0) {
- if (unlink("/var/cache/apt/pkgcache.bin") == -1)
+ if (unlink([Cache("pkgcache.bin") UTF8String]) == -1)
_assert(errno == ENOENT);
- if (unlink("/var/cache/apt/srcpkgcache.bin") == -1)
+ if (unlink([Cache("srcpkgcache.bin") UTF8String]) == -1)
_assert(errno == ENOENT);
}
// XXX: this timeout might be important :(
//_config->Set("Acquire::http::Timeout", 15);
- _config->Set("Acquire::http::MaxParallel", 3);
+ _config->Set("Acquire::http::MaxParallel", usermem >= 384 * 1024 * 1024 ? 16 : 3);
+
+ mkdir([Cache_ UTF8String], 0755);
+ mkdir([Cache("archives") UTF8String], 0755);
+ mkdir([Cache("archives/partial") UTF8String], 0755);
+ _config->Set("Dir::Cache", [Cache_ UTF8String]);
+
+ mkdir([Cache("lists") UTF8String], 0755);
+ mkdir([Cache("lists/partial") UTF8String], 0755);
+ mkdir([Cache("periodic") UTF8String], 0755);
+ _config->Set("Dir::State::Lists", [Cache("lists") UTF8String]);
/* }}} */
/* Color Choices {{{ */
space_ = CGColorSpaceCreateDeviceRGB();
projects / cydia.git / blobdiff