Changeset 49

Timestamp:

08/14/06 22:09:30 (2 years ago)

Author:

cordney

Message:

[new] downloader: new download list according to new oszoo pages, moved list to new server
[fix] Makefile: use -lcrypto instead of full path to libcrypto
[new] credits: licenses
[new] downloader: if there is a README file with the downloaded Guest PC, open it in TextEdit? after download is finished
[fix] downloader: leave all files from the downloaded archive in qvm package
[fix] downloader: finding a folder with .img or .qcow in it's name sets it not as harddisk anymore
[fix] downloader: add support for gzip files, throw warning when archive is corrupt
[fix] downloader: downloaded progress not reset when download cancelled or started again
[fix] downloader: set Transmission revision back to 480 (official version 0.6.1), now using only stable Transmission releases
[fix] downloader: cancel download when .torrent file could not be downloaded and show error message

Files:

• trunk/prepare.sh (modified) (1 diff)
• trunk/qcontrol/Makefile (modified) (1 diff)
• trunk/qcontrol/Resources/Credits.html (modified) (1 diff)
• trunk/qcontrol/Resources/English.lproj/cocoaDownload.nib/classes.nib (modified) (1 diff)
• trunk/qcontrol/Resources/English.lproj/cocoaDownload.nib/info.nib (modified) (1 diff)
• trunk/qcontrol/Resources/English.lproj/cocoaDownload.nib/keyedobjects.nib (modified) (previous)
• trunk/qcontrol/cocoaControlController.m (modified) (7 diffs)
• trunk/qcontrol/cocoaDownload.m (modified) (4 diffs)
• trunk/qcontrol/cocoaDownloadController.h (modified) (3 diffs)
• trunk/qcontrol/cocoaDownloadController.m (modified) (15 diffs)
• trunk/qcontrol/freeoszoo.plist (modified) (1 diff)

trunk/prepare.sh

@@ -3 +3 @@
-
-#get/update libtransmission
-638
+480
-cp Transmission/mk/lib.mk Transmission/libtransmission/Makefile
-

trunk/qcontrol/Makefile

@@ -5 +5 @@
-
-qemu-control$(EXESUF): cocoaControlMain.m cocoaControlController.m cocoaControlDiskImage.m cocoaControlNewPCAssistant.m cocoaControlEditPC.m cocoaControlPreferences.m cocoaControlDOServer.m cocoaDownload.m cocoaDownloadController.m QControlTableView.m
-/usr/lib/libcrypto.dylib
+-lcrypto
-
-clean:

trunk/qcontrol/Resources/Credits.html

@@ -36 +36 @@
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Heikki L (gcc3.4.5)<BR>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Katios (VNC)<BR>
-
-
+
+
+
+
+
-        </BODY>
-</HTML>

trunk/qcontrol/Resources/English.lproj/cocoaDownload.nib/classes.nib

@@ -12 +12 @@
-                mainDlWindow = id; 
-                osTypeSelect = id; 
+                precheckPanel = id; 
+                precheckStatusProgressView = id; 
+                precheckStatusTextView = id; 
-                statusBar = id; 
-                statusText = id; 

trunk/qcontrol/Resources/English.lproj/cocoaDownload.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-69 54 356 240 0 0 1024 746
+95 57 356 240 0 0 1280 778
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>57</key>
-262 388 500 247 0 0 1024 746
+390 414 500 247 0 0 1280 778
-        </dict>
-        <key>IBFramework Version</key>
-3.0
+6.1
-        <key>IBOpenObjects</key>
-        <array>
-                <integer>57</integer>
+                <integer>105</integer>
+                <integer>33</integer>
-                <integer>5</integer>
-                <integer>33</integer>
-        </array>
-        <key>IBSystem Version</key>
-H14
+J2135a
-</dict>
-</plist>

trunk/qcontrol/cocoaControlController.m

