Author: jsuchome Date: Mon Feb 21 16:16:53 2011 New Revision: 63449 URL: http://svn.opensuse.org/viewcvs/yast?rev=63449&view=rev Log: added restore function Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp branches/tmp/jsuchome/snapper/src/snapper.ycp branches/tmp/jsuchome/snapper/src/wizards.ycp Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snapper.ycp?rev=63449&r1=63448&r2=63449&view=diff ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Mon Feb 21 16:16:53 2011 @@ -35,6 +35,7 @@ textdomain "snapper"; import "FileUtils"; +import "Label"; import "Progress"; @@ -68,8 +69,8 @@ map ret = $[]; - string file1 = sformat ("%1/%2/snapshot/%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2/snapshot/%3", snapshots_path, new, file); + string file1 = sformat ("%1/%2/snapshot%3", snapshots_path, old, file); + string file2 = sformat ("%1/%2/snapshot%3", snapshots_path, new, file); if (new == 0) file2 = file; @@ -160,36 +161,52 @@ } /** - * Write all snapper settings - * @return true on success + * Copy given files from selected snapshot to current filesystem */ -global boolean Write() { +global boolean RestoreFiles (integer snapshot_num, list<string> files) { - /* Snapper read dialog caption */ - string caption = _("Saving snapper Configuration"); + boolean ret = true; + y2milestone ("going to restore files %1", files); - integer steps = 2; + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing(1.5), `VBox ( + `HSpacing (60), + // label for log window + `LogView (`id (`log), _("Restoring Files..."), 8, 0), + `ProgressBar (`id (`progress), "", size (files), 0), + `PushButton (`id (`ok), Label::OKButton ()) + ), `HSpacing (1.5))); + + UI::ChangeWidget (`id (`ok), `Enabled, false); + integer progress = 0; + foreach (string file, files, { + + UI::ChangeWidget (`id (`progress ), `Value, progress); + + string orig = sformat ("%1/%2/snapshot%3", snapshots_path, snapshot_num, file); + + string dir = substring (file, 0, findlastof (file, "/")); + y2internal ("copying file %1 to %2 (dir: %3)", orig, file, dir); + if (FileUtils::CheckAndCreatePath (dir)) + { + SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", orig, file)); + UI::ChangeWidget (`id (`log), `LastLine, file + "\n"); + } + else + { + // log entry (%1 is file name) + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 skipped\n"), file)); + } + sleep (100); + progress = progress + 1; + }); - Progress::New(caption, " ", steps, [ - /* Progress stage 1/2 */ - _("Write the settings"), - /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + UI::ChangeWidget (`id (`progress ), `Value, progress); + UI::ChangeWidget (`id (`ok), `Enabled, true); - Progress::NextStage(); - Progress::NextStage (); - Progress::NextStage(); - return true; + UI::UserInput (); + UI::CloseDialog (); + + return ret; } Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dialogs.ycp?rev=63449&r1=63448&r2=63449&view=diff ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Mon Feb 21 16:16:53 2011 @@ -58,16 +58,6 @@ } /** - * Write settings dialog - * @return `abort if aborted and `next otherwise - */ -symbol WriteDialog() { - Wizard::RestoreHelp(HELPS["write"]:""); - boolean ret = Snapper::Write(); - return ret ? `next : `abort; -} - -/** * Summary dialog * @return dialog result */ @@ -255,6 +245,7 @@ // helper function: update the global map with directory tree structure map update_tree_map (map current_map, list<string> path_list) { + y2internal ("current path list: %1", path_list); string first = path_list[0]:""; if (current_map[first]:nil == nil) @@ -272,7 +263,7 @@ } // save full paths of files marked as modified - map files_index = $[]; + map files_index = $[]; // go through the map defining filesystem tree and create the widget items list<term> generate_tree_items (string current_path, map current_branch) { @@ -483,8 +474,33 @@ current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); if (current_file == nil) current_file = ""; - // events in tree - if (ret == `tree) + // tree checkbox clicked + if (ret == `tree && event["EventReason"]:"" == "ValueChanged") + { + // non-tracked file (so, it should be directory) + if (current_file != "" && files_index[current_file]:$[] == $[]) + { +y2internal ("event: %1", event); + // FIXME not possible to uncheck an item... + integer len = size (current_file); + list<string> sel= []; + foreach (string key, map m, files_index, { + // FIXME this could get too slow... build a structure while creating items? + if (substring (key, 0, len) == current_file) + { + y2security ("select '%1'", key); + sel = add (sel, key); + } + }); + if (sel != []) + { + UI::ChangeWidget (`tree, `SelectedItems, sel); + } + } + + } + // other tree events + else if (ret == `tree) { set_entry_term (); UI::NormalCursor (); @@ -517,11 +533,9 @@ } else if (ret == `next) { list<string> files = (list<string>) UI::QueryWidget (`id (`tree), `SelectedItems); - y2internal ("files: %1", files); files = filter (string file, files, { return haskey (files_index, file); }); - y2internal ("files: %1", files); if (files == []) { @@ -529,16 +543,16 @@ Popup::Message (_("No file was selected for restoring")); continue; } - // FIXME restore from PRE or POST? + // FIXME restore from PRE or POST? (PRE by default) // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), - // popup message - sformat (_("These files will be restored from snapshot %1:<br>%2<br>Are you sure?"), - snapshot_name, mergestring (files, "<br>")), + // popup message, %1 is snapshot number, %2 list of files + sformat (_("These files will be copied from snapshot %1 to current system:<p>%2</p>Are you sure?"), + previous_num, mergestring (files, "<br>")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { - y2milestone ("restoring files..."); - // TODO copy the files + Snapper::RestoreFiles (previous_num, files); + break; } continue; } Modified: branches/tmp/jsuchome/snapper/src/snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/snapper.ycp?rev=63449&r1=63448&r2=63449&view=diff ============================================================================== --- branches/tmp/jsuchome/snapper/src/snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/snapper.ycp Mon Feb 21 16:16:53 2011 @@ -49,33 +49,11 @@ include "snapper/wizards.ycp"; map cmdline_description = $[ - "id" : "snapper", - /* Command line help text for the Xsnapper module */ - "help" : _("Configuration of snapper"), - "guihandler" : SnapperSequence, - "initialize" : Snapper::Read, - "finish" : Snapper::Write, - "actions" : $[ - // FIXME TODO: fill the functionality description here - ], - "options" : $[ - // FIXME TODO: fill the option descriptions here - ], - "mappings" : $[ - // FIXME TODO: fill the mappings of actions and options here - ] + "id" : "snapper", + "help" : _("Configuration of system snapshots"), + "guihandler": SnapperSequence, ]; -/* is this proposal or not? */ -boolean propose = false; -list args = WFM::Args(); -if(size(args) > 0) { - if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { - y2milestone("Using PROPOSE mode"); - propose = true; - } -} - /* main ui function */ any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); Modified: branches/tmp/jsuchome/snapper/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/wizards.ycp?rev=63449&r1=63448&r2=63449&view=diff ============================================================================== --- branches/tmp/jsuchome/snapper/src/wizards.ycp (original) +++ branches/tmp/jsuchome/snapper/src/wizards.ycp Mon Feb 21 16:16:53 2011 @@ -75,7 +75,6 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ @@ -86,12 +85,8 @@ ], "main" : $[ `abort : `abort, - `next : "write" - ], - "write" : $[ - `abort : `abort, `next : `next - ] + ], ]; Wizard::CreateDialog (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org