March 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <zypper> master : Show status and messages in COLOR_STATUS.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit ce55c0263d24d3af4165271020cb352d6cdbf532 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 23:54:26 2009 +0200 Show status and messages in COLOR_STATUS. - this aims to distinguish these from 'result' messages (can be e.g. printed in fainter color). - these are the messages that would be hidden in --quiet mode - will need more cleanup to make the coloring consistent - some messages are not printed via zypper.out().info() - some messages can be moved from/to --quiet to/from normal out --- src/output/OutNormal.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/output/OutNormal.cc b/src/output/OutNormal.cc index 7468ddd..bf0c3ce 100644 --- a/src/output/OutNormal.cc +++ b/src/output/OutNormal.cc @@ -61,7 +61,7 @@ void OutNormal::info(const std::string & msg, Verbosity verbosity, Type mask) if (verbosity == Out::QUIET) print_color(msg, COLOR_CONTEXT_RESULT); else - cout << msg; + print_color(msg, COLOR_CONTEXT_MSG_STATUS); cout << endl; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Allow to show version/arch/repo/vendor in summary.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit e25828dc5b92e99788e747b115abbbf2efff1b31 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 23:52:16 2009 +0200 Allow to show version/arch/repo/vendor in summary. - part of fixing bnc #389128 --- src/Summary.cc | 64 +++++++++++++++++++++---------- src/Summary.h | 2 + src/solve-commit.cc | 103 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 115 insertions(+), 54 deletions(-) diff --git a/src/Summary.cc b/src/Summary.cc index 3959c9e..50a209b 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -18,6 +18,7 @@ #include "main.h" #include "utils/text.h" #include "utils/misc.h" +#include "Table.h" #include "Summary.h" @@ -237,33 +238,51 @@ void Summary::writeResolvableList(ostream & out, const ResPairSet & resolvables) s << resit->second->name() << " "; wrap_text(out, s.str(), 2, _wrap_width); out << endl; + return; } -} -// -------------------------------------------------------------------------- + Table t; t.lineStyle(none); t.wrap(0); t.margin(2); -// plus edition and architecture for verbose output -/* -if (out.verbosity() > Out::NORMAL) -{ - s << "-" << res->edition() << "." << res->arch(); - - const string & reponame = res->repoInfo().name(); - if (!res->vendor().empty() || !reponame.empty()) + for (ResPairSet::const_iterator resit = resolvables.begin(); + resit != resolvables.end(); ++resit) { - s << " ("; - // plus repo providing this package - if (!reponame.empty()) - s << reponame; - // plus package vendor - if (!res->vendor().empty()) - s << (reponame.empty() ? "" : ", ") << res->vendor(); - s << ")"; + TableRow tr; + tr << resit->second->name(); + if (_viewop & SHOW_VERSION) + { + if (resit->first && resit->first->edition() != resit->second->edition()) + tr << resit->first->edition().asString() + " -> " + + resit->second->edition().asString(); + else + tr << resit->second->edition().asString(); + } + if (_viewop & SHOW_ARCH) + { + if (resit->first && resit->first->arch() != resit->second->arch()) + tr << resit->first->arch().asString() + " -> " + + resit->second->arch().asString(); + else + tr << resit->second->arch().asString(); + } + if (_viewop & SHOW_REPO) + { + // we do not know about repository changes, only show the repo from + // which the package will be installed + tr << resit->second->repoInfo().name(); + } + if (_viewop & SHOW_VENDOR) + { + if (resit->first && resit->first->vendor() != resit->second->vendor()) + tr << resit->first->vendor() + " -> " + + resit->second->vendor(); + else + tr << resit->second->vendor(); + } + t << tr; } - // new line after each package in the verbose mode - s << endl; + + out << t << endl; } -*/ // -------------------------------------------------------------------------- @@ -549,6 +568,9 @@ void Summary::writeUnsupported(ostream & out) void Summary::writeDownloadAndInstalledSizeSummary(ostream & out) { + if (!_inst_pkg_total && toremove.empty()) + return; // nothing to do, keep silent + // download size info ostringstream s; if (_todownload > 0) diff --git a/src/Summary.h b/src/Summary.h index f22a09b..6ddd7fe 100644 --- a/src/Summary.h +++ b/src/Summary.h @@ -60,6 +60,8 @@ public: { _viewop = (ViewOptions) (_viewop | option); } void unsetViewOption(const ViewOptions option) { _viewop = (ViewOptions) (_viewop & ~option); } + void toggleViewOption(const ViewOptions option) + { _viewop & option ? unsetViewOption(option) : setViewOption(option); } void writeNewlyInstalled(std::ostream & out); void writeRemoved(std::ostream & out); diff --git a/src/solve-commit.cc b/src/solve-commit.cc index 0d86996..8821675 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -365,7 +365,7 @@ static void make_solver_test_case(Zypper & zypper) */ void solve_and_commit (Zypper & zypper) { - bool show_forced_problems = true; + bool need_another_solver_run = true; bool commit_done = false; do { @@ -460,29 +460,48 @@ void solve_and_commit (Zypper & zypper) zypper.command() == ZypperCommand::REMOVE); bool do_commit = false; - if (zypper.runtimeData().force_resolution && show_p_option) + PromptOptions popts; + // translators: Yes / No / show Problems. This prompt will appear + // after install/update command summary if there will be any package + // to-be-removed automatically to show why, if asked. + // Translate to whathever is suitable for your language + // The anserws must be separated by slash characters '/' and must + // correspond to yes/no/showproblems in that order. + // The answers should be lower case letters. + popts.setOptions(_("y/n/p/v/a/r/m"), 0); + popts.setShownCount(2); + if (!(zypper.runtimeData().force_resolution && show_p_option)) + popts.disable(2); + // translators: help text for 'y' option in the y/n/p prompt + popts.setOptionHelp(0, _("Yes, ccept the summary and proceed with installation/removal of packages.")); + // translators: help text for 'n' option in the y/n/p prompt + popts.setOptionHelp(1, _("No, cancel the operation.")); + // translators: help text for 'p' option in the y/n/p prompt + popts.setOptionHelp(2, _("Restart solver in no-force-resolution mode in order to show dependency problems.")); + popts.setOptionHelp(3, _("Toggle display of package versions.")); + popts.setOptionHelp(4, _("Toggle display of package architectures.")); + popts.setOptionHelp(5, _("Toggle display of repositories from which the packages will be installed.")); + popts.setOptionHelp(6, _("Toggle display of package vendor names.")); + // popts.setOptionHelp(7, _("Explain why the packages are going to be installed.")); + // popts.setOptionHelp(8, _("Show all details.")); + + string prompt_text = _("Continue?"); + + unsigned int reply; + do { - PromptOptions popts; - // translators: Yes / No / show Problems. This prompt will appear - // after install/update command summary if there will be any package - // to-be-removed automatically to show why, if asked. - // Translate to whathever is suitable for your language - // The anserws must be separated by slash characters '/' and must - // correspond to yes/no/showproblems in that order. - // The answers should be lower case letters. - popts.setOptions(_("y/n/p"), 0); - // translators: help text for 'y' option in the y/n/p prompt - popts.setOptionHelp(0, _("Accept the summary and proceed with installation/removal of packages.")); - // translators: help text for 'n' option in the y/n/p prompt - popts.setOptionHelp(1, _("Cancel the operation.")); - // translators: help text for 'p' option in the y/n/p prompt - popts.setOptionHelp(2, _("Restart solver in no-force-resolution mode in order to show dependency problems.")); - string prompt_text = _("Continue?"); zypper.out().prompt(PROMPT_YN_INST_REMOVE_CONTINUE, prompt_text, popts); - unsigned int reply = - get_prompt_reply(zypper, PROMPT_YN_INST_REMOVE_CONTINUE, popts); + reply = get_prompt_reply(zypper, PROMPT_YN_INST_REMOVE_CONTINUE, popts); - if (reply == 2) + switch(reply) + { + case 0: // y + { + do_commit = true; + need_another_solver_run = false; + break; + } + case 2: // p { // one more solver solver run with force-resoltion off zypper.runtimeData().force_resolution = false; @@ -490,20 +509,38 @@ void solve_and_commit (Zypper & zypper) God->resolver()->undo(); continue; } - else if (reply == 1) - show_forced_problems = false; - else + case 3: // v { - do_commit = true; - show_forced_problems = false; + summary.toggleViewOption(Summary::SHOW_VERSION); + summary.dumpTo(cout); + break; + } + case 4: // a + { + summary.toggleViewOption(Summary::SHOW_ARCH); + summary.dumpTo(cout); + break; + } + case 5: // r + { + summary.toggleViewOption(Summary::SHOW_REPO); + summary.dumpTo(cout); + break; + } + case 6: // m + { + summary.toggleViewOption(Summary::SHOW_VENDOR); + summary.dumpTo(cout); + break; + } + default: // n + need_another_solver_run = false; } } - // no dependency problems - else - { - do_commit = read_bool_answer(PROMPT_YN_INST_REMOVE_CONTINUE, _("Continue?"), true); - show_forced_problems = false; - } + while (reply > 2); + + if (need_another_solver_run) + continue; // COMMIT @@ -663,5 +700,5 @@ void solve_and_commit (Zypper & zypper) break; } } - while (show_forced_problems); + while (need_another_solver_run); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Table::wrap() added.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit 78c6e8d8cc288d96574707cbbf2684db3766b6f9 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 22:51:55 2009 +0200 Table::wrap() added. This is to enable controlled wrapping of the table to current screen width. --- src/Table.cc | 62 +++++++++++++++++++++++++++++++++++++++++++++------------ src/Table.h | 12 +++++++++- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/Table.cc b/src/Table.cc index 9e54111..f9c3005 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -53,7 +53,8 @@ void TableRow::dumbDumpTo (ostream &stream) const { stream << endl; } -void TableRow::dumpTo (ostream &stream, const Table & parent) const { +void TableRow::dumpTo (ostream &stream, const Table & parent) const +{ const char * vline = parent._style != none ? lines[parent._style][0] : ""; unsigned int ssize = 0; // string size in columns @@ -64,13 +65,38 @@ void TableRow::dumpTo (ostream &stream, const Table & parent) const { stream.setf (ios::left, ios::adjustfield); stream << string(parent._margin, ' '); - for (unsigned c = 0; i != e ; ++i, ++c) { - if (seen_first) { + // current position at currently printed line + int curpos = parent._margin; + // whether to break the line now in order to wrap it to screen width + bool do_wrap = false; + for (unsigned c = 0; i != e ; ++i, ++c) + { + if (seen_first) + { + do_wrap = + // user requested wrapping + parent._do_wrap && + // table is wider than screen + parent._width > parent._screen_width && ( + // the next table column would exceed the screen size + curpos + parent._max_width[c] + (parent._style != none ? 2 : 3) > parent._screen_width || + // or the user wishes to first break after the previous column + parent._force_break_after == c - 1); + + if (do_wrap) + { + // start printing the next table columns to new line, + // indent by 2 console columns + stream << endl << string(parent._margin + 2, ' '); + curpos = parent._margin + 2; // indent == 2 + } + else + // vertical line, padded with spaces + stream << ' ' << vline << ' '; stream.width (0); - // pad vertical line with spaces - stream << ' ' << vline << ' '; } - seen_first = true; + else + seen_first = true; // stream.width (widths[c]); // that does not work with multibyte chars const string & s = *i; @@ -83,19 +109,22 @@ void TableRow::dumpTo (ostream &stream, const Table & parent) const { stream.width (parent._max_width[c] - ssize); } stream << ""; + curpos += parent._max_width[c] + (parent._style != none ? 2 : 3); } stream << endl; } // ----------------------( Table )--------------------------------------------- -Table::Table() : - _has_header (false), - _max_col (0), - _width(0), - _style (defaultStyle), - _screen_width(get_screen_width()), - _margin(0) +Table::Table() + : _has_header (false) + , _max_col (0) + , _width(0) + , _style (defaultStyle) + , _screen_width(get_screen_width()) + , _margin(0) + , _force_break_after(-1) + , _do_wrap(false) {} void Table::add (const TableRow& tr) { @@ -192,6 +221,13 @@ void Table::dumpTo (ostream &stream) const { } } +void Table::wrap(int force_break_after) +{ + if (force_break_after >= 0) + _force_break_after = force_break_after; + _do_wrap = true; +} + void Table::lineStyle (TableLineStyle st) { if (st < _End) _style = st; diff --git a/src/Table.h b/src/Table.h index ac441dd..5ec80a0 100644 --- a/src/Table.h +++ b/src/Table.h @@ -83,18 +83,21 @@ TableRow& operator << (TableRow& tr, const string& s) { return tr; } + class Table { public: + typedef list<TableRow> container; + static TableLineStyle defaultStyle; void add (const TableRow& tr); void setHeader (const TableHeader& tr); void dumpTo (ostream& stream) const; bool empty () const { return _rows.empty(); } - typedef list<TableRow> container; + void sort (unsigned by_column); // columns start with 0... void lineStyle (TableLineStyle st); - void sort (unsigned by_column); // columns start with 0... + void wrap(int force_break_after = -1); void allowAbbrev(unsigned column); void margin(unsigned margin); @@ -122,6 +125,11 @@ private: vector<bool> _abbrev_col; //! left/right margin in number of spaces unsigned _margin; + //! if _do_wrap is set, first break the table at this column; + //! If negative, wrap as needed. + int _force_break_after; + //! Whether to wrap the table if it exceeds _screen_width + bool _do_wrap; friend class TableRow; }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Pass table attributes via Table object to rows.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit e88875f3405116dca927438682ac69235eb6cc53 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 21:14:21 2009 +0200 Pass table attributes via Table object to rows. --- src/Table.cc | 17 ++++++++--------- src/Table.h | 9 ++++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Table.cc b/src/Table.cc index bd0da65..9e54111 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -53,9 +53,8 @@ void TableRow::dumbDumpTo (ostream &stream) const { stream << endl; } -void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, - TableLineStyle st, unsigned margin) const { - const char * vline = st != none ? lines[st][0] : ""; +void TableRow::dumpTo (ostream &stream, const Table & parent) const { + const char * vline = parent._style != none ? lines[parent._style][0] : ""; unsigned int ssize = 0; // string size in columns bool seen_first = false; @@ -64,7 +63,7 @@ void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, e = _columns.end (); stream.setf (ios::left, ios::adjustfield); - stream << string(margin, ' '); + stream << string(parent._margin, ' '); for (unsigned c = 0; i != e ; ++i, ++c) { if (seen_first) { stream.width (0); @@ -76,12 +75,12 @@ void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, // stream.width (widths[c]); // that does not work with multibyte chars const string & s = *i; ssize = string_to_columns (s); - if (ssize > widths[c]) - stream << (s.substr(0, widths[c] - 2) + "->"); //! \todo FIXME cut at the correct place + if (ssize > parent._max_width[c]) + stream << (s.substr(0, parent._max_width[c] - 2) + "->"); //! \todo FIXME cut at the correct place else { stream << s; - stream.width (widths[c] - ssize); + stream.width (parent._max_width[c] - ssize); } stream << ""; } @@ -180,7 +179,7 @@ void Table::dumpTo (ostream &stream) const { } if (_has_header) { - _header.dumpTo (stream, _max_width, _style, _margin ); + _header.dumpTo (stream, *this); dumpRule (stream); } @@ -189,7 +188,7 @@ void Table::dumpTo (ostream &stream) const { e = _rows.end (), i; for (i = b; i != e; ++i) { - i->dumpTo (stream, _max_width, _style, _margin); + i->dumpTo (stream, *this); } } diff --git a/src/Table.h b/src/Table.h index caaaaf4..ac441dd 100644 --- a/src/Table.h +++ b/src/Table.h @@ -35,6 +35,8 @@ enum TableLineStyle { _End, ///< sentinel }; +class Table; + class TableRow { public: //! Constructor. Reserve place for c columns. @@ -49,9 +51,8 @@ public: //! tab separated output void dumbDumpTo (ostream &stream) const; - //! output with field widths - void dumpTo (ostream &stream, const vector<unsigned>& widths, - TableLineStyle st, unsigned margin) const; + //! output with \a parent table attributes + void dumpTo (ostream & stream, const Table & parent) const; typedef vector<string> container; @@ -121,6 +122,8 @@ private: vector<bool> _abbrev_col; //! left/right margin in number of spaces unsigned _margin; + + friend class TableRow; }; inline -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Renamed TableStyle -> TableLineStyle.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit 376864f86054caf376e52677ae002c9e1d936aff Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 20:16:14 2009 +0200 Renamed TableStyle -> TableLineStyle. --- src/Table.cc | 6 +++--- src/Table.h | 19 ++++++++++--------- src/Zypper.cc | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Table.cc b/src/Table.cc index cbf700e..bd0da65 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -15,7 +15,7 @@ using namespace std; -TableStyle Table::defaultStyle = Ascii; +TableLineStyle Table::defaultStyle = Ascii; static const char * lines[][3] = { @@ -54,7 +54,7 @@ void TableRow::dumbDumpTo (ostream &stream) const { } void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, - TableStyle st, unsigned margin) const { + TableLineStyle st, unsigned margin) const { const char * vline = st != none ? lines[st][0] : ""; unsigned int ssize = 0; // string size in columns @@ -193,7 +193,7 @@ void Table::dumpTo (ostream &stream) const { } } -void Table::style (TableStyle st) { +void Table::lineStyle (TableLineStyle st) { if (st < _End) _style = st; } diff --git a/src/Table.h b/src/Table.h index 6ef45df..caaaaf4 100644 --- a/src/Table.h +++ b/src/Table.h @@ -20,7 +20,7 @@ using std::list; using std::vector; //! table drawing style -enum TableStyle { +enum TableLineStyle { Ascii = 0, ///< | - + Light, Heavy, @@ -51,7 +51,7 @@ public: void dumbDumpTo (ostream &stream) const; //! output with field widths void dumpTo (ostream &stream, const vector<unsigned>& widths, - TableStyle st, unsigned margin) const; + TableLineStyle st, unsigned margin) const; typedef vector<string> container; @@ -84,7 +84,7 @@ TableRow& operator << (TableRow& tr, const string& s) { class Table { public: - static TableStyle defaultStyle; + static TableLineStyle defaultStyle; void add (const TableRow& tr); void setHeader (const TableHeader& tr); @@ -92,7 +92,7 @@ public: bool empty () const { return _rows.empty(); } typedef list<TableRow> container; - void style (TableStyle st); + void lineStyle (TableLineStyle st); void sort (unsigned by_column); // columns start with 0... void allowAbbrev(unsigned column); void margin(unsigned margin); @@ -106,19 +106,20 @@ private: bool _has_header; TableHeader _header; container _rows; + //! maximum column index seen in this table unsigned _max_col; //! maximum width of respective columns mutable vector<unsigned> _max_width; //! table width (columns) int _width; - //! table drawing style - TableStyle _style; - //! console screen width as retrieved by readline + //! table line drawing style + TableLineStyle _style; + //! amount of space we have to print this table int _screen_width; - //! whether to abbreviate the column if needed + //! whether to abbreviate the respective column if needed vector<bool> _abbrev_col; - + //! left/right margin in number of spaces unsigned _margin; }; diff --git a/src/Zypper.cc b/src/Zypper.cc index 17fc943..bd1476c 100644 --- a/src/Zypper.cc +++ b/src/Zypper.cc @@ -417,7 +417,7 @@ void Zypper::processGlobalOptions() unsigned s; str::strtonum (it->second.front(), s); if (s < _End) - Table::defaultStyle = (TableStyle) s; + Table::defaultStyle = (TableLineStyle) s; else out().error(str::form(_("Invalid table style %d."), s), str::form(_("Use an integer number from %d to %d"), 0, 8)); @@ -3311,7 +3311,7 @@ void Zypper::doCommand() resolve(*this); Table t; - t.style(Ascii); + t.lineStyle(Ascii); try { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Allow Table to be lineless and have margin.
by Ján Kupec 31 Mar '09

