Changeset 2771 in MondoRescue

Timestamp:

Apr 22, 2011, 1:49:03 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds GUI support for compresion type. Fix half of #468.

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-devices.c (modified) (7 diffs)
• newt-specific.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -35 +35 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+//
+
+extern char *which_compression_type();
 
 extern int g_current_media_number;
@@ -2166 +2169 @@
     char *sz_size;
     char *command;
+    char *compression_type = NULL;
     char *comment;
     char *prompt;
@@ -2223 +2227 @@
                     bkpinfo->manual_cd_tray = TRUE;
                 }
+            }
+            if ((compression_type = which_compression_type()) == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
             }
             if ((bkpinfo->compression_level =
@@ -2410 +2418 @@
         }
         if (archiving_to_media) {
+            if ((compression_type = which_compression_type()) == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
@@ -2444 +2456 @@
             }
             if (!bkpinfo->restore_data) {
+                if ((compression_type = which_compression_type()) == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
@@ -2575 +2591 @@
             }
             if (archiving_to_media) {
+                if ((compression_type = which_compression_type()) == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
@@ -2732 +2752 @@
 #endif
         bkpinfo->backup_data = TRUE;
+        if (strcmp(compression_type,"lzo") == 0) {
+            strcpy(bkpinfo->zip_exe, "lzop");
+            strcpy(bkpinfo->zip_suffix, "lzo");
+        } else if (strcmp(compression_type,"gzip") == 0) {
+            strcpy(bkpinfo->zip_exe, "gzip");
+            strcpy(bkpinfo->zip_suffix, "gz");
+        //} else if (strcmp(compression_type,"lzma") == 0) {
+            //strcpy(bkpinfo->zip_exe, "xy");
+            //strcpy(bkpinfo->zip_suffix, "xy");
+        } else if (strcmp(compression_type,"bzip2") == 0) {
+            strcpy(bkpinfo->zip_exe, "bzip2");
+            strcpy(bkpinfo->zip_suffix, "bz2");
+        } else {
+            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+        }
         bkpinfo->verify_data =
             ask_me_yes_or_no

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -1361 +1361 @@
 
 
+
+
+/**
+ * Ask the user which compression type they would like to use.
+ * The choices are "bzip2", "gzip", "lzo". NULL for exit
+ */
+    char *which_compression_type() {
+
+        /*@ char ************************************************************ */
+        char *output = NULL;
+
+
+        /*@ newt ************************************************************ */
+
+        newtComponent b1;
+        newtComponent b2;
+        newtComponent b3;
+        //newtComponent b4;
+        newtComponent b5;
+        newtComponent b_res;
+        newtComponent myForm;
+
+        newtDrawRootText(18, 0, WELCOME_STRING);
+        newtPushHelpLine
+            ("   Please specify the type of compression that you want.");
+        newtCenteredWindow(34, 13, "Type of compression?");
+        b1 = newtButton(4, 1, "bzip2");
+        b2 = newtButton(18, 1, "gzip");
+        b3 = newtButton(4, 5, "lzo");
+        //b4 = newtButton(18, 5, "lzma");
+        b5 = newtButton(4, 9, "         Exit        ");
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, b1, b3, b2, b5, NULL);
+        b_res = newtRunForm(myForm);
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        if (b_res == b1) {
+            mr_asprintf(&output, "%s", "bzip2");
+        } else if (b_res == b2) {
+            mr_asprintf(&output, "%s", "gzip");
+        } else if (b_res == b3) {
+            mr_asprintf(&output, "%s", "lzo");
+        //} else if (b_res == b4) {
+            //mr_asprintf(&output, "%s", "lzma");
+        }
+        newtPopHelpLine();
+        return(output);
+    }