Author: jkupec Date: Tue Feb 19 13:56:20 2008 New Revision: 8809 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8809&view=rev Log: - can't use <progress><tick/></progress> for progress becase multiple progress meters can be in place simultaneously. Also we can have multiple operations running in parallel in the future (e.g. commit/download). Thus, using <progress/> all the time, no starting and ending tags. - backup Modified: trunk/zypper/src/output/Out.cc trunk/zypper/src/output/Out.h trunk/zypper/src/output/OutNormal.cc trunk/zypper/src/output/OutNormal.h trunk/zypper/src/output/OutXML.cc trunk/zypper/src/output/OutXML.h trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/output/Out.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.cc?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/Out.cc (original) +++ trunk/zypper/src/output/Out.cc Tue Feb 19 13:56:20 2008 @@ -1,3 +1,5 @@ +#include <sstream> + #include "Out.h" Out::~Out() @@ -11,3 +13,25 @@ return true; return false; } + +std::string Out::zyppExceptionReport(const zypp::Exception & e) +{ + std::ostringstream s; + if (e.historySize()) + { + if (this->verbosity() > Out::NORMAL) + { + // print the whole history + s << e.historyAsString(); + // this exception + s << " - " << e.asUserString(); + } + else + // print the root cause only + s << *(--e.historyEnd()); + } + else + s << e.asUserString(); + + return s.str(); +} Modified: trunk/zypper/src/output/Out.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/Out.h (original) +++ trunk/zypper/src/output/Out.h Tue Feb 19 13:56:20 2008 @@ -98,10 +98,16 @@ const std::string & label) = 0; // progress with download rate - virtual void dwnldProgressStart() = 0; - virtual void dwnldProgress() = 0; - virtual void dwnldProgressEnd() = 0; + virtual void dwnldProgressStart(const std::string & id, + const std::string & label) = 0; + virtual void dwnldProgress(const std::string & id, + const std::string & label, + int value = -1, + int rate = -1) = 0; + virtual void dwnldProgressEnd(const std::string & id, + const std::string & label) = 0; + //virtual void Prompt() = 0; public: /** Get current verbosity. */ Verbosity verbosity() { return _verbosity; } @@ -126,6 +132,11 @@ */ virtual bool progressFilter(); + /** + * Return a zypp::Exception as a string suitable for output. + */ + virtual std::string zyppExceptionReport(const zypp::Exception & e); + private: Verbosity _verbosity; Type _type; Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Tue Feb 19 13:56:20 2008 @@ -56,40 +56,14 @@ // ---------------------------------------------------------------------------- -string OutNormal::reportZyppException(const zypp::Exception & e) -{ - ostringstream s; - if (e.historySize()) - { - if (this->verbosity() > Out::NORMAL) - { - // print the whole history - s << e.historyAsString(); - // this exception - s << " - " << e.asUserString(); - } - else - // print the root cause only - s << *(--e.historyEnd()); - } - else - s << e.asUserString(); - - return s.str(); -} - -// ---------------------------------------------------------------------------- - void OutNormal::error(const zypp::Exception & e, const string & problem_desc, const string & hint) { // problem cerr << problem_desc << endl; - // cause - cerr << reportZyppException(e) << endl; - + cerr << zyppExceptionReport(e) << endl; // hint if (!hint.empty()) cerr << hint << endl; @@ -158,6 +132,23 @@ cout << CLEARLN << cursor.done() << " " << label << std::flush << endl; } -void OutNormal::dwnldProgressStart(){} -void OutNormal::dwnldProgress(){} -void OutNormal::dwnldProgressEnd(){} +// progress with download rate +void OutNormal::dwnldProgressStart(const std::string & id, + const std::string & label) +{ + +} + +void OutNormal::dwnldProgress(const std::string & id, + const std::string & label, + int value, + int rate) +{ + +} + +void OutNormal::dwnldProgressEnd(const std::string & id, + const std::string & label) +{ + +} \ No newline at end of file Modified: trunk/zypper/src/output/OutNormal.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.h?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.h (original) +++ trunk/zypper/src/output/OutNormal.h Tue Feb 19 13:56:20 2008 @@ -27,16 +27,20 @@ virtual void progressEnd(const std::string & id, const std::string & label); // progress with download rate - void dwnldProgressStart(); - void dwnldProgress(); - void dwnldProgressEnd(); + virtual void dwnldProgressStart(const std::string & id, + const std::string & label); + virtual void dwnldProgress(const std::string & id, + const std::string & label, + int value = -1, + int rate = -1); + virtual void dwnldProgressEnd(const std::string & id, + const std::string & label); protected: virtual bool mine(Type type); private: bool infoWarningFilter(Verbosity verbosity, Type mask); - std::string reportZyppException(const zypp::Exception & e); }; #endif /*OUTNORMAL_H_*/ Modified: trunk/zypper/src/output/OutXML.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.cc (original) +++ trunk/zypper/src/output/OutXML.cc Tue Feb 19 13:56:20 2008 @@ -57,29 +57,6 @@ //! \todo hint } -string OutXML::reportZyppException(const zypp::Exception & e) -{ - ostringstream s; - if (e.historySize()) - { - if (this->verbosity() > Out::NORMAL) - { - // print the whole history - s << e.historyAsString(); - // this exception - s << " - " << e.asUserString(); - } - else - // print the root cause only - s << *(--e.historyEnd()); - } - else - s << e.asUserString(); - - return s.str(); -} - - void OutXML::error(const zypp::Exception & e, const string & problem_desc, const string & hint) @@ -89,7 +66,7 @@ // problem s << problem_desc << endl; // cause - s << reportZyppException(e) << endl; + s << zyppExceptionReport(e) << endl; // hint if (!hint.empty()) s << hint << endl; @@ -97,17 +74,26 @@ cout << "" << s.str() << "</message>" << endl; } +void OutXML::writeProgressTag(const string & id, const string & label, + int value, bool done) +{ + cout << "= 0) + cout << " value=\"" << value << "\""; + cout << " done=\"" << done << "\""; + cout << "/>" << endl; +} + void OutXML::progressStart(const string & id, const string & label, - bool is_tick) + bool has_range) { if (progressFilter()) return; - cout << ""; - cout << endl; + writeProgressTag(id, label, has_range ? 0 : -1, false); } void OutXML::progress(const string & id, @@ -117,10 +103,7 @@ if (progressFilter()) return; - if (value) - cout << "" << endl; - else - cout << "<tick/>" << endl; + writeProgressTag(id, label, value, false); } void OutXML::progressEnd(const string & id, const string& label) @@ -128,10 +111,26 @@ if (progressFilter()) return; - cout << "</progress>" << endl; + writeProgressTag(id, label, 100, true); +} + +// progress with download rate +void OutXML::dwnldProgressStart(const std::string & id, + const std::string & label) +{ + cout << "" << endl; } +void OutXML::dwnldProgress(const std::string & id, + const std::string & label, + int value, + int rate) +{ + cout << "" << endl; +} -void OutXML::dwnldProgressStart(){} -void OutXML::dwnldProgress(){} -void OutXML::dwnldProgressEnd(){} +void OutXML::dwnldProgressEnd(const std::string & id, + const std::string & label) +{ + cout << "" << endl; +} \ No newline at end of file Modified: trunk/zypper/src/output/OutXML.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.h?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.h (original) +++ trunk/zypper/src/output/OutXML.h Tue Feb 19 13:56:20 2008 @@ -27,16 +27,23 @@ virtual void progressEnd(const std::string & id, const std::string & label); // progress with download rate - void dwnldProgressStart(); - void dwnldProgress(); - void dwnldProgressEnd(); + virtual void dwnldProgressStart(const std::string & id, + const std::string & label); + virtual void dwnldProgress(const std::string & id, + const std::string & label, + int value = -1, + int rate = -1); + virtual void dwnldProgressEnd(const std::string & id, + const std::string & label); protected: virtual bool mine(Type type); private: bool infoWarningFilter(Verbosity verbosity, Type mask); - std::string reportZyppException(const zypp::Exception & e); + void writeProgressTag(const std::string & id, + const std::string & label, + int value, bool done); }; #endif /*OUTXML_H_*/ Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Tue Feb 19 13:56:20 2008 @@ -105,7 +105,7 @@ { zypper.out().error(e, boost::str(format(_("Problem downloading files from '%s'.")) % repo.name()), - _("Please see the above error message to for a hint.")); + _("Please see the above error message for a hint.")); return true; // error } @@ -305,16 +305,15 @@ /** * Say "Repository %s not found" for all strings in \a not_found list. */ -static void report_unknown_repos(list<string> not_found) +static void report_unknown_repos(Out & out, list<string> not_found) { for (list<string>::iterator it = not_found.begin(); it != not_found.end(); ++it) - cerr << format(_("Repository '%s' not found by its alias, number, or URI.")) - % *it << endl; + out.error(boost::str(format( + _("Repository '%s' not found by its alias, number, or URI.")) % *it)); if (!not_found.empty()) - cout_n << _("Use 'zypper repos' to get the list of defined repositories.") - << endl; + out.info(_("Use 'zypper repos' to get the list of defined repositories.")); } // --------------------------------------------------------------------------- @@ -341,7 +340,7 @@ get_repos(zypper, it->second.begin(), it->second.end(), gData.repos, not_found); if (!not_found.empty()) { - report_unknown_repos(not_found); + report_unknown_repos(zypper.out(), not_found); zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } @@ -670,7 +669,7 @@ parsed_opts::const_iterator tmp1; if ((tmp1 = copts.find("repo")) != copts.end()) get_repos(zypper, tmp1->second.begin(), tmp1->second.end(), specified, not_found); - report_unknown_repos(not_found); + report_unknown_repos(zypper.out(), not_found); ostringstream s; s << _("Specified repositories: "); @@ -831,7 +830,7 @@ parsed_opts::const_iterator tmp1; if ((tmp1 = copts.find("repo")) != copts.end()) get_repos(zypper, tmp1->second.begin(), tmp1->second.end(), specified, not_found); - report_unknown_repos(not_found); + report_unknown_repos(zypper.out(), not_found); cout_v << _("Specified repositories: "); for (list<RepoInfo>::const_iterator it = specified.begin(); Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8809&r1=8808&r2=8809&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Feb 19 13:56:20 2008 @@ -133,7 +133,7 @@ return *_out_ptr; cerr << "uninitialized output writer" << endl; - ZYPP_THROW(ExitRequestException("help provided")); + ZYPP_THROW(ExitRequestException("no output writer")); } void print_main_help(Zypper & zypper) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org