@@ -319 +319 @@
-{
-//    NSLog(@"cocoaControlController: cycleWindows");
-    
-    [qdoserver guestSwitch: @"Q Control" fullscreen:NO nextGuestName:nil];
-}
@@ -751 +750 @@
-- (BOOL) importFreeOSZooPC:(NSString *)name withPath:(NSString *)path
-{
-       
+    
-                [[NSMutableDictionary alloc] initWithObjects:[NSArray arrayWithObjects:@"Q", @"none", [NSDate date], @"Q guest PC from FreeOSZoo", nil] forKeys:[NSArray arrayWithObjects: @"Author", @"Copyright", @"Date", @"Description", nil]],
-                [[NSMutableString alloc] initWithString:@" -m 128 -net user -boot c -localtime -smb ~/Desktop/Q Shared Files/"],
@@ -768 +767 @@
-        BOOL foundHD = NO;
-        BOOL foundDir = NO;
+        BOOL foundReadme = NO;
-        NSFileManager * manager = [NSFileManager defaultManager];
-        NSArray * dirContents = [manager directoryContentsAtPath:path];
-        NSArray * subDir;
-
+,j,k
-        for (i=0; i<=[dirContents count]-1; i++) {
-[[[dirContents objectAtIndex:i] pathExtension] isEqualToString:@"img"] || [[[dirContents objectAtIndex:i] pathExtension] isEqualToString:@"qcow"]
+([[[dirContents objectAtIndex:i] pathExtension] isEqualToString:@"img"] || [[[dirContents objectAtIndex:i] pathExtension] isEqualToString:@"qcow"] || [[[dirContents objectAtIndex:i] pathExtension] isEqualToString:@"dsk"]) && (![[[manager fileAttributesAtPath:[path stringByAppendingPathComponent:[dirContents objectAtIndex:i]] traverseLink:NO] objectForKey:NSFileType] isEqualTo:NSFileTypeDirectory])
-                        foundHD = YES;
-                        break;
@@ -781 +781 @@
-                        break;
-                } else {
-
+//
-                }
-        }
-
-        if(foundHD) {
-
+
+
-        } else if(foundDir) {
-
-
+
+
+
+
-                        // search for .img or .qcow
-                        if([[[subDir objectAtIndex:ii] pathExtension] isEqualToString:@"img"] || [[[subDir objectAtIndex:i] pathExtension] isEqualToString:@"qcow"]) {
-                                //NSLog(@"found HD in subdir!");
-
-
+
+
+
+
-                                [manager removeFileAtPath:[path stringByAppendingPathComponent:[dirContents objectAtIndex:i]] handler:nil];
+                                // append hd name to arguments
-                                [[thisPC objectForKey:@"Arguments"] appendFormat:[NSString stringWithFormat:@" -hda %@", [subDir objectAtIndex:ii]]];
-                                foundHD = YES;
@@ -802 +808 @@
-                }
-        }
+        
+        // search for a readme file, if found, open it with TextEdit
+        dirContents = [manager directoryContentsAtPath:path];
+        for(k=0; k<[dirContents count]; k++) {
+           if([[dirContents objectAtIndex:k] isEqualToString:@"README"]) {
+               foundReadme = YES;
+               break;
+           }
+    }
+        
-        /* save Configuration */
-        [self savePCConfiguration:thisPC];
@@ -807 +823 @@
-        /* update Table */
-        [self loadConfigurations];
+        
+        /* open Readme */
+        if(foundReadme) [[NSWorkspace sharedWorkspace] openFile:[path stringByAppendingPathComponent:@"README"] withApplication:@"TextEdit.app"];
+        
-        return foundHD;
-}
@@ -1494 +1514 @@
-        }
-    } else {
-showWindow
+initDownloadInterface
-    }
-    

trunk/qcontrol/cocoaDownload.m

@@ -132 +132 @@
-    NSString * torrentPath = [[self createQVM] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.torrent", name]];
-    // we need to temporarily save the qvm path here, cause we need it later
-
+
+
+
-    NSData * torrentFile = [NSData dataWithContentsOfURL:[NSURL URLWithString:url]];
+    if([torrentFile length] == 0) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"DownloadDidFail" object:self userInfo:[NSDictionary dictionaryWithObject:@"Could not download bittorrent meta file. Maybe the file doesn't exist anymore or the server is down." forKey:@"ERROR_DESCRIPTION"]];
+        return;
+    }
-    [torrentFile writeToFile:torrentPath atomically:YES];
-    tStat = nil;
@@ -147 +153 @@
-        tStat = tr_torrentStat( tHandle );
-        tInfo = tr_torrentInfo ( tHandle );
+        tr_torrentRemoveSaved( tHandle );
-        // set the save path
+        [savePath release];
-        savePath = [[torrentPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithUTF8String:tInfo[0].name]];
-        [savePath retain];
@@ -185 +193 @@
-        tr_torrentClose( fHandle, tHandle );
-        tr_close( fHandle );
+        fHandle = nil;
+        tHandle = nil;
-        [fTimer invalidate];
-    }
@@ -256 +266 @@
-    tInfo = tr_torrentInfo( tHandle );
-    
-
+
+
-    expectedContentLength = tInfo[0].totalSize;
-    downloadRate = tStat[0].rateDownload;

trunk/qcontrol/cocoaDownloadController.h

@@ -36 +36 @@
-    IBOutlet id statusBar;
-    IBOutlet id osTypeSelect;
+    IBOutlet id precheckPanel;
+    IBOutlet id precheckStatusTextView;
+    IBOutlet id precheckStatusProgressView;
-    
-    IBOutlet id detailsNSView;   
@@ -54 +57 @@
-
-// interface functions
+- (void) initDownloadInterface;
-- (void) showWindow;
-- (BOOL) returnShowsDetails; // returns whether the window shows details
@@ -59 +63 @@
-- (void) resizeBig; // show detailsTextView
-- (void) showAllDownloads;
+- (void) prepareOSTypeSelector;
-- (IBAction) showDownloadsByType:(id)sender;
-- (void) showDetails:(int)row; // show details of selected free os

