Merge branch 'release-1.0.2'

Core/Source/DTDownload.m

@@ -327,11 +327,35 @@ - (void)_completeWithSuccess
 			return;
 		}
 
-		if (![fileManager removeItemAtPath:[_destinationBundleFilePath stringByDeletingLastPathComponent] error:&error]) {
+		if (![fileManager removeItemAtPath:[_destinationBundleFilePath stringByDeletingLastPathComponent] error:&error])
+		{
 			NSLog(@"Cannot remove item from %@, %@ ", [_destinationBundleFilePath stringByDeletingLastPathComponent], [error localizedDescription]);
+		}
+
+		NSData *data = [NSData dataWithContentsOfFile:targetPath options:NSDataReadingMappedIfSafe error:&error];
+
+		if (error)
+		{
+			NSLog(@"Error occured when reading file from path: %@", targetPath);
+		}
+
+		// Error: finished file size differs from header size -> so throw error
+		if (_expectedContentLength>0 && [data length] != _expectedContentLength)
+		{
+			NSString *errorMessage = [NSString stringWithFormat:@"Error: finished file size %d differs from header size %d", (int)[data length], (int)_expectedContentLength];
 
+			NSLog(errorMessage, nil);
+
+			NSDictionary *userInfo = @{errorMessage : NSLocalizedDescriptionKey};
+
+			NSError *error = [NSError errorWithDomain:@"DTDownloadError" code:1 userInfo:userInfo];
+
+			[self _completeWithError:error];
+
+			return;
 		}
 
+
 		// notify delegate
 		if ([_delegate respondsToSelector:@selector(download:didFinishWithFile:)])
 		{

Core/Source/DTDownloadCache.m

@@ -314,6 +314,7 @@ - (NSData *)cachedDataForURL:(NSURL *)URL option:(DTDownloadCacheOption)option c
 			case DTDownloadCacheOptionReturnCacheAndLoadAlways:
 			{
 				cachedFile.forceLoad = [NSNumber numberWithBool:YES];
+				cachedFile.abortDownloadIfNotChanged = @(NO);
 
 				break;
 			}
@@ -392,12 +393,14 @@ - (void)download:(DTDownload *)download didFinishWithFile:(NSString *)path
 	NSURL *URL = download.URL;
 
     [_workerContext performBlock:^{
-		 NSData *data = [NSData dataWithContentsOfMappedFile:path];
 
-		 if (download.expectedContentLength>0 && [data length] != download.expectedContentLength)
-		 {
-			 NSLog(@"Warning: finished file size %d differs from header size %d", (int)[data length], (int)download.expectedContentLength);
-		 }
+		 NSError *error = nil;
+		NSData *data = [NSData dataWithContentsOfFile:path options:NSDataReadingMappedIfSafe error:&error];
+
+		if (error)
+		{
+			NSLog(@"Error occured when reading file from path: %@", path);
+		}
 
 		 // only add cached file if we actually got data in it
 		if (data)
@@ -932,14 +935,15 @@ @implementation DTDownloadCache (Images)
 
 - (UIImage *)cachedImageForURL:(NSURL *)URL option:(DTDownloadCacheOption)option completion:(DTDownloadCacheImageCompletionBlock)completion
 {
+
 	// try memory cache first
 	UIImage *cachedImage = [_memoryCache objectForKey:URL];
 
-	if (cachedImage)
+	if (cachedImage && !DTDownloadCacheOptionReturnCacheAndLoadAlways)
 	{
 		return cachedImage;
 	}
-	
+
 	// create a special wrapper completion handler
 	DTDownloadCacheDataCompletionBlock internalBlock = NULL;
 
@@ -970,7 +974,6 @@ - (UIImage *)cachedImageForURL:(NSURL *)URL option:(DTDownloadCacheOption)option
 		};
 	}
 
-
 	// try file cache
 	NSData *data = [self cachedDataForURL:URL option:option completion:internalBlock];
 

DTDownload.podspec

@@ -1,14 +1,13 @@
 Pod::Spec.new do |spec|
   spec.name         = 'DTDownload'
-  spec.version      = '1.0.1'
+  spec.version      = '1.0.2'
   spec.summary      = "File Downloading, Caching and Queueing."
   spec.homepage     = "https://github.com/Cocoanetics/DTDownload"
   spec.author       = { "Oliver Drobnik" => "oliver@drobnik.com" }
   spec.source       = { :git => "https://github.com/Cocoanetics/DTDownload.git", :tag => spec.version.to_s  }
   spec.platform = :ios
   spec.ios.deployment_target = '5.0'
-  spec.dependency 'DTFoundation/Core', '~>1.4.3'
-  spec.dependency 'DTFoundation/UIKit', '~>1.4.3'
+  spec.dependency 'DTFoundation/Core', '~>1.5.0'
   spec.source_files = 'Core/Source/*.{h,m}'
   spec.frameworks = ['CoreData']
   spec.license      = 'BSD'

Documentation/Change Log-template.markdown

@@ -3,6 +3,11 @@ Change Log
 
 This is the history of version updates.
 
+**Version 1.0.2**
+
+- ADDED: Sample for DTDownloadCache
+- FIXED: Support for web servers that don't support partial content for resuming
+
 **Version 1.0.1**
 
 - FIXED: Downloads would be corrupted if requesting partial file from server that didn't support that

ImageDownloadSample/AppDelegate.h

@@ -0,0 +1,15 @@
+//
+//  AppDelegate.h
+//  ImageDownloadSample
+//
+//  Created by Stefan Gugarel on 7/11/13.
+//  Copyright (c) 2013 Drobnik KG. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end

ImageDownloadSample/AppDelegate.m

@@ -0,0 +1,46 @@
+//
+//  AppDelegate.m
+//  ImageDownloadSample
+//
+//  Created by Stefan Gugarel on 7/11/13.
+//  Copyright (c) 2013 Drobnik KG. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    // Override point for customization after application launch.
+    return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+	// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+	// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+	// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+	// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+	// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+	// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+	// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
+@end

ImageDownloadSample/ImageDownloadSample-Info.plist

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.drobnik.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIMainStoryboardFile</key>
+	<string>MainStoryboard_iPhone</string>
+	<key>UIMainStoryboardFile~ipad</key>
+	<string>MainStoryboard_iPad</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

ImageDownloadSample/ImageDownloadSample-Prefix.pch

@@ -0,0 +1,14 @@
+//
+// Prefix header for all source files of the 'ImageDownloadSample' target in the 'ImageDownloadSample' project
+//
+
+#import <Availability.h>
+
+#ifndef __IPHONE_5_0
+#warning "This project uses features only available in iOS SDK 5.0 and later."
+#endif
+
+#ifdef __OBJC__
+	#import <UIKit/UIKit.h>
+	#import <Foundation/Foundation.h>
+#endif

ImageDownloadSample/ViewController.h

@@ -0,0 +1,23 @@
+//
+//  ViewController.h
+//  ImageDownloadSample
+//
+//  Created by Stefan Gugarel on 7/11/13.
+//  Copyright (c) 2013 Drobnik KG. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ViewController : UIViewController
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicatorView;
+
+@property (weak, nonatomic) IBOutlet UIImageView *imageView;
+
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+
+@property (weak, nonatomic) IBOutlet UIPickerView *downloadOptionPickerView;
+
+- (IBAction)reloadButtonPressed:(UIButton *)sender;
+
+@end