Changeset 25772

Timestamp:

06/02/08 18:34:48 (6 months ago)

Author:

korli

Message:

better handles error and cancellation when copying

Location:

haiku/trunk/src/apps/installer

Files:

• CopyEngine.cpp (modified) (6 diffs)
• CopyEngine.h (modified) (1 diff)
• InstallerWindow.cpp (modified) (3 diffs)

haiku/trunk/src/apps/installer/CopyEngine.cpp

@@ -1 +1 @@
 /*
- * Copyright 2005-2006, Jérôme DUVAL. All rights reserved.
+ * Copyright 2005-2008, Jérôme DUVAL. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
@@ -77 +77 @@
                         if (err != B_OK) {
                                 ERR("Start failed");
+                                SetStatusMessage("Installation aborted.");
                                 BMessenger(fWindow).SendMessage(RESET_INSTALL);
+                        } else {
+                                BMessenger(fWindow).SendMessage(INSTALL_FINISHED);
                         }
                         break;
@@ -230 +233 @@
         BDirectory targetDir(targetDirectory.Path());
         BDirectory srcDir(srcDirectory.Path());
-        CopyFolder(srcDir, targetDir);
+        err = CopyFolder(srcDir, targetDir);
+
+        if (err != B_OK)
+                return err;
 
         // copy selected packages
@@ -240 +246 @@
                 for (int32 i = 0; i < count; i++) {
                         if (fControl->CheckUserCanceled())
-                                return B_OK;
+                                return B_CANCELED;
                         Package *p = static_cast<Package*>(fPackages->ItemAt(i));
                         packageDir.SetTo(&srcDir, p->Folder());
-                        CopyFolder(packageDir, targetDir);
-                }
-        }
-
-        if (!fControl->CheckUserCanceled()) {
-                LaunchFinishScript(targetDirectory);
-
-                BMessage msg(INSTALL_FINISHED);
-                BMessenger(fWindow).SendMessage(&msg);
-        }
+                        err = CopyFolder(packageDir, targetDir);
+                        if (err != B_OK)
+                                break;
+                }
+        }
+
+        if (err != B_OK)
+                return err;
+
+        if (fControl->CheckUserCanceled())
+                return B_CANCELED;
+        
+        LaunchFinishScript(targetDirectory);
 
         return B_OK;
@@ -258 +267 @@
 
 
-void
+status_t
 CopyEngine::CopyFolder(BDirectory &srcDir, BDirectory &targetDir)
 {
@@ -284 +293 @@
                         entry.GetPath(&path);
                         ERR2("error while copying %s", path.Path());
-                }
-        }
+                        return err;
+                }
+        }
+
+        return B_OK;
 }
 

haiku/trunk/src/apps/installer/CopyEngine.h

@@ -33 +33 @@
                 void LaunchInitScript(BPath &path);
                 void LaunchFinishScript(BPath &path);
-                void CopyFolder(BDirectory &srcDir, BDirectory &targetDir);
+                status_t CopyFolder(BDirectory &srcDir, BDirectory &targetDir);
 
                 InstallerWindow *fWindow;

haiku/trunk/src/apps/installer/InstallerWindow.cpp

@@ -1 +1 @@
 /*
- * Copyright 2005, Jérôme DUVAL. All rights reserved.
+ * Copyright 2005-2008, Jérôme DUVAL. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
@@ -214 +214 @@
                                                 fInstallStatus = kCancelled;
                                                 SetStatusMessage("Installation cancelled.");
-                                                PostMessage(RESET_INSTALL);
                                         }
                                         break;
@@ -264 +263 @@
                 case INSTALL_FINISHED:
                         fBeginButton->SetLabel("Quit");
+                        SetStatusMessage("Installation completed.");
                         fInstallStatus = kFinished;
                         DisableInterface(false);