31 Mar '09

ref: refs/heads/master commit fc5ba40dd8915c8cf1e92add6e716caadced96f1 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Mar 31 18:57:42 2009 +0200 Allow Table to be lineless and have margin. --- src/Table.cc | 34 ++++++++++++++++++++++++---------- src/Table.h | 10 +++++++--- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/Table.cc b/src/Table.cc index 921a0c6..cbf700e 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -1,7 +1,6 @@ #include <iostream> #include <cstring> #include <cstdlib> -#include <readline/readline.h> #include "zypp/base/Logger.h" @@ -55,8 +54,8 @@ void TableRow::dumbDumpTo (ostream &stream) const { } void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, - TableStyle st) const { - const char * vline = lines[st][0]; + TableStyle st, unsigned margin) const { + const char * vline = st != none ? lines[st][0] : ""; unsigned int ssize = 0; // string size in columns bool seen_first = false; @@ -65,6 +64,7 @@ void TableRow::dumpTo (ostream &stream, const vector<unsigned>& widths, e = _columns.end (); stream.setf (ios::left, ios::adjustfield); + stream << string(margin, ' '); for (unsigned c = 0; i != e ; ++i, ++c) { if (seen_first) { stream.width (0); @@ -95,7 +95,8 @@ Table::Table() : _max_col (0), _width(0), _style (defaultStyle), - _screen_width(get_screen_width()) + _screen_width(get_screen_width()), + _margin(0) {} void Table::add (const TableRow& tr) { @@ -118,7 +119,11 @@ void Table::allowAbbrev(unsigned column) { } void Table::updateColWidths (const TableRow& tr) { - _width = -3; + // how much columns spearators add to the width of the table + int sepwidth = _style == none ? 2 : 3; + // initialize the width to -sepwidth (the first column does not have a line + // on the left) + _width = -sepwidth; TableRow::container::const_iterator i = tr._columns.begin (), @@ -135,17 +140,19 @@ void Table::updateColWidths (const TableRow& tr) { if (max < cur) max = cur; - _width += max + 3; + _width += max + sepwidth; } + _width += _margin * 2; } void Table::dumpRule (ostream &stream) const { - const char * hline = lines[_style][1]; - const char * cross = lines[_style][2]; + const char * hline = _style != none ? lines[_style][1] : " "; + const char * cross = _style != none ? lines[_style][2] : " "; bool seen_first = false; stream.width (0); + stream << string(_margin, ' '); for (unsigned c = 0; c <= _max_col; ++c) { if (seen_first) { stream << hline << cross << hline; @@ -173,7 +180,7 @@ void Table::dumpTo (ostream &stream) const { } if (_has_header) { - _header.dumpTo (stream, _max_width, _style); + _header.dumpTo (stream, _max_width, _style, _margin ); dumpRule (stream); } @@ -182,7 +189,7 @@ void Table::dumpTo (ostream &stream) const { e = _rows.end (), i; for (i = b; i != e; ++i) { - i->dumpTo (stream, _max_width, _style); + i->dumpTo (stream, _max_width, _style, _margin); } } @@ -191,6 +198,13 @@ void Table::style (TableStyle st) { _style = st; } +void Table::margin(unsigned margin) { + if (margin < (unsigned) (_screen_width/2)) + _margin = margin; + else + ERR << "margin of " << margin << " is greater than half of the screen" << endl; +} + void Table::sort (unsigned by_column) { if (by_column > _max_col) { ERR << "by_column >= _max_col (" << by_column << ">=" << _max_col << ")" << endl; diff --git a/src/Table.h b/src/Table.h index fb46a8b..6ef45df 100644 --- a/src/Table.h +++ b/src/Table.h @@ -21,7 +21,7 @@ using std::vector; //! table drawing style enum TableStyle { - Ascii, ///< | - + + Ascii = 0, ///< | - + Light, Heavy, Double, @@ -31,7 +31,8 @@ enum TableStyle { LightDouble, HeavyLight, DoubleLight, - _End, ///< sentinel + none, + _End, ///< sentinel }; class TableRow { @@ -50,7 +51,7 @@ public: void dumbDumpTo (ostream &stream) const; //! output with field widths void dumpTo (ostream &stream, const vector<unsigned>& widths, - TableStyle st) const; + TableStyle st, unsigned margin) const; typedef vector<string> container; @@ -94,6 +95,7 @@ public: void style (TableStyle st); void sort (unsigned by_column); // columns start with 0... void allowAbbrev(unsigned column); + void margin(unsigned margin); Table (); @@ -116,6 +118,8 @@ private: int _screen_width; //! whether to abbreviate the column if needed vector<bool> _abbrev_col; + + unsigned _margin; }; inline -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes
by Michael Andres 31 Mar '09

