ref: refs/heads/master
commit a9de0f9246645e998afedb8bb50c71f2577e99ac
Author: Ján Kupec
Date: Sun Feb 15 20:44:44 2009 +0100
PromptOptions enhancements.
- allow to disable some prompt options
- allow to show only first N options (hide the rest/advanced options)
---
src/output/OutNormal.cc | 2 +
src/output/OutXML.cc | 6 +++-
src/utils/prompt.cc | 66 +++++++++++++++++++++++++++--------------------
src/utils/prompt.h | 31 ++++++++++++++++++++++
4 files changed, 75 insertions(+), 30 deletions(-)
diff --git a/src/output/OutNormal.cc b/src/output/OutNormal.cc
index b189a4b..dc8a62b 100644
--- a/src/output/OutNormal.cc
+++ b/src/output/OutNormal.cc
@@ -252,6 +252,8 @@ void OutNormal::promptHelp(const PromptOptions & poptions)
for(PromptOptions::StrVector::const_iterator it = poptions.options().begin();
it != poptions.options().end(); ++it, ++pos)
{
+ if (poptions.isDisabled(pos))
+ continue;
cout << *it << " - ";
const string & hs_r = poptions.optionHelp(pos);
if (hs_r.empty())
diff --git a/src/output/OutXML.cc b/src/output/OutXML.cc
index 2101259..6d0c584 100644
--- a/src/output/OutXML.cc
+++ b/src/output/OutXML.cc
@@ -74,7 +74,7 @@ void OutXML::info(const string & msg, Verbosity verbosity, Type mask)
{
if (infoWarningFilter(verbosity, mask))
return;
-
+
cout << "" << xml_encode(msg)
<< "</message>" << endl;
}
@@ -123,7 +123,7 @@ void OutXML::writeProgressTag(const string & id, const string & label,
cout << " done=\"" << error << "\"";
// print value only if it is known (percentage progress)
// missing value means 'is-alive' notification
- else if (value >= 0)
+ else if (value >= 0)
cout << " value=\"" << value << "\"";
cout << "/>" << endl;
}
@@ -200,6 +200,8 @@ void OutXML::prompt(PromptId id,
for (PromptOptions::StrVector::const_iterator it = poptions.options().begin();
it != poptions.options().end(); ++it, ++i)
{
+ if (poptions.isDisabled(i))
+ continue;
string option = *it;
cout << "= 0)
+ if (poptions.isYesNoPrompt() && rpmatch(reply.c_str()) >= 0)
{
if (rpmatch(reply.c_str()))
reply_int = 0; // the index of "yes" in the poptions.options()
@@ -267,29 +293,13 @@ unsigned int get_prompt_reply(Zypper & zypper,
reply_int = 1; // the index of "no" in the poptions.options()
break;
}
- else
- {
- DBG << " reply: " << reply << " (" << zypp::str::toLower(reply) << " lowercase)" << endl;
- bool got_valid_reply = false;
- for (unsigned int i = 0; i < poptions.options().size(); i++)
- {
- DBG << "index: " << i << " option: "
- << poptions.options()[i] << endl;
- if (poptions.options()[i] == zypp::str::toLower(reply))
- {
- reply_int = i;
- got_valid_reply = true;
- break;
- }
- }
- if (got_valid_reply)
- break;
- }
+ else if ((reply_int = poptions.getReplyIndex(reply)) >= 0) // got valid reply
+ break;
ostringstream s;
s << format(_("Invalid answer '%s'.")) % reply;
- if (is_yn_prompt)
+ if (poptions.isYesNoPrompt())
{
s << " " << format(
// TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
diff --git a/src/utils/prompt.h b/src/utils/prompt.h
index dd231eb..86828b2 100644
--- a/src/utils/prompt.h
+++ b/src/utils/prompt.h
@@ -1,6 +1,8 @@
#ifndef ZYPPERPROMPT_H_
#define ZYPPERPROMPT_H_
+#include <set>
+
#include "output/prompt.h"
#include "main.h" // for gettext macros
@@ -45,6 +47,7 @@ public:
unsigned int defaultOpt() const { return _default; }
const std::string optionString() const;
bool empty() const { return _options.empty(); }
+ bool isYesNoPrompt() const;
const std::string optionHelp(unsigned int opt) const
{ static std::string empty; return opt < _opt_help.size() ? _opt_help[opt] : empty; }
@@ -52,10 +55,38 @@ public:
void setOptionHelp(unsigned int opt, const std::string & help_str);
bool helpEmpty() const { return _opt_help.empty(); }
+ bool isEnabled(unsigned int opt) const
+ { return _disabled.find(opt) == _disabled.end(); }
+ bool isDisabled(unsigned int opt) const
+ { return _disabled.find(opt) != _disabled.end(); }
+ void disable(unsigned int opt)
+ { _disabled.insert(opt); }
+ void enable(unsigned int opt)
+ { _disabled.erase(opt); }
+ void enableAll()
+ { _disabled.clear(); }
+
+ unsigned int shownCount() const
+ { return _shown_count; }
+ void setShownCount(unsigned int count)
+ { _shown_count = count; }
+
+ int getReplyIndex(const std::string & reply) const;
+
private:
+ /** option strings */
StrVector _options;
+ /** index of the default option */
unsigned int _default;
+ /** help strings corresponding to options */
StrVector _opt_help;
+ /** set of options to ignore */
+ std::set<unsigned int> _disabled;
+ /**
+ * number of options to show (the rest will still be available and visible
+ * through '?' help)
+ */
+ unsigned int _shown_count;
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
