Fixed images with spaces in their file names not working.

Piwigo · Mar 26, 2015 · a60c442 · a60c442
1 parent 6aa504e
commit a60c442
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/piwigo/AlbumImagesViewController.m b/piwigo/AlbumImagesViewController.m
@@ -272,7 +272,7 @@ -(void)downloadImage
 
 	UIImageView *dummyView = [UIImageView new];
 	__weak typeof(self) weakSelf = self;
-	[dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:downloadingImage.thumbPath]]
+	[dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[downloadingImage.thumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]
 					 placeholderImage:nil
 							  success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 								  weakSelf.downloadView.downloadImage = image;

diff --git a/piwigo/AlbumTableViewCell.m b/piwigo/AlbumTableViewCell.m
@@ -351,7 +351,7 @@ -(void)setupWithAlbumData:(PiwigoAlbumData*)albumData
 						  }
 						  else
 						  {
-							  [self.backgroundImage setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:imageData.mediumPath]]
+							  [self.backgroundImage setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[imageData.mediumPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]
 														  placeholderImage:nil
 																   success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 

diff --git a/piwigo/AllCategoriesViewController.m b/piwigo/AllCategoriesViewController.m
@@ -171,7 +171,7 @@ -(void)setRepresenativeForCategoryId:(NSInteger)categoryId
 												  category.albumThumbnailUrl = imgData.thumbPath;
 
 												  UIImageView *dummyView = [UIImageView new];
-												  [dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:imgData.mediumPath]] placeholderImage:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
+												  [dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[imgData.mediumPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]] placeholderImage:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 													  category.categoryImage = image;
 													  [[NSNotificationCenter defaultCenter] postNotificationName:kPiwigoNotificationCategoryImageUpdated object:nil];
 												  } failure:nil];

diff --git a/piwigo/ImageCollectionViewCell.m b/piwigo/ImageCollectionViewCell.m
@@ -142,7 +142,7 @@ -(void)setupWithImageData:(PiwigoImageData*)imageData
 		return;
 	}
 
-	[self.cellImage setImageWithURL:[NSURL URLWithString:self.imageData.thumbPath] placeholderImage:[UIImage imageNamed:@"placeholder"]];
+	[self.cellImage setImageWithURL:[NSURL URLWithString:[self.imageData.thumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] placeholderImage:[UIImage imageNamed:@"placeholder"]];
 	self.nameLabel.text = imageData.name;
 
 	if(imageData.isVideo)

diff --git a/piwigo/ImageDetailViewController.m b/piwigo/ImageDetailViewController.m
@@ -191,7 +191,7 @@ -(void)downloadImage
 
 	UIImageView *dummyView = [UIImageView new];
 	__weak typeof(self) weakSelf = self;
-	[dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.imageData.thumbPath]]
+	[dummyView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[self.imageData.thumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]
 					 placeholderImage:nil
 							  success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 								  weakSelf.downloadView.downloadImage = image;

diff --git a/piwigo/ImagePreviewViewController.m b/piwigo/ImagePreviewViewController.m
@@ -42,10 +42,10 @@ -(void)setImageWithImageData:(PiwigoImageData*)imageData
 		return;
 	}
 
-	UIImage *thumb = [[UIImageView sharedImageCache] cachedImageForRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:imageData.thumbPath]]];
+	UIImage *thumb = [[UIImageView sharedImageCache] cachedImageForRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[imageData.thumbPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]];
 
 	__weak typeof(self) weakSelf = self;
-	[self.scrollView.imageView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:imageData.mediumPath]]
+	[self.scrollView.imageView setImageWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[imageData.mediumPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]
 									 placeholderImage:thumb ? thumb : [UIImage imageNamed:@"placeholder"]
 							   success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
 								   weakSelf.scrollView.imageView.image = image;

diff --git a/piwigo/ImageScrollView.m b/piwigo/ImageScrollView.m
@@ -47,7 +47,7 @@ -(void)setupPlayerWithURL:(NSString*)videoURL
 	self.maximumZoomScale = 1.0;
 	self.minimumZoomScale = 1.0;
 
-	self.player = [[MPMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:videoURL]];
+	self.player = [[MPMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:[videoURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	[self.player setControlStyle:MPMovieControlStyleDefault];
 	self.player.scalingMode = MPMovieScalingModeAspectFit;
 	self.player.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;

diff --git a/piwigo/ImageService.m b/piwigo/ImageService.m
@@ -205,7 +205,7 @@ +(AFHTTPRequestOperation*)downloadImage:(PiwigoImageData*)image
 							onFailure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))fail
 {
 	if(!image) return nil;
-	NSURLRequest *requst = [NSURLRequest requestWithURL:[NSURL URLWithString:image.fullResPath]];
+	NSURLRequest *requst = [NSURLRequest requestWithURL:[NSURL URLWithString:[image.fullResPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	AFHTTPRequestOperation *requestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:requst];
 	requestOperation.responseSerializer = [AFImageResponseSerializer serializer];
 	[requestOperation setCompletionBlockWithSuccess:completion
@@ -227,7 +227,7 @@ +(AFHTTPRequestOperation*)downloadVideo:(PiwigoImageData*)video
 							  onFailure:(void (^)(AFHTTPRequestOperation *operation, NSError *error))fail
 {
 	if(!video) return nil;
-	NSURLRequest *requst = [NSURLRequest requestWithURL:[NSURL URLWithString:video.fullResPath]];
+	NSURLRequest *requst = [NSURLRequest requestWithURL:[NSURL URLWithString:[video.fullResPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
 	AFHTTPRequestOperation *requestOperation = [[AFHTTPRequestOperation alloc] initWithRequest:requst];
 	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 	NSString *path = [[paths objectAtIndex:0] stringByAppendingPathComponent:video.fileName];