[MediaWiki-commits] [Gerrit] merge release/4.1.1 - change (apps...wikipedia)
Dr0ptp4kt has submitted this change and it was merged.
Change subject: merge release/4.1.1
..
merge release/4.1.1
Here's a breakdown of the conflicts:
- Wikipedia.xcodeproj/project.pbxproj
Pretty simple, just some new files
- Wikipedia/AppDelegate+DataMigrationProgressDelegate.h
- Wikipedia/AppDelegate+DataMigrationProgressDelegate.m
- Wikipedia/AppDelegate.m
Some issues w/ refactoring the crash reporting refactor and data
migration progress consolidation. I added a property to verify the alert
view is the data migration alert, just to be doubly sure.
- Wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
- Wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
Had to refactor some stuff to incorporate the "no canonical filename"
fallback that Corey added.
- Wikipedia/Wikipedia-Info.plist
Version & bundle identifier conflict.
- WikipediaUnitTests/OldDataSchemaMigratorTests.m
New tests added
Change-Id: I4e0c130c3aa9e66b7e2af312294b3e21cfc26b7e
Ticket: T96452
---
M MediaWikiKit/MediaWikiKit/MWKSectionList.m
A MediaWikiKit/MediaWikiKit/MWKSectionList_Private.h
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/AppDelegate.m
M Wikipedia/Data/DataMigrator.h
M Wikipedia/Data/DataMigrator.m
M Wikipedia/Data/OldDataSchemaMigrator.h
M Wikipedia/Data/OldDataSchemaMigrator.m
M Wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.h
M Wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.m
M Wikipedia/View Controllers/Image Gallery/WMFImageInfoController.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
M Wikipedia/Wikipedia-Info.plist
M Wikipedia/en.lproj/Localizable.strings
M Wikipedia/qqq.lproj/Localizable.strings
A WikipediaUnitTests/MWKSectionListTests.m
M WikipediaUnitTests/OldDataSchemaMigratorTests.m
17 files changed, 376 insertions(+), 150 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
Mhurd: Looks good to me, but someone else must approve
diff --git a/MediaWikiKit/MediaWikiKit/MWKSectionList.m
b/MediaWikiKit/MediaWikiKit/MWKSectionList.m
index e606895..57a184b 100644
--- a/MediaWikiKit/MediaWikiKit/MWKSectionList.m
+++ b/MediaWikiKit/MediaWikiKit/MWKSectionList.m
@@ -6,6 +6,7 @@
// Copyright (c) 2014 Wikimedia Foundation. All rights reserved.
//
+#import "MWKSectionList_Private.h"
#import "MediaWikiKit.h"
@implementation MWKSectionList {
@@ -27,35 +28,49 @@
_article = article;
mutationState = 0;
if (_sections == nil) {
-_sections = [@[] mutableCopy];
-NSFileManager* fm = [NSFileManager defaultManager];
-NSString* path= [[self.article.dataStore
pathForTitle:self.article.title] stringByAppendingPathComponent:@"sections"];
-NSArray* files= [fm contentsOfDirectoryAtPath:path error:nil];
-files = [files sortedArrayUsingComparator:^NSComparisonResult
(NSString* obj1, NSString* obj2) {
-int sectionId1 = [obj1 intValue];
-int sectionId2 = [obj2 intValue];
-if (sectionId1 < sectionId2) {
-return NSOrderedAscending;
-} else if (sectionId1 == sectionId2) {
-return NSOrderedSame;
-} else {
-return NSOrderedDescending;
-}
-}];
-NSRegularExpression* redigits = [NSRegularExpression
regularExpressionWithPattern:@"^\\d+$" options:0 error:nil];
-for (NSString* subpath in files) {
-NSString* filename = [subpath lastPathComponent];
-NSArray* matches = [redigits matchesInString:filename
options:0 range:NSMakeRange(0, [filename length])];
-if (matches && [matches count]) {
-int sectionId = [filename intValue];
-_sections[sectionId] = [self.article.dataStore
sectionWithId:sectionId article:self.article];
-}
-}
+_sections = [NSMutableArray array];
+[self importSectionsFromDisk];
}
}
return self;
}
+- (void)importSectionsFromDisk {
+NSFileManager* fm = [NSFileManager defaultManager];
+NSString* path= [[self.article.dataStore
pathForTitle:self.article.title] stringByAppendingPathComponent:@"sections"];
+
+NSArray* files = [fm contentsOfDirectoryAtPath:path error:nil];
+files = [files sortedArrayUsingComparator:^NSComparisonResult (NSString*
obj1, NSString* obj2) {
+int sectionId1 = [obj1 intValue];
+int sectionId2 = [obj2 intValue];
+if (sectionId1 < sectionId2) {
+return NSOrderedAscending;
+} else if (sectionId1 == sectionId2) {
+return NSOrderedSame;
+} else {
+return NSOrderedDescending;
+}
+}];
+
+NSRegularExpression* redigits = [NSRegularExpression
regularExpressionWi
[MediaWiki-commits] [Gerrit] merge release/4.1.1 - change (apps...wikipedia)
Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/205287 Change subject: merge release/4.1.1 .. merge release/4.1.1 Here's a breakdown of the conflicts: - Wikipedia.xcodeproj/project.pbxproj Pretty simple, just some new files - Wikipedia/AppDelegate+DataMigrationProgressDelegate.h - Wikipedia/AppDelegate+DataMigrationProgressDelegate.m - Wikipedia/AppDelegate.m Some issues w/ refactoring the crash reporting refactor and data migration progress consolidation. I added a property to verify the alert view is the data migration alert, just to be doubly sure. - Wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m - Wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m Had to refactor some stuff to incorporate the "no canonical filename" fallback that Corey added. - Wikipedia/Wikipedia-Info.plist Version & bundle identifier conflict. - WikipediaUnitTests/OldDataSchemaMigratorTests.m New tests added - svgs/icon-prod.svg - wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg - wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png - wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png Pretty sure all of these were just additions from Xcode 6.3 Change-Id: I4e0c130c3aa9e66b7e2af312294b3e21cfc26b7e Ticket: T96452 --- M MediaWikiKit/MediaWikiKit/MWKSectionList.m A MediaWikiKit/MediaWikiKit/MWKSectionList_Private.h M Wikipedia.xcodeproj/project.pbxproj M Wikipedia/AppDelegate.m M Wikipedia/Data/DataMigrator.h M Wikipedia/Data/DataMigrator.m M Wikipedia/Data/OldDataSchemaMigrator.h M Wikipedia/Data/OldDataSchemaMigrator.m M Wikipedia/Images.xcassets/Wikipedia_wordmark_gray.imageset/Contents.json M Wikipedia/Images.xcassets/abuse-filter-disallowed.imageset/Contents.json M Wikipedia/Images.xcassets/abuse-filter-flag-white.imageset/Contents.json M Wikipedia/Images.xcassets/by_white.imageset/Contents.json M Wikipedia/Images.xcassets/cc_white.imageset/Contents.json M Wikipedia/Images.xcassets/clear.imageset/Contents.json M Wikipedia/Images.xcassets/lead-default.imageset/Contents.json M Wikipedia/Images.xcassets/logo-onboarding-subtitle.imageset/Contents.json M Wikipedia/Images.xcassets/logo-onboarding.imageset/Contents.json M Wikipedia/Images.xcassets/logo-placeholder-nearby.imageset/Contents.json M Wikipedia/Images.xcassets/logo-placeholder-saved.imageset/Contents.json M Wikipedia/Images.xcassets/logo-placeholder-search.imageset/Contents.json M Wikipedia/Images.xcassets/sa_white.imageset/Contents.json M Wikipedia/Images.xcassets/text_field_x_circle_gray.imageset/Contents.json M Wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.h M Wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.m M Wikipedia/View Controllers/Image Gallery/WMFImageInfoController.m M Wikipedia/View Controllers/SearchResults/SearchResultsController.m M Wikipedia/Wikipedia-Info.plist M Wikipedia/en.lproj/Localizable.strings M Wikipedia/qqq.lproj/Localizable.strings A WikipediaUnitTests/MWKSectionListTests.m M WikipediaUnitTests/OldDataSchemaMigratorTests.m A wikipedia/Images.xcassets/AppIcon.appiconset/icon.svg A wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon120-1.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon180.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png A wikipedia/Images.xcassets/AppIcon.appiconset/icon87.png 48 files changed, 479 insertions(+),
