Fixed Retina Mac resizing issue

Fixed the Retina resizing issue, also put the model related stuff into
a ResizeModel.

Author: Erik Terwan

Build/Intermediates/Pods.build/Debug/AFNetworking.build/dgph

@@ -2,3 +2,4 @@
 /Users/Erik/Mac Apps/Retini/Build/Intermediates/Retini.build/Debug/Retini.build/Objects-normal/x86_64/AppDelegate.o
 /Users/Erik/Mac Apps/Retini/Build/Intermediates/Retini.build/Debug/Retini.build/Objects-normal/x86_64/DragDropView.o
 /Users/Erik/Mac Apps/Retini/Build/Intermediates/Retini.build/Debug/Retini.build/Objects-normal/x86_64/NSImage+Resize.o
+/Users/Erik/Mac Apps/Retini/Build/Intermediates/Retini.build/Debug/Retini.build/Objects-normal/x86_64/ResizeModel.o

Build/Intermediates/Pods.build/Debug/Pods-Retini.build/dgph

@@ -13,6 +13,7 @@
 		038880BC1B305F6300F8807F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 038880BA1B305F6300F8807F /* MainMenu.xib */; };
 		038880C81B305F6300F8807F /* RetiniTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 038880C71B305F6300F8807F /* RetiniTests.m */; };
 		038880D31B305FDB00F8807F /* DragDropView.m in Sources */ = {isa = PBXBuildFile; fileRef = 038880D21B305FDB00F8807F /* DragDropView.m */; };
+		03C461981C2760CD00F1572A /* ResizeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C461971C2760CD00F1572A /* ResizeModel.m */; };
 		03CB44F21BC80603003C4879 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03CB44F11BC80603003C4879 /* QuartzCore.framework */; };
 		03CB44F51BC8118E003C4879 /* pngout in Resources */ = {isa = PBXBuildFile; fileRef = 03CB44F41BC8118E003C4879 /* pngout */; };
 		03D63F7C1BB9804200CC8485 /* NSImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D63F7B1BB9804200CC8485 /* NSImage+Resize.m */; };