trunk/qcontrol/cocoaDownloadController.m

@@ -48 +48 @@
-- (void)awakeFromNib
-{
-
-
-
-
+
-}
-
-#pragma mark -
-#pragma mark Interface Functions
+
+- (void) initDownloadInterface
+{
+    [table setDoubleAction:@selector(startDownload:)];
+    //[self showWindow];
+    [self showAllDownloads];
+}
-
-- (void) showWindow
@@ -109 +113 @@
-    // load downloadLists
-    // save an original of the list so we dont have to load it again
-
-
-
-
+
+
+
+
+
+
-        
-        NSArray * dlList = [self getDownloadListFromServer];
-        int i;
-    
-        // copy downloadList
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        [downloadOriginalList addObjectsFromArray:downloadList];
-    } else {
+        // list is still there, we dont have to download it again
-        // when we call it later we only need the original list
-        [downloadList removeAllObjects];
-        [downloadList addObjectsFromArray:downloadOriginalList];
+        [self showWindow];
-    }
-    // force table reload
@@ -137 +146 @@
-}
-
+- (void) prepareOSTypeSelector
+{
+    // fill 'all' and space
+    [osTypeSelect removeAllItems];
+    [osTypeSelect addItemWithTitle:@"All"];
+    [[osTypeSelect menu] addItem:[NSMenuItem separatorItem]];
+    int i,j;
+    BOOL found = NO;
+    NSMutableArray * array = [NSMutableArray arrayWithCapacity:1];
+    for(i=0; i<[downloadList count]; i++) {
+        // if the Category is not listed yet in array add it
+        for(j=0; j<[array count]; j++) {
+            // search array
+            if([[array objectAtIndex:j] isEqualTo:[[downloadList objectAtIndex:i] objectForKey:@"Category"]]) {
+                found = YES;
+            }
+        }
+        if(!found) [array addObject:[[downloadList objectAtIndex:i] objectForKey:@"Category"]];
+        found = NO;
+    }
+    
+    // add to selector
+    for(i=0; i<[array count]; i++) {
+        [osTypeSelect addItemWithTitle:[array objectAtIndex:i]];
+    }
+}
+
-- (IBAction) showDownloadsByType:(id)sender
-{
+    NSLog(@"showDownloadsByType:");
-    // method for the popupbutton to select os type
+    NSMutableArray * array = [NSMutableArray arrayWithCapacity:1];
-    if([[osTypeSelect titleOfSelectedItem] isEqualToString:@"All"]) {
-
+
+
-    } else {
-        // be sure that we have the original downloadList here
@@ -147 +186 @@
-        [downloadList addObjectsFromArray:downloadOriginalList];
-        int i;
-        NSMutableArray * array = [NSMutableArray arrayWithCapacity:1];
-        for (i=0; i<=[downloadList count]-1; i++) {
-            // search for ostype and add equalling entries
-ostype
+Category
-                [array addObject:[downloadList objectAtIndex:i]];
-            }
-        }
+    }
+    
+    // write os by found criteria/original downloads into downloadList
+    [downloadList removeAllObjects];
+    [downloadList addObjectsFromArray:array];
-        
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -233 +271 @@
-        if ([[tableColumn identifier] isEqualToString:@"name"]) {
-           // return name and version 
-name"], [thisDownload objectForKey:@"v
-ostype"], [thisDownload objectForKey:@"installtype"], [thisDownload objectForKey:@"size"], [thisDownload objectForKey:@"a
+Name"], [thisDownload objectForKey:@"V
+Category"], [thisDownload objectForKey:@"InstallType"], [thisDownload objectForKey:@"DownloadSize"], [thisDownload objectForKey:@"A
-           
-                return attrString;
@@ -263 +301 @@
-- (NSArray *)getDownloadListFromServer
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return downloadList;
-}
+
+// NSURLHandleClient This informal protocol defines the interface for clients to NSURL. A client is an object loading a URL resource in the background.
+/*
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{   
+    NSLog(@"Data available..");
+    //[[NSRunLoop currentRunLoop] runUntilDate:[NSDate distantPast]];
+}
+-(void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+    NSLog(@"Download finished");
+    [precheckStatusTextView setStringValue:@"Got list from server.."];
+    // todo: connectivity check freeoszoo.org
+    [NSApp endSheet:precheckPanel];
+    //[NSApp stopModal];
+    [precheckPanel orderOut:self];
+    [precheckStatusTextView setStringValue:@"Loading.."];
+    [precheckStatusProgressView stopAnimation:self];
+    [table reloadData];
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+    NSLog(@"Download failed: %@", error);
+}
+*/
-
-- (void) showDetails:(int)row
@@ -277 +356 @@
-    // create name and version
-    NSDictionary * nameAttr = [NSDictionary dictionaryWithObject:[NSFont boldSystemFontOfSize:12] forKey:NSFontAttributeName];
-name"], [details objectForKey:@"v
-d
-Web
-weburl"] attributes:[NSDictionary dictionaryWithObject:[details objectForKey:@"weburl
+Name"], [details objectForKey:@"V
+D
+More Info
+InfopageURL"] attributes:[NSDictionary dictionaryWithObject:[details objectForKey:@"InfopageURL
-    // create spacer
-    NSAttributedString * spacer = [[NSAttributedString alloc] initWithString:@"\n"];
@@ -319 +398 @@
-        }
-        if([[thisDownload objectForKey:@"version"] isEqualToString:@""]) {
-n
+N
-        } else {
-name"], [thisDownload objectForKey:@"v
-
-url
+Name"], [thisDownload objectForKey:@"V
+
+DownloadURL
-        // - monitor the download object with NSNotifications
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadDidReceiveResponse:) name:@"DownloadDidReceiveResponse" object:download];
@@ -329 +408 @@
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadDidFinish:) name:@"DownloadDidFinish" object:download];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadDidFail:) name:@"DownloadDidFail" object:download];
-
-
-
+
-        // 2. set to downloading mode
-        [self disableTableView:YES];
@@ -346 +423 @@
-        [statusBar setIndeterminate:YES];
-        [statusBar startAnimation:self];
+        
+        [download startDownload];
-    }
-}
@@ -469 +548 @@
-- (void) downloadDidFail:(NSNotification *)aNotification
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    
-    // reset UI
+    [self cleanupDownload:[[download getSavePath] stringByDeletingLastPathComponent]];
-    [statusText setStringValue:@"Download failed."];
-[self cleanupDownload:[[download getSavePath] stringByDeletingLastPathComponent]];
+
-    [download release];
+    
+    // alert sheet
+    NSBeginAlertSheet(@"Download failed",@"OK",nil,nil,mainDlWindow,self,nil,nil,nil,[[aNotification userInfo] objectForKey:@"ERROR_DESCRIPTION"]);
-}
-
-- (void) cleanupDownload:(NSString *)path
-
+
+
-    if(statusTimer) {
-        [statusTimer invalidate];
-
+
+
+
+
+
+
-    
-    [statusBar stopAnimation:self];
@@ -499 +583 @@
-    [statusBar setDoubleValue:0.0];
-    [statusBar setMaxValue:100.0];
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"DownloadDidReceiveResponse" object:download];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"DownloadDidReceiveData" object:download];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"DownloadDidFinish" object:download];
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"DownloadDidFail" object:download];
-    
-    [table setDoubleAction:@selector(startDownload:)];
@@ -525 +604 @@
-    if([[path pathExtension] isEqualTo:@"tar"] || [[path pathExtension] isEqualTo:@"bz"] || [[path pathExtension] isEqualTo:@"bz2"] || [[path pathExtension] isEqualTo:@"gz"]) {
-        [task setLaunchPath:@"/usr/bin/tar"];
-
+
+
+
+
+
+
+
+
+
-        isArchive = YES;
-    } else if([[path pathExtension] isEqualTo:@"zip"]) {
@@ -545 +632 @@
-- (void)uncompressPCFinished:(NSNotification *)aNotification
-{
+    int status = [[aNotification object] terminationStatus];
+    NSString * message;        
-    NSString * path = [download getSavePath];
-    NSString * name = [download getName];
-
-
-
-
-
+
-    // start import into Q
-    [statusText setStringValue:@"Importing Free OS.."];
@@ -558 +643 @@
-    } else {
-        message = @"The harddisk could not be found. Please check the settings before using your Free OS.";
+    }
+    
+    if(status == 0) {
+        //NSLog(@"Task succeeded.");
+        // delete downloaded file, leave message unchanged
+        NSFileManager * manager = [NSFileManager defaultManager];
+        [manager removeFileAtPath:path handler:nil];
+    } else {
+        //NSLog(@"Task failed.");
+        // do not delete file, set message to failed
+        message = [NSString stringWithFormat:@"The files could not be extracted. The archive seems to be corrupt. You may want to try to extract it manually or report this to free.oszoo.org.\n\nPath: %@", path];
-    }
-    

trunk/qcontrol/freeoszoo.plist

@@ -3 +3 @@
-<plist version="1.0">
-<array>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <string>ArchLinux</string>
-
+
+
+
-                <string>0.7</string>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <string>Simone Vellei for FreeOSZoo</string>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+