31 Mar '09

ref: refs/heads/master commit 14411943887dd0fc138fddee58ee515789407e0a Author: Michael Andres <ma(a)suse.de> Date: Tue Mar 31 15:53:26 2009 +0200 changes --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index d25e653..9e08ac1 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "2") -SET(LIBZYPP_MINOR "3") +SET(LIBZYPP_MINOR "4") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.3.0 (2) +# LAST RELEASED: 6.4.0 (2) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index cb7ffbb..5e95390 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 31 15:51:32 CEST 2009 - ma(a)suse.de + +- New zypp.conf option 'download.media_preference': Hint which media + to prefer when installing packages (download vs. CD). +- version 6.4.0 (2) + ------------------------------------------------------------------ Thu Mar 12 18:38:30 CET 2009 - ma(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Use repositories subpriority to tell the solver about media preferences.
by Michael Andres 31 Mar '09

31 Mar '09

ref: refs/heads/master commit bffaf00f8d31d068ee39909d8ca12fd240faebad Author: Michael Andres <ma(a)suse.de> Date: Tue Mar 31 15:48:39 2009 +0200 Use repositories subpriority to tell the solver about media preferences. --- zypp/Repository.cc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zypp/Repository.cc b/zypp/Repository.cc index 7e880af..31decf0 100644 --- a/zypp/Repository.cc +++ b/zypp/Repository.cc @@ -17,6 +17,7 @@ #include "zypp/AutoDispose.h" #include "zypp/Pathname.h" +#include "zypp/media/MediaPriority.h" #include "zypp/sat/detail/PoolImpl.h" #include "zypp/Repository.h" @@ -199,8 +200,10 @@ namespace zypp // satsolver priority is based on '<', while yum's repoinfo // uses 1(highest)->99(lowest). Thus we use -info_r.priority. _repo->priority = -info_r.priority(); - // subpriority could be used to e.g. prefer http over dvd iff both have same priority. - // _repo->subpriority = 0; + + // subpriority is used to e.g. prefer http over dvd iff + // both have same priority. + _repo->subpriority = media::MediaPriority( info_r.url() ); } void Repository::clearInfo() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : New class MediaPriority: Derive a numeric priority from Url scheme according to zypp.conf(download.media_preference).
by Michael Andres 31 Mar '09

31 Mar '09

ref: refs/heads/master commit 8f174adf4599ebd4066e92650c9baa8cb9a74438 Author: Michael Andres <ma(a)suse.de> Date: Tue Mar 31 15:47:34 2009 +0200 New class MediaPriority: Derive a numeric priority from Url scheme according to zypp.conf(download.media_preference). --- zypp/CMakeLists.txt | 2 + zypp/media/MediaPriority.cc | 102 +++++++++++++++++++++++++++++++++++++++++++ zypp/media/MediaPriority.h | 101 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 205 insertions(+), 0 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 7a7f27f..145e5bc 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -271,6 +271,7 @@ SET( zypp_media_SRCS media/CredentialManager.cc media/CurlConfig.cc media/TransferSettings.cc + media/MediaPriority.cc ) SET( zypp_media_HEADERS @@ -295,6 +296,7 @@ SET( zypp_media_HEADERS media/CredentialManager.h media/CurlConfig.h media/TransferSettings.h + media/MediaPriority.h ) INSTALL( FILES diff --git a/zypp/media/MediaPriority.cc b/zypp/media/MediaPriority.cc new file mode 100644 index 0000000..5731ad4 --- /dev/null +++ b/zypp/media/MediaPriority.cc @@ -0,0 +1,102 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/media/MediaPriority.cc + * +*/ +#include <iostream> +#include "zypp/base/LogTools.h" + +#include "zypp/Url.h" +#include "zypp/ZConfig.h" + +#include "zypp/media/MediaPriority.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace media + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + /** + * 4: local: file,dir,hd + * 3: remote: nfs,cifs,smb + * ?: download: http,https,ftp,sftp + * ?: volatile: cd,dvd + * 0: the rest + */ + MediaPriority::value_type scheme2priority( const std::string & scheme_r ) + { + switch ( scheme_r[0] ) + { +#define RETURN_IF(scheme,value) \ + if ( ::strcmp( scheme+1, scheme_r.c_str()+1 ) == 0 ) return value; + case 'c': + RETURN_IF( "cd", ZConfig::instance().download_media_prefer_download() ? 1 : 2 ); + RETURN_IF( "cifs", 3 ); + break; + + case 'd': + RETURN_IF( "dvd", ZConfig::instance().download_media_prefer_download() ? 1 : 2 ); + RETURN_IF( "dir", 4 ); + break; + + case 'f': + RETURN_IF( "file", 4 ); + RETURN_IF( "ftp", ZConfig::instance().download_media_prefer_download() ? 2 : 1); + break; + + case 'h': + RETURN_IF( "http", ZConfig::instance().download_media_prefer_download() ? 2 : 1 ); + RETURN_IF( "https", ZConfig::instance().download_media_prefer_download() ? 2 : 1 ); + RETURN_IF( "hd", 4 ); + break; + + case 'n': + RETURN_IF( "nfs", 3 ); + break; + + case 's': + RETURN_IF( "sftp", ZConfig::instance().download_media_prefer_download() ? 2 : 1 ); + RETURN_IF( "smb", 3 ); + break; +#undef RETURN_IF + } + return 0; + } + + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : MediaPriority::MediaPriority + // METHOD TYPE : Ctor + // + MediaPriority::MediaPriority( const std::string & scheme_r ) + : _val( scheme2priority( scheme_r ) ) + {} + + MediaPriority::MediaPriority( const Url & url_r ) + : _val( scheme2priority( url_r.getScheme() ) ) + {} + + ///////////////////////////////////////////////////////////////// + } // namespace media + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// diff --git a/zypp/media/MediaPriority.h b/zypp/media/MediaPriority.h new file mode 100644 index 0000000..aef3199 --- /dev/null +++ b/zypp/media/MediaPriority.h @@ -0,0 +1,101 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/media/MediaPriority.h + * +*/ +#ifndef ZYPP_MEDIA_MEDIAPRIORITY_H +#define ZYPP_MEDIA_MEDIAPRIORITY_H + +#include <string> + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + class Url; + + /////////////////////////////////////////////////////////////////// + namespace media + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : MediaPriority + // + /** Derive a numeric priority from \ref Url scheme according to zypp.conf(download.media_preference). + * + * The class is simple. Constructable and assignable from \ref Url + * or scheme string. Implicit convertible into a numic \ref value_type. + * + * \code + * if ( MediaPriority("cd") \< MediaPriority("ftp") ) + * ... + * \endcode + * + * \todo Maybe introduce a static tribool, to allow overwriting zypp.conf(download.media_preference) default. + */ + class MediaPriority + { + public: + typedef int value_type; + + public: + /** Default ctor. Least priority \c 0.*/ + MediaPriority() + : _val( 0 ) + {} + + /** Copy ctor. */ + MediaPriority( value_type val_r ) + : _val( val_r ) + {} + + /** Ctor from scheme string.*/ + MediaPriority( const std::string & scheme_r ); + + /** Ctor from scheme string defined by Url. */ + MediaPriority( const Url & url_r ); + + public: + /** Assign. */ + MediaPriority & operator=( value_type rhs ) + { _val = rhs; return *this; } + + /** Assign priority of scheme string. */ + MediaPriority & operator=( const std::string & scheme_r ) + { _val = MediaPriority(scheme_r); return *this; } + + /** Assign priority of scheme string defined by Url. */ + MediaPriority & operator=( const Url & url_r ) + { _val = MediaPriority(url_r); return *this; } + + public: + /** Conversion to value_type. */ + //@{ + /** Explicit */ + value_type & get() { return _val; } + /** Explicit */ + const value_type & get() const { return _val; } + /** Implicit */ + operator value_type &() { return get(); } + /** Implicit */ + operator const value_type &() const { return get(); } + //@} + + private: + value_type _val; + }; + + ///////////////////////////////////////////////////////////////// + } // namespace media + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_MEDIA_MEDIAPRIORITY_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Add zypp.conf(download.media_preference): Hint which media to prefer when installing packages (download vs. CD).
by Michael Andres 31 Mar '09

31 Mar '09

ref: refs/heads/master commit 680feb2ad8a02e6b5f69bef1c3dcf0d5a1892292 Author: Michael Andres <ma(a)suse.de> Date: Tue Mar 31 15:47:02 2009 +0200 Add zypp.conf(download.media_preference): Hint which media to prefer when installing packages (download vs. CD). --- zypp.conf | 26 +++++++++++++++++++++++ zypp/ZConfig.cc | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- zypp/ZConfig.h | 17 +++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/zypp.conf b/zypp.conf index 99f84af..93071ba 100644 --- a/zypp.conf +++ b/zypp.conf @@ -171,6 +171,32 @@ # download.use_deltarpm.always = false ## +## Hint which media to prefer when installing packages (download vs. CD). +## +## Valid values: download, volatile +## Default value: download +## +## Note that this just a hint. First of all the solver will choose the 'best' +## package according to its repos proiority, version and architecture. But if +## there is a choice, we will prefer packages from the desired media. +## +## Packages available loacaly are always prefered. The question is whether +## you prefer packages being downloaded via FTP/HTTP/HTTPS (download), rather +## than being prompted to insert a CD/DVD (volatile), in case they are available +## on both media. +## +## Name | Priority | URI +## openSUSE-11.1 99 dvd:/// +## openSUSE-11.1-Oss 99 http://download.opensuse.org/distribution/11.1/repo/oss +## +## In the above example 2 repositories with similar content are used. Rather +## than raising the priority of one of them to 'prefer' a certain media, you +## should use the same priority for both and set download.media_preference +## instead. +## +## download.media_preference = download + +## ## Defining directory which contains vendor description files. ## ## One file in this directory reflects a group of equivalent vendors. e.G.: diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc index 50b5551..be1c3d4 100644 --- a/zypp/ZConfig.cc +++ b/zypp/ZConfig.cc @@ -134,6 +134,49 @@ namespace zypp } // namespace zypp /////////////////////////////////////////////////////////////////// + /** Mutable option with initial value. */ + template<class _Tp, _Tp _Initial> + struct Option + { + typedef _Tp value_type; + + Option() + : _val( _Initial ) + {} + + value_type get() const + { return _val; } + + void set( const value_type & newval_r ) + { _val = newval_r; } + + private: + value_type _val; + }; + + /** Mutable option with initial value also remembering a config value. */ + template<class _Tp, _Tp _Initial> + struct DefaultOption : public Option<_Tp,_Initial> + { + typedef _Tp value_type; + typedef Option<_Tp,_Initial> option_type; + + void restoreDefault() + { this->set( _default.get() ); } + + void restoreDefault( const value_type & newval_r ) + { setDefault( newval_r ); restoreDefault(); } + + value_type getDefault() const + { return _default.get(); } + + void setDefault( const value_type & newval_r ) + { _default.set( newval_r ); } + + private: + option_type _default; + }; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : ZConfig::Impl @@ -248,6 +291,10 @@ namespace zypp { download_use_deltarpm_always = str::strToBool( value, download_use_deltarpm_always ); } + else if ( entry == "download.media_preference" ) + { + download_media_prefer_download.restoreDefault( str::compareCI( value, "volatile" ) != 0 ); + } else if ( entry == "download.max_concurrent_connections" ) { str::strtonum(value, download_max_concurrent_connections); @@ -380,6 +427,7 @@ namespace zypp bool download_use_deltarpm; bool download_use_deltarpm_always; + DefaultOption<bool,true> download_media_prefer_download; int download_max_concurrent_connections; int download_min_download_speed; @@ -569,12 +617,21 @@ namespace zypp bool ZConfig::download_use_deltarpm_always() const { return download_use_deltarpm() && _pimpl->download_use_deltarpm_always; } + bool ZConfig::download_media_prefer_download() const + { return _pimpl->download_media_prefer_download.get(); } + + void ZConfig::set_download_media_prefer_download( bool yesno_r ) + { _pimpl->download_media_prefer_download.set( yesno_r ); } + + void ZConfig::set_default_download_media_prefer_download() + { _pimpl->download_media_prefer_download.restoreDefault(); } + long ZConfig::download_max_concurrent_connections() const { return _pimpl->download_max_concurrent_connections; } - + long ZConfig::download_min_download_speed() const { return _pimpl->download_min_download_speed; } - + long ZConfig::download_max_download_speed() const { return _pimpl->download_max_download_speed; } diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h index 9b73393..42f602e 100644 --- a/zypp/ZConfig.h +++ b/zypp/ZConfig.h @@ -188,6 +188,23 @@ namespace zypp bool download_use_deltarpm_always() const; /** + * Hint which media to prefer when installing packages (download vs. CD). + * \see class \ref media::MediaPriority + */ + bool download_media_prefer_download() const; + /** \overload */ + bool download_media_prefer_volatile() const + { return ! download_media_prefer_download(); } + /** + * Set \ref download_media_prefer_download to a specific value. + */ + void set_download_media_prefer_download( bool yesno_r ); + /** + * Set \ref download_media_prefer_download to the configfiles default. + */ + void set_default_download_media_prefer_download(); + + /** * Directory for equivalent vendor definitions (configPath()/vendors.d) * \ingroup g_ZC_CONFIGFILES */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0