@@ -43,6 +44,8 @@
 		038880C71B305F6300F8807F /* RetiniTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RetiniTests.m; sourceTree = "<group>"; };
 		038880D11B305FDB00F8807F /* DragDropView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragDropView.h; sourceTree = "<group>"; };
 		038880D21B305FDB00F8807F /* DragDropView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DragDropView.m; sourceTree = "<group>"; };
+		03C461961C2760CD00F1572A /* ResizeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResizeModel.h; sourceTree = "<group>"; };
+		03C461971C2760CD00F1572A /* ResizeModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResizeModel.m; sourceTree = "<group>"; };
 		03CB44F11BC80603003C4879 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		03CB44F41BC8118E003C4879 /* pngout */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = pngout; sourceTree = "<group>"; };
 		03D63F7A1BB9804200CC8485 /* NSImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage+Resize.h"; sourceTree = "<group>"; };
@@ -94,13 +97,12 @@
 		038880B01B305F6300F8807F /* Retini */ = {
 			isa = PBXGroup;
 			children = (
-				03CB44F31BC8117F003C4879 /* 3rd party */,
-				03D63F7A1BB9804200CC8485 /* NSImage+Resize.h */,
-				03D63F7B1BB9804200CC8485 /* NSImage+Resize.m */,
 				038880B31B305F6300F8807F /* AppDelegate.h */,
 				038880B41B305F6300F8807F /* AppDelegate.m */,
-				038880D11B305FDB00F8807F /* DragDropView.h */,
-				038880D21B305FDB00F8807F /* DragDropView.m */,
+				03C461951C27608F00F1572A /* Frameworks */,
+				03C461941C27608500F1572A /* Views */,
+				03C461931C27607D00F1572A /* Models */,
+				03CB44F31BC8117F003C4879 /* 3rd party */,
 				038880B81B305F6300F8807F /* Images.xcassets */,
 				038880BA1B305F6300F8807F /* MainMenu.xib */,
 				038880B11B305F6300F8807F /* Supporting Files */,
@@ -134,6 +136,33 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		03C461931C27607D00F1572A /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				03C461961C2760CD00F1572A /* ResizeModel.h */,
+				03C461971C2760CD00F1572A /* ResizeModel.m */,
+			);
+			name = Models;
+			sourceTree = "<group>";
+		};
+		03C461941C27608500F1572A /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				038880D11B305FDB00F8807F /* DragDropView.h */,
+				038880D21B305FDB00F8807F /* DragDropView.m */,
+			);
+			name = Views;
+			sourceTree = "<group>";
+		};
+		03C461951C27608F00F1572A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				03D63F7A1BB9804200CC8485 /* NSImage+Resize.h */,
+				03D63F7B1BB9804200CC8485 /* NSImage+Resize.m */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		03CB44F31BC8117F003C4879 /* 3rd party */ = {
 			isa = PBXGroup;
 			children = (
@@ -299,6 +328,7 @@
 				038880B51B305F6300F8807F /* AppDelegate.m in Sources */,
 				038880D31B305FDB00F8807F /* DragDropView.m in Sources */,
 				03D63F7C1BB9804200CC8485 /* NSImage+Resize.m in Sources */,
+				03C461981C2760CD00F1572A /* ResizeModel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Build/Intermediates/Pods.build/Debug/Pods-RetiniTests.build/dgph

@@ -7,15 +7,20 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "ResizeModel.h"
 
 @interface DragDropView : NSView
 
+// Models
+@property (nonatomic, retain) ResizeModel *resizeModel;
+
+// UI
 @property (nonatomic, retain) IBOutlet NSProgressIndicator *pngCrushLoader;
 
 @property BOOL highlight; // If should show the highlighted image
 @property BOOL notFound; // If no retina (@2x, @3x) files where found
 
-// Method to check if dragged item is directory or single file
+// Methods
 - (void)checkFiles:(NSArray *)fileNames;
 
 @end

Build/Intermediates/Pods.build/Debug/Pods.build/dgph

@@ -9,8 +9,6 @@
 #import "DragDropView.h"
 #import "NSImage+Resize.h" // File from https://github.com/nate-parrott/Flashlight
 
-// I'm going to refractor this aswell, put everything that should be in a model, in a model.
-
 @implementation DragDropView
 
 @synthesize pngCrushLoader;
@@ -24,6 +22,8 @@ - (id)initWithFrame:(NSRect)frame
 		[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
 
 		[pngCrushLoader setAlphaValue:0.0];
+		
+		_resizeModel = [[ResizeModel alloc] initWithLoader:pngCrushLoader];
 	}
 
 	return self;
@@ -37,6 +37,8 @@ - (id)initWithCoder:(NSCoder *)coder
 		[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
 
 		[pngCrushLoader setAlphaValue:0.0];
+		
+		_resizeModel = [[ResizeModel alloc] initWithLoader:pngCrushLoader];
 	}
 
 	return self;
@@ -54,7 +56,7 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 
 	NSArray *draggedFilenames = [[sender draggingPasteboard] propertyListForType:NSFilenamesPboardType];
 
-	if(![self hasRetinaFiles:draggedFilenames]){
+	if(![_resizeModel hasRetinaFiles:draggedFilenames]){
 		notFound = YES;
 	}
 
@@ -85,7 +87,7 @@ - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
 	NSArray *draggedFilenames = [[sender draggingPasteboard] propertyListForType:NSFilenamesPboardType];
 
-	if(![self hasRetinaFiles:draggedFilenames]){
+	if(![_resizeModel hasRetinaFiles:draggedFilenames]){
 		notFound = YES;
 
 		[self setNeedsDisplay:YES];
@@ -94,176 +96,26 @@ - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 	return YES;
 }
 
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
+- (void)checkFiles:(NSArray *)fileNames
 {
-	NSArray *draggedFilenames = [[sender draggingPasteboard] propertyListForType:NSFilenamesPboardType];
-	
-	[self checkFiles:draggedFilenames];
+	[_resizeModel checkFiles:fileNames];
 
 	highlight = NO;
 	notFound = NO;
 
 	[self setNeedsDisplay:YES];
 }
 
-- (BOOL)hasRetinaFiles:(NSArray *)fileNames
-{
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	
-	for(NSString *filename in fileNames){
-		BOOL isDir;
-		
-		if([fileManager fileExistsAtPath:filename isDirectory:&isDir]){
-			if(!isDir){
-				if([filename containsString:@"@2x"] || [filename containsString:@"@3x"]){
-					return YES;
-				}
-			} else{
-				NSMutableArray *dirContents = [NSMutableArray array];
-				
-				for(NSString *file in [fileManager contentsOfDirectoryAtPath:filename error:nil]){
-					[dirContents addObject:[[filename stringByAppendingString:@"/"] stringByAppendingString:file]];
-				}
-				
-				return [self hasRetinaFiles:dirContents];
-			}
-		}
-	}
-	
-	return NO;
-}
-
-- (void)checkFiles:(NSArray *)fileNames
-{
-	NSFileManager *fileManager = [NSFileManager defaultManager];
-	
-	for(NSString *filename in fileNames){
-		BOOL isDir;
-		
-		if([fileManager fileExistsAtPath:filename isDirectory:&isDir]){
-			if(!isDir){
-				[self workFile:filename];
-			} else{
-				NSMutableArray *dirContents = [NSMutableArray array];
-				
-				for(NSString *file in [fileManager contentsOfDirectoryAtPath:filename error:nil]){
-					[dirContents addObject:[[filename stringByAppendingString:@"/"] stringByAppendingString:file]];
-				}
-				
-				[self checkFiles:dirContents];
-			}
-		}
-	}
-}
-
-- (void)workFile:(NSString *)file
-{
-	if([[file lowercaseString] containsString:@"png"] || [[file lowercaseString] containsString:@"jpeg"] || [[file lowercaseString] containsString:@"jpg"]){
-		if([[file lowercaseString] containsString:@"@3x"]){
-			[self resize3x:file];
-		} else if([[file lowercaseString] containsString:@"@2x"]){
-			[self resize2x:file];
-		}
-	}
-}
-
-
-- (void)resize3x:(NSString *)fileName
-{
-	NSImage *original = [[NSImage alloc] initWithContentsOfFile:fileName];
-	NSImage *newImg2x = [self imageResize:[original copy] newSize:NSMakeSize(original.size.width * 2, original.size.height * 2)];
-	
-	if([self saveImage:newImg2x toPath:[fileName stringByReplacingOccurrencesOfString:@"@3x" withString:@"@2x"]]){
-		NSImage *newImg = [self imageResize:[original copy] newSize:NSMakeSize(original.size.width, original.size.height)];
-		[self saveImage:newImg toPath:[fileName stringByReplacingOccurrencesOfString:@"@3x" withString:@""]];
-	}
-	
-	if([[NSUserDefaults standardUserDefaults] integerForKey:@"pngOut"] == 1){
-		[self crushPng:fileName];
-	}
-}
-
-- (void)resize2x:(NSString *)fileName
-{
-	NSImage *original = [[NSImage alloc] initWithContentsOfFile:fileName];
-	NSImage *newImg = [self imageResize:original newSize:NSMakeSize(original.size.width, original.size.height)];
-	
-	[self saveImage:newImg toPath:[fileName stringByReplacingOccurrencesOfString:@"@2x" withString:@""]];
-	
-	if([[NSUserDefaults standardUserDefaults] integerForKey:@"pngOut"] == 1){
-		[self crushPng:fileName];
-	}
-}
-
-- (NSImage *)imageResize:(NSImage *)anImage newSize:(NSSize)newSize
-{
-	return [anImage resizeImageToSize:newSize];
-}
-
-- (BOOL)saveImage:(NSImage *)image toPath:(NSString *)path
-{
-	if(image != nil){
-		[image lockFocus];
-		
-		NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0.0, 0.0, [image size].width, [image size].height)];
-		
-		[image unlockFocus] ;
-		
-		NSUInteger fileType = NSJPEGFileType;
-		
-		if([path containsString:@"png"]){
-			fileType = NSPNGFileType;
-		}
-		
-		float quality = 1.0;
-		
-		if([[NSUserDefaults standardUserDefaults] integerForKey:@"jpegQuality"]){
-			quality = [[NSUserDefaults standardUserDefaults] integerForKey:@"jpegQuality"] / 10;
-		}
-		
-		NSData *data = [bitmapRep representationUsingType:fileType properties:[NSDictionary dictionaryWithObject:[NSNumber numberWithFloat:quality] forKey:NSImageCompressionFactor]];
-		
-		if([[NSUserDefaults standardUserDefaults] integerForKey:@"pngOut"] == 1){
-			if([data writeToFile:path atomically:YES]){
-				return [self crushPng:path];
-			}
-		}
-		
-		return [data writeToFile:path atomically:YES];
-	}
-	
-	return NO;
-}
-
-- (BOOL)crushPng:(NSString *)fileName
+- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
 {
-	if(![[fileName lowercaseString] containsString:@"png"]){
-		return NO;
-	}
+	NSArray *draggedFilenames = [[sender draggingPasteboard] propertyListForType:NSFilenamesPboardType];
 
-	[pngCrushLoader setMaxValue:pngCrushLoader.maxValue + 1];
-	[pngCrushLoader setAlphaValue:1.0];
+	[_resizeModel checkFiles:draggedFilenames];
 
-	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
-		NSTask *task = [[NSTask alloc] init];
-		task.launchPath = [[NSBundle mainBundle] pathForResource:@"pngout" ofType:@""];
-		task.arguments = @[@"-y", fileName, fileName];
-		
-		[task launch];
-		[task waitUntilExit];
-		
-		dispatch_async(dispatch_get_main_queue(), ^{
-			[pngCrushLoader setDoubleValue:pngCrushLoader.doubleValue + 1];
-			
-			if(pngCrushLoader.doubleValue == pngCrushLoader.maxValue){
-				[pngCrushLoader setAlphaValue:0.0];
-				[pngCrushLoader setDoubleValue:0];
-				[pngCrushLoader setMaxValue:0];
-			}
-		});
-	});
+	highlight = NO;
+	notFound = NO;
 
-	return YES;
+	[self setNeedsDisplay:YES];
 }
 
 - (void)drawRect:(NSRect)rect

Build/Intermediates/Retini.build/Debug/Retini.build/Objects-normal/x86_64/Retini.LinkFileList

@@ -38,7 +38,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Build/Intermediates/Retini.build/Debug/Retini.build/Retini-project-headers.hmap

@@ -0,0 +1,25 @@
+//
+//  ResizeModel.h
+//  Retini
+//
+//  Created by Erik Terwan on 20/12/15.
+//  Copyright © 2015 ET-ID. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
+
+@interface ResizeModel : NSObject
+
+// UI
+@property (nonatomic, retain) NSProgressIndicator *pngCrushLoader;
+
+
+// METHODS
+- (id)initWithLoader:(NSProgressIndicator *)indicator;
+- (BOOL)hasRetinaFiles:(NSArray *)fileNames;
+
+// Check if dragged item is directory or single file
+- (void)checkFiles:(NSArray *)fileNames;
+
+@end