Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198432
Change subject: set article imageURL and save image list
......................................................................
set article imageURL and save image list
The article's lead image (imageURL) wasn't being set during migration.
The list of images (images) wasn't being saved after importing images
either.
Bug: TT92697
Change-Id: Icc0582133659e9d21052e42c0b06e1102091e2b4
---
M MediaWikiKit/MediaWikiKit/MWKSite.m
M wikipedia/Data/SchemaConverter.m
2 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/32/198432/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKSite.m
b/MediaWikiKit/MediaWikiKit/MWKSite.m
index 625356d..76b7dbc 100644
--- a/MediaWikiKit/MediaWikiKit/MWKSite.m
+++ b/MediaWikiKit/MediaWikiKit/MWKSite.m
@@ -48,13 +48,11 @@
#pragma mark - class methods
+ (MWKSite*)siteWithDomain:(NSString*)domain language:(NSString*)language {
- // if this fails, make the rest of this method thread safe
- NSParameterAssert([NSThread isMainThread]);
-
static NSMutableDictionary* cachedSites = nil;
- if (cachedSites == nil) {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
cachedSites = [[NSMutableDictionary alloc] init];
- }
+ });
NSString* key = [NSString stringWithFormat:@"%@:%@", domain, language];
MWKSite* site = cachedSites[key];
if (site == nil) {
diff --git a/wikipedia/Data/SchemaConverter.m b/wikipedia/Data/SchemaConverter.m
index 54a1645..13e770b 100644
--- a/wikipedia/Data/SchemaConverter.m
+++ b/wikipedia/Data/SchemaConverter.m
@@ -29,8 +29,10 @@
MWKTitle* title = [site titleWithString:titleStr];
MWKArticle* article = [self.dataStore articleWithTitle:title];
[article importMobileViewJSON:mobileview];
- [article save];
- }@catch (NSException* ex) {
+ if (!article.imageURL && article.images.count) {
+ article.imageURL = [article.images[0] sourceURL];
+ }
+ } @catch (NSException* ex) {
NSLog(@"IMPORT ERROR on article %@:%@: %@", language, titleStr, ex);
}
}
@@ -50,6 +52,7 @@
MWKImage* image = [article importImageURL:sourceURL
sectionId:sectionId];
[image importImageData:imageData];
+ [article save];
}@catch (NSException* ex) {
NSLog(@"IMPORT ERROR on image %@ in article %@:%@: %@", sourceURL,
language, titleStr, ex);
}
--
To view, visit https://gerrit.wikimedia.org/r/198432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc0582133659e9d21052e42c0b06e1102091e2b4
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
