First draft of relevancy sorted search.

diff --git a/Menes/radixSortWithSelector.h b/Menes/radixSortWithSelector.h
index d148cb38f7e080253cda238e0a65569e1b090b5e..4438584a7effa1d5b793c0e0caa35a0eb4c4ac4b 100644 (file)
--- a/Menes/radixSortWithSelector.h
+++ b/Menes/radixSortWithSelector.h
@@ -46,6 +46,7 @@ typedef uint32_t (*MenesRadixSortFunction)(id, void *);
 
 @interface NSMutableArray (MenesRadixSortWithSelector)
 - (void) radixSortUsingFunction:(MenesRadixSortFunction)function withContext:(void *)argument;
+- (void) radixSortUsingSelector:(SEL)selector;
 @end
 
 #endif//Menes_radixSort_H

diff --git a/Menes/radixSortWithSelector.mm b/Menes/radixSortWithSelector.mm
index 949a14b4c3123b361af65b09c0c16b28e6bd849e..f61dd99b088681c7cc65563b8c7bd14569a95a9d 100644 (file)
--- a/Menes/radixSortWithSelector.mm
+++ b/Menes/radixSortWithSelector.mm
@@ -41,6 +41,8 @@
 
 #include "Menes/radixSortWithSelector.h"
 
+#include <objc/runtime.h>
+
 struct RadixItem_ {
     size_t index;
     uint32_t key;
@@ -109,4 +111,12 @@ struct RadixItem_ {
     delete [] swap;
 }
 
+- (void) radixSortUsingSelector:(SEL)selector {
+    if ([self count] == 0)
+        return;
+
+    IMP imp(class_getMethodImplementation([[self lastObject] class], selector));
+    [self radixSortUsingFunction:reinterpret_cast<MenesRadixSortFunction>(imp) withContext:selector];
+}
+
 @end

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 0860b0e0d074e26b722502525c9e369125366b37..96b546268089c6637524d0c3527d9bae6e01bb9e 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1685,6 +1685,8 @@ struct ParsedPackage {
 
     apr_pool_t *pool_;
 
+    uint32_t rank_;
+
     _transient Database *database_;
 
     pkgCache::VerIterator version_;
@@ -1768,6 +1770,7 @@ struct ParsedPackage {
 
 - (Source *) source;
 
+- (uint32_t) rank;
 - (BOOL) matches:(NSString *)text;
 
 - (bool) hasSupportingRole;
@@ -2672,30 +2675,40 @@ struct PackageNameOrdering :
     return source_ == (Source *) [NSNull null] ? nil : source_;
 }
 
+- (uint32_t) rank {
+    return rank_;
+}
+
 - (BOOL) matches:(NSString *)text {
     if (text == nil)
         return NO;
 
+    rank_ = 0;
+
+    NSString *string;
     NSRange range;
+    NSUInteger length;
 
-    range = [[self id] rangeOfString:text options:MatchCompareOptions_];
+    string = [self id];
+    range = [string rangeOfString:text options:MatchCompareOptions_];
     if (range.location != NSNotFound)
-        return YES;
+        rank_ -= 10 * (100000 / [string length]);
 
-    range = [[self name] rangeOfString:text options:MatchCompareOptions_];
+    string = [self name];
+    range = [string rangeOfString:text options:MatchCompareOptions_];
     if (range.location != NSNotFound)
-        return YES;
+        rank_ -= 6  * (100000 / [string length]);
 
     [self parse];
 
-    NSString *description([self shortDescription]);
-    NSUInteger length([description length]);
+    string = [self shortDescription];
+    length = [string length];
 
-    range = [[self shortDescription] rangeOfString:text options:MatchCompareOptions_ range:NSMakeRange(0, std::min<NSUInteger>(length, 100))];
+    range = [string rangeOfString:text options:MatchCompareOptions_ range:NSMakeRange(0, std::min<NSUInteger>(length, 100))];
     if (range.location != NSNotFound)
-        return YES;
+        rank_ -= 2 * (100000 / length);
 
-    return NO;
+    return rank_ != 0;
 }
 
 - (bool) hasSupportingRole {
@@ -5647,6 +5660,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return false;
 }
 
+- (bool) showsSections {
+    return true;
+}
+
 - (void) deselectWithAnimation:(BOOL)animated {
     [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
 }
@@ -5777,7 +5794,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (NSArray *) sectionIndexTitlesForTableView:(UITableView *)tableView {
-    if ([self isSummarized])
+    if ([self showsSections])
         return nil;
 
     return index_;
@@ -5841,12 +5858,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return false;
 }
 
-- (NSArray *) _reloadPackages {
+- (NSMutableArray *) _reloadPackages {
 @synchronized (database_) {
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
 
-    return [NSArray arrayWithArray:packages];
+    return [NSMutableArray arrayWithArray:packages];
 } }
 
 - (void) _reloadData {
@@ -5919,8 +5936,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     {
         [index_ removeAllObjects];
 
-        bool summary([self isSummarized]);
-        if (summary) {
+        bool sectioned([self showsSections]);
+        if (!sectioned) {
             section = [[[Section alloc] initWithName:nil localize:false] autorelease];
             [sections_ addObject:section];
         }
@@ -5935,7 +5952,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
                     index = [package index];
                 _end
 
-                if (!summary && (section == nil || [section index] != index)) {
+                if (sectioned && (section == nil || [section index] != index)) {
                     _profile(PackageTable$reloadData$Section$Allocate)
                         section = [[[Section alloc] initWithIndex:index row:offset] autorelease];
                     _end
@@ -6025,7 +6042,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [self setObject:object];
 }
 
-- (NSArray *) _reloadPackages {
+- (NSMutableArray *) _reloadPackages {
 @synchronized (database_) {
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
@@ -7066,7 +7083,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     } return self;
 }
 
-- (NSArray *) _reloadPackages {
+- (NSMutableArray *) _reloadPackages {
 @synchronized (database_) {
     era_ = [database_ era];
     NSArray *packages([database_ packages]);
@@ -7266,6 +7283,17 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return [self filter] == @selector(isUnfilteredAndSelectedForBy:);
 }
 
+- (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:query])) {
         search_ = [[[UISearchBar alloc] init] autorelease];