ref: refs/heads/master
commit b24d5a9f0757f331fd70e55cb22995372c3bf57a
Author: Ján Kupec <jkupec(a)suse.cz>
Date: Wed Dec 2 12:23:46 2009 +0100
New prompts options for media errors (bnc #223512, bnc #279045)
- cd/dvd: 'e' to eject selected drive
- https: 's' to disable SSL CA check (TODO: needs support in MediaAria2)
---
src/CMakeLists.txt | 1 +
src/callbacks/media.cc | 260 ++++++++++++++++++++++++++++++++++++++++++++++++
src/callbacks/media.h | 117 +---------------------
src/output/prompt.h | 3 +-
4 files changed, 266 insertions(+), 115 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22b749c..39e1a04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,6 +43,7 @@ SET( zypper_SRCS
update.cc
solve-commit.cc
Summary.cc
+ callbacks/media.cc
${zypper_HEADERS}
)
diff --git a/src/callbacks/media.cc b/src/callbacks/media.cc
new file mode 100644
index 0000000..0fb2e92
--- /dev/null
+++ b/src/callbacks/media.cc
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/
+
+#include "callbacks/media.h"
+
+#include "utils/misc.h"
+#include "utils/messages.h"
+
+#include "zypp/media/MediaManager.h"
+
+using namespace zypp;
+using namespace std;
+
+
+// ---------[ common ]--------------------------------------------------------
+
+static void set_common_option_help(PromptOptions & popts)
+{
+ // help text for the "Abort, retry, ignore?" prompt for media errors
+ popts.setOptionHelp(0, _("Skip retrieval of the file and abort current operation."));
+ // help text for the "Abort, retry, ignore?" prompt for media errors
+ popts.setOptionHelp(1, _("Try to retrieve the file again."));
+ // help text for the "Abort, retry, ignore?" prompt for media errors
+ popts.setOptionHelp(2, _("Skip retrieval of the file and try to continue with the operation without the file."));
+ // help text for the "Abort, retry, ignore?" prompt for media errors
+ popts.setOptionHelp(3, _("Change current base URI and try retrieving the file again."));
+ // hide advanced options
+ popts.setShownCount(3);
+}
+
+static MediaChangeReport::Action
+handle_common_options(unsigned reply, Url & url)
+{
+ MediaChangeReport::Action action = MediaChangeReport::ABORT;
+ switch (reply)
+ {
+ case 0: /* abort */
+ break;
+ case 3: /* change url */
+ {
+ // translators: this is a prompt label, will appear as "New URI: "
+ Url newurl(get_text(_("New URI") + string(": "), url.asString()));
+ url = newurl;
+ }
+ case 1: /* retry */
+ action = MediaChangeReport::RETRY;
+ break;
+ case 2: /* ignore */
+ action = MediaChangeReport::IGNORE;
+ default:
+ WAR << "invalid prompt reply: " << reply << endl;
+ }
+ return action;
+}
+
+
+// ---------[ https ]--------------------------------------------------------
+
+static MediaChangeReport::Action
+request_medium_https_handler(Zypper & zypper, Url & url)
+{
+ // https options
+ // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt.
+ // Translate the a/r/i part exactly as you did the a/r/i string.
+ // The 'u' reply means 'Change URI'.
+ // https protocol-specific options:
+ // 's' stands for Disable SSL certificate authority check
+ PromptOptions popts(_("a/r/i/u/s"), 0);
+ set_common_option_help(popts);
+ popts.setOptionHelp(4, _("Disable SSL certificate authority check and continue."));
+
+ // translators: this is a prompt text
+ zypper.out().prompt(PROMPT_ARI_MEDIA_PROBLEM, _("Abort, retry, ignore?"), popts);
+ int reply = get_prompt_reply(zypper, PROMPT_ARI_MEDIA_PROBLEM, popts);
+
+ MediaChangeReport::Action action;
+ switch (reply)
+ {
+ case 4: /* disable SSL */
+ url.setQueryParam("ssl_verify", "no");
+ zypper.out().info(_("SSL certificate authority check disabled."));
+ action = MediaChangeReport::RETRY;
+ break;
+ default:
+ action = handle_common_options(reply, url);
+ }
+ return action;
+}
+
+
+// ---------[ cd/dvd ]---------------------------------------------------------
+
+static void eject_drive_dialog(
+ Zypper & zypper,
+ Url & url,
+ const vector<string> & devices,
+ unsigned int & index)
+{
+ bool cancel = false;
+ if (devices.empty())
+ {
+ zypper.out().info(_("No devices detected, cannot eject."));
+ zypper.out().info(_("Try to eject the device manually."));
+ }
+ if (devices.size() == 1)
+ {
+ MIL << "ejecting " << devices.front() << endl;
+ media::MediaManager mm;
+ media::MediaAccessId mid = mm.open(url);
+ mm.release(mid, devices.front());
+ }
+ else
+ {
+ zypper.out().info(_("Detected devices:"));
+ int devn = 1;
+ ostringstream numbers;
+ for_(it, devices.begin(), devices.end())
+ {
+ // enhancement: we could try to get nicer device names like
+ // "DVDRAM GSA-U10N on /dev/sr0"
+ cout << devn << " " << *it << " " << endl;
+ numbers << devn << "/";
+ ++devn;
+ }
+ numbers << "c"; // c for cancel
+
+ int devcount = devices.size();
+ PromptOptions popts(numbers.str(), 0);
+ popts.setOptionHelp(devcount, _("Cancel"));
+ zypper.out().prompt(PROMPT_MEDIA_EJECT, _("Select device to eject."), popts);
+ int reply = get_prompt_reply(zypper, PROMPT_MEDIA_EJECT, popts);
+ if (reply == devcount)
+ cancel = true;
+ else
+ {
+ MIL << "ejecting " << devices[reply] << endl;
+ media::MediaManager mm;
+ media::MediaAccessId mid = mm.open(url);
+ mm.release(mid, devices[reply]);
+ }
+ }
+
+ if (!cancel)
+ {
+ zypper.out().info(_("Insert the CD/DVD and press ENTER to continue."));
+ getchar();
+ }
+ zypper.out().info(_("Retrying..."));
+}
+
+
+static MediaChangeReport::Action
+request_medium_dvd_handler(
+ Zypper & zypper,
+ zypp::Url & url,
+ const vector<string> & devices,
+ unsigned int & index)
+{
+ // cd/dvd options
+ // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt.
+ // Translate the a/r/i part exactly as you did the a/r/i string.
+ // The 'u' reply means 'Change URI'.
+ // cd/dvd protocol-specific options:
+ // 'e' stands for Eject medium
+ PromptOptions popts(_("a/r/i/u/e"), 0);
+ set_common_option_help(popts);
+ popts.setOptionHelp(4, _("Eject medium."));
+
+ // translators: this is a prompt text
+ zypper.out().prompt(PROMPT_ARI_MEDIA_PROBLEM, _("Abort, retry, ignore?"), popts);
+ int reply = get_prompt_reply(zypper, PROMPT_ARI_MEDIA_PROBLEM, popts);
+ MediaChangeReport::Action action;
+ switch (reply)
+ {
+ case 4: /* eject medium */
+ eject_drive_dialog(zypper, url, devices, index);
+ action = MediaChangeReport::RETRY;
+ break;
+ default:
+ action = handle_common_options(reply, url);
+ }
+ return action;
+}
+
+// ---------------------------------------------------------------------------
+
+MediaChangeReport::Action
+ZmartRecipients::MediaChangeReportReceiver::requestMedia(
+ zypp::Url & url,
+ unsigned mediumNr,
+ const std::string & label,
+ MediaChangeReport::Error error,
+ const std::string & description,
+ const std::vector<std::string> & devices,
+ unsigned int & index)
+{
+ Zypper & zypper = *Zypper::instance();
+
+ DBG << "medium problem, url: " << url.asString() << std::endl;
+
+ zypper.out().error(description);
+ if (is_changeable_media(url) && error == MediaChangeReport::WRONG)
+ {
+ //cerr << endl; // may be in the middle of RepoReport or ProgressReport \todo check this
+
+ std::string request = boost::str(boost::format(
+ // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language.
+ // Try to check what answers does zypper accept (it always accepts y/n at least)
+ // You can also have a look at the regular expressions used to check the answer here:
+ // /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES
+ _("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."))
+ % label % mediumNr);
+ if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false))
+ return MediaChangeReport::RETRY;
+ else
+ return MediaChangeReport::ABORT;
+ }
+
+ if (error == MediaChangeReport::IO_SOFT)
+ {
+ MediaChangeReport::Action action = MediaChangeReport::RETRY;
+ if (repeat_counter.counter_overrun(url))
+ action = MediaChangeReport::ABORT;
+ return (Action) read_action_ari_with_timeout(PROMPT_ARI_MEDIA_PROBLEM,
+ 30,action);
+ }
+
+ Action action = MediaChangeReport::ABORT;
+ if (url.getScheme() == "https")
+ action = request_medium_https_handler(zypper, url);
+ if (url.getScheme() == "cd" || url.getScheme() == "dvd")
+ action = request_medium_dvd_handler(zypper, url, devices, index);
+ else
+ {
+ // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt
+ // Translate the a/r/i part exactly as you did the a/r/i string.
+ // the 'u' reply means 'Change URI'.
+ PromptOptions popts(_("a/r/i/u"), 0);
+ set_common_option_help(popts);
+
+ // translators: this is a prompt text
+ zypper.out().prompt(PROMPT_ARI_MEDIA_PROBLEM, _("Abort, retry, ignore?"), popts);
+ int reply = get_prompt_reply(zypper, PROMPT_ARI_MEDIA_PROBLEM, popts);
+
+ action = handle_common_options(reply, url);
+ }
+
+ // if an rpm download failed and user chose to ignore that, advice to
+ // run zypper verify afterwards
+ if (action == MediaChangeReport::IGNORE
+ && zypper.runtimeData().action_rpm_download
+ && !zypper.runtimeData().seen_verify_hint)
+ print_verify_hint(Zypper::instance()->out());
+
+ return action;
+}
diff --git a/src/callbacks/media.h b/src/callbacks/media.h
index bcb2549..b3a439f 100644
--- a/src/callbacks/media.h
+++ b/src/callbacks/media.h
@@ -10,18 +10,17 @@
#include <stdlib.h>
#include <ctime>
+#include <iostream>
#include <boost/format.hpp>
#include "zypp/ZYppCallbacks.h"
-#include "zypp/base/String.h"
+#include "zypp/base/Logger.h"
#include "zypp/Pathname.h"
#include "zypp/Url.h"
-#include "zypp/media/MediaUserAuth.h"
#include "Zypper.h"
#include "utils/prompt.h"
-#include "utils/messages.h"
#define REPEAT_LIMIT 3
@@ -62,117 +61,7 @@ namespace ZmartRecipients
MediaChangeReport::Error error,
const std::string & description,
const std::vector<std::string> & devices,
- unsigned int & index)
- {
- Zypper & zypper = *Zypper::instance();
-
- /*std::cout << "detected devices: ";
- for (std::vector<std::string>::const_iterator it = devices.begin();
- it != devices.end(); ++it)
- std::cout << *it << " ";
- cout << std::endl;*/
- DBG << "media problem, url: " << url.asString() << std::endl;
-
- zypper.out().error(description);
- if (is_changeable_media(url) && error == MediaChangeReport::WRONG)
- {
- //cerr << endl; // may be in the middle of RepoReport or ProgressReport \todo check this
-
- std::string request = boost::str(boost::format(
- // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language.
- // Try to check what answers does zypper accept (it always accepts y/n at least)
- // You can also have a look at the regular expressions used to check the answer here:
- // /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES
- _("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."))
- % label % mediumNr);
- if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false))
- return MediaChangeReport::RETRY;
- else
- return MediaChangeReport::ABORT;
- }
-
- if (error == MediaChangeReport::IO_SOFT)
- {
- MediaChangeReport::Action action = MediaChangeReport::RETRY;
- if (repeat_counter.counter_overrun(url))
- action = MediaChangeReport::ABORT;
- return (Action) read_action_ari_with_timeout(PROMPT_ARI_MEDIA_PROBLEM,
- 30,action);
- }
-
- // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt
- // Translate the a/r/i part exactly as you did the a/r/i string.
- // the 'u' reply means 'Change URI'.
- PromptOptions popts(_("a/r/i/u"), 0);
- // help text for the "Abort, retry, ignore?" prompt for media errors
- popts.setOptionHelp(0, _("Skip retrieval of the file and abort current operation."));
- // help text for the "Abort, retry, ignore?" prompt for media errors
- popts.setOptionHelp(1, _("Try to retrieve the file again."));
- // help text for the "Abort, retry, ignore?" prompt for media errors
- popts.setOptionHelp(2, _("Skip retrieval of the file and try to continue with the operation without the file."));
- // help text for the "Abort, retry, ignore?" prompt for media errors
- popts.setOptionHelp(3, _("Change current base URI and try retrieving the file again."));
- // hide advanced options
- popts.setShownCount(3);
-
- // protocol-specific options
-
- // cd/dvd options
- // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt.
- // Translate the a/r/i part exactly as you did the a/r/i string.
- // The 'u' reply means 'Change URI'.
- // cd/dvd protocol-specific options:
- // 'e' stands for Eject medium
- std::string dvdopts = _("a/r/i/u/e");
- std::string ejecttext = _("Eject medium.");
- std::string devicestext = _("Detected devices:");
- std::string ejectprompttext = _("Select device to eject.");
- // popts.setOptionHelp(4, _("Eject medium."));
-
- // https options
- // translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt.
- // Translate the a/r/i part exactly as you did the a/r/i string.
- // The 'u' reply means 'Change URI'.
- // https protocol-specific options:
- // 's' stands for Disable SSL certificate authority check
- std::string httpsopts = _("a/r/i/u/s");
- std::string ssldisabletext = _("Disable SSL certificate authority check and continue.");
- std::string ssldisabledtext = _("SSL certificate authority check disabled.");
- // popts.setOptionHelp(4, _("Eject medium."));
-
- // translators: this is a prompt text
- zypper.out().prompt(PROMPT_ARI_MEDIA_PROBLEM, _("Abort, retry, ignore?"), popts);
- int reply = get_prompt_reply(zypper, PROMPT_ARI_MEDIA_PROBLEM, popts);
-
- Action action = MediaChangeReport::ABORT;
- switch (reply)
- {
- case 0: /* abort */
- break;
- case 3: /* change url */
- {
- // translators: this is a prompt label, will appear as "New URI: "
- zypp::Url newurl(get_text(_("New URI") + std::string(": "), url.asString()));
- url = newurl;
- }
- case 1: /* retry */
- action = MediaChangeReport::RETRY;
- break;
- case 2: /* ignore */
- action = MediaChangeReport::IGNORE;
- default:
- WAR << "invalid prompt reply: " << reply << std::endl;
- }
-
- // if an rpm download failed and user chose to ignore that, advice to
- // run zypper verify afterwards
- if (action == MediaChangeReport::IGNORE
- && zypper.runtimeData().action_rpm_download
- && !zypper.runtimeData().seen_verify_hint)
- print_verify_hint(Zypper::instance()->out());
-
- return action;
- }
+ unsigned int & index);
private:
repeat_counter_ repeat_counter;
};
diff --git a/src/output/prompt.h b/src/output/prompt.h
index 316022d..a6368d6 100644
--- a/src/output/prompt.h
+++ b/src/output/prompt.h
@@ -45,7 +45,8 @@ typedef enum
PROMPT_GPG_WRONG_DIGEST_ACCEPT = 18,
PROMPT_YN_REMOVE_LOCK = 19,
PROMPT_PATCH_MESSAGE_CONTINUE = 20,
- PROMPT_ARI_PATCH_SCRIPT_PROBLEM = 21
+ PROMPT_ARI_PATCH_SCRIPT_PROBLEM = 21,
+ PROMPT_MEDIA_EJECT = 22
} PromptId;
#endif /*PROMPT_H_*/
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
