@@ -402,9 +402,9 @@ </array> <key>TableOfContents</key> <array> - <string>1D70EB890ECA0C0C00598C54</string> + <string>1D82853E0EF4516E003B714A</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>1D70EB8A0ECA0C0C00598C54</string> + <string>1D82853F0EF4516E003B714A</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -523,7 +523,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>248122368.63772801</real> + <real>250892646.69362801</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -538,7 +538,6 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>1CD10A99069EF8BA00B06720</string> <string>/Users/ghansard/Projects/DownloadGoogleBooks/DownloadGoogleBooks.xcodeproj</string> </array> <key>WindowString</key> @@ -621,7 +620,7 @@ <key>TableOfContents</key> <array> <string>1D0C3EFE0DE7A89F0080226A</string> - <string>1D51786A0EC8DEEB0006AA43</string> + <string>1D70EB940ECA0D1B00598C54</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -888,7 +887,7 @@ <key>Frame</key> <string>{{0, 0}, {650, 209}}</string> <key>RubberWindowFrame</key> - <string>401 605 650 250 0 0 1440 878 </string> + <string>286 590 650 250 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> @@ -911,17 +910,17 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>1D5178710EC8DEF80006AA43</string> + <string>1D70EB970ECA0D7E00598C54</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.consoleV3</string> <key>WindowString</key> - <string>401 605 650 250 0 0 1440 878 </string> + <string>286 590 650 250 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <true/> + <false/> </dict> <dict> <key>Identifier</key> DownloadGoogleBooks.xcodeproj/ghansard.mode1v3 @@ -45,7 +45,7 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeArchitecture = i386; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 1D0C3E7F0DE7A5F30080226A /* «PROJECTNAMEASIDENTIFIER» */; activeTarget = 8D1107260486CEB800E47090 /* DownloadGoogleBooks */; addToTargets = ( @@ -128,8 +128,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 248122368; - PBXWorkspaceStateSaveDate = 248122368; + PBXPerProjectTemplateStateSaveDate = 250892646; + PBXWorkspaceStateSaveDate = 250892646; }; sourceControlManager = 1D0C3E8D0DE7A5FD0080226A /* Source Control */; userBuildSettings = { DownloadGoogleBooks.xcodeproj/ghansard.pbxuser @@ -9,7 +9,7 @@ (- (id) fetch:(id)sender is ((self printButton) setEnabled:NO) - (set url (NSURL URLWithString:((self urlField) stringValue))) + (set url (NSURL URLWithString:(NSString stringWithString:((self urlField) stringValue)))) (set count ((self numberField) intValue)) (self setPageCount:count) (NSThread detachNewThreadSelector:"beginThreadedFetch:" toTarget:self withObject:url) ) nu/controller.nu @@ -1,49 +1,58 @@ (class GoogleBooksDownloader is NSObject - (ivar (id) pageHTML - (id) delegate) - - (ivar-accessors) - - (+ (id) downloader is - (((self class) new) autorelease)) - - (- (id) downloadBookAtURL:(id) url pages:(int) numberOfPages is + (ivar (id) pageHTML + (id) delegate) + + (ivar-accessors) + + (+ (id) downloader is + (((self class) new) autorelease)) + + (- (id) downloadBookAtURL:(id) url pages:(int) numberOfPages is (unless (/&output=html/ findInString:(url description)) (set url (+ (url description) "&output=html"))) - (set pages (NSMutableArray array)) - (if (!= (NSURL class) (url class)) - (set url (NSURL URLWithString:url))) - (self setPageHTML:(NSString stringWithContentsOfURL:url)) - (numberOfPages times:(do (pageNumber) - (pages addObject:(self _downloadCurrentPage)) - (if ((self delegate) respondsToSelector:"downloadedPage:of:") - ((self delegate) downloadedPage:(+ 1 pageNumber) of:numberOfPages)) - (set m (/.*<a href="(.*?)" accesskey="n"/ findInString:(self pageHTML))) - (set x (NSURL URLWithString:(m groupAtIndex:1))) - (self setPageHTML:(NSString stringWithContentsOfURL:x)) )) - (pages) ) - - (- (id) _downloadCurrentPage is - (set m (/\.html_page_image { background-image: url\("(.*?)\"\)/ findInString:(self pageHTML))) - (set pageURL (NSURL URLWithString:(m groupAtIndex:1))) - (set page ((NSImage alloc) initWithContentsOfURL:pageURL)) - (page)) - - (- (id) joinedImageFromPageArray:(id) pageArray is - (set maxWidth 0) - (set maxHeight 0) - (pageArray each:(do (page) - (set size (page size)) - (set w (head size)) - (set h (head (tail size))) - (if (> w maxWidth) (set maxWidth w)) - (if (> h maxHeight) (set maxHeight h)) )) - (set img ((NSImage alloc) initWithSize:(list maxWidth (* maxHeight (pageArray count)) )) ) - (img lockFocus) - (set yPos (* maxHeight (pageArray count))) - (pageArray each:(do (page) - (page dissolveToPoint:(list 0 (- yPos maxHeight)) fraction:1.0) - (set yPos (- yPos maxHeight)) )) - (img unlockFocus) - (img) ) - ) \ No newline at end of file + (set pages (NSMutableArray array)) + (if (!= (NSURL class) (url class)) + (set url (NSURL URLWithString:url))) + (self setPageHTML:(NSString stringWithContentsOfURL:url)) + (numberOfPages times:(do (pageNumber) + (pages addObject:(self _downloadCurrentPage)) + (if ((self delegate) respondsToSelector:"downloadedPage:of:") + ((self delegate) downloadedPage:(+ 1 pageNumber) of:numberOfPages)) + (set m (/<a href="([\w\d\+:\/.=\-?&]+)"[ \t]+accesskey="n"/ findInString:(self pageHTML))) + (if (!= nil (m groupAtIndex:1)) + (set x (NSURL URLWithString:(m groupAtIndex:1))) + (puts (x description)) + (self setPageHTML:(NSString stringWithContentsOfURL:x)) + (else + (puts "Error on page #{(+ 1 pageNumber)}") + (break) )) )) + (pages) ) + + (- (id) _downloadCurrentPage is + (set m (/\.html_page_image[ ]*{[ ]*background-image:[ ]*url\("(.*?)\"\)/ findInString:(self pageHTML))) + (if (== '() (m groupAtIndex:1)) + ; Restricted page + ((NSImage alloc) initWithSize:'(200 200)) + (else + (set pageURL (NSURL URLWithString:(m groupAtIndex:1))) + (set page ((NSImage alloc) initWithContentsOfURL:pageURL)) + (page) )) ) + + (- (id) joinedImageFromPageArray:(id) pageArray is + (set maxWidth 0) + (set maxHeight 0) + (pageArray each:(do (page) + (set size (page size)) + (set w (head size)) + (set h (head (tail size))) + (if (> w maxWidth) (set maxWidth w)) + (if (> h maxHeight) (set maxHeight h)) )) + (set img ((NSImage alloc) initWithSize:(list maxWidth (* maxHeight (pageArray count)) )) ) + (img lockFocus) + (set yPos (* maxHeight (pageArray count))) + (pageArray each:(do (page) + (page dissolveToPoint:(list 0 (- yPos maxHeight)) fraction:1.0) + (set yPos (- yPos maxHeight)) )) + (img unlockFocus) + (img) ) + ) \ No newline at end of file nu/downloadGoogleBook.nu fad72d5d0117e41d7c01b4984580c1da3eab852e Grayson Hansard info@fromconcentratesoftware.com http://github.com/Grayson/downloadgooglebooks/commit/e3e3e55dd7b5e7975d666ed4e4f63e5263607b45 e3e3e55dd7b5e7975d666ed4e4f63e5263607b45 2008-12-13T13:15:27-08:00 2008-12-13T13:15:27-08:00 Improved download reliability. 9f4298a91c83fabe3bc2a74aed78cc1eea00fcbd Grayson Hansard info@fromconcentratesoftware.com