Author: jkupec Date: Mon Feb 25 14:18:10 2008 New Revision: 8900 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8900&view=rev Log: - <download> for xmlout implemented Modified: 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/output/xmlout.rnc Modified: trunk/zypper/src/output/Out.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/Out.h (original) +++ trunk/zypper/src/output/Out.h Mon Feb 25 14:18:10 2008 @@ -97,7 +97,8 @@ // virtual void table() // virtual void text() - // progress + /** \name Progress */ + //@{ virtual void progressStart(const std::string & id, const std::string & label, bool is_tick = false) = 0; @@ -107,13 +108,32 @@ virtual void progressEnd(const std::string & id, const std::string & label, bool error = false) = 0; // might be a string with error message instead + //@} - // progress with download rate + /** \name Download progress with download rate */ + //@{ + /** + * \param uri Uri of the file to download. + */ virtual void dwnldProgressStart(const zypp::Url & uri) = 0; + + /** + * \param uri Uri of the file being downloaded. + * \param value Value of the progress in percents. -1 if unknown. + * \param rate Download rate. -1 if unknown. + */ virtual void dwnldProgress(const zypp::Url & uri, int value = -1, int rate = -1) = 0; - virtual void dwnldProgressEnd(const zypp::Url & uri, bool error = false) = 0; + /** + * \param uri Uri of the file to download. + * \param rate Final download rate. -1 if unknown. + * \param error Error flag - did the download finish with error? + */ + virtual void dwnldProgressEnd(const zypp::Url & uri, + int rate = -1, + bool error = false) = 0; + //@} virtual void prompt(PromptId id, const std::string & prompt, Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Mon Feb 25 14:18:10 2008 @@ -167,7 +167,7 @@ cout << std::flush; } -void OutNormal::dwnldProgressEnd(const zypp::Url & uri, bool error) +void OutNormal::dwnldProgressEnd(const zypp::Url & uri, int rate, bool error) { if (verbosity() < NORMAL) return; Modified: trunk/zypper/src/output/OutNormal.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.h?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.h (original) +++ trunk/zypper/src/output/OutNormal.h Mon Feb 25 14:18:10 2008 @@ -49,7 +49,9 @@ virtual void dwnldProgress(const zypp::Url & uri, int value = -1, int rate = -1); - virtual void dwnldProgressEnd(const zypp::Url & uri, bool error); + virtual void dwnldProgressEnd(const zypp::Url & uri, + int rate = -1, + bool error = false); virtual void prompt(PromptId id, const std::string & prompt, Modified: trunk/zypper/src/output/OutXML.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.cc (original) +++ trunk/zypper/src/output/OutXML.cc Mon Feb 25 14:18:10 2008 @@ -109,7 +109,7 @@ void OutXML::writeProgressTag(const string & id, const string & label, int value, bool done, bool error) { - cout << "" - << endl; + cout << "" << endl; } void OutXML::dwnldProgress(const zypp::Url & uri, int value, int rate) { - cout << "" << endl; + cout << "" << endl; } -void OutXML::dwnldProgressEnd(const zypp::Url & uri, bool error) -{ - cout << "" << endl; +void OutXML::dwnldProgressEnd(const zypp::Url & uri, int rate, bool error) +{ + cout << "" << endl; } void OutXML::prompt(PromptId id, Modified: trunk/zypper/src/output/OutXML.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.h?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.h (original) +++ trunk/zypper/src/output/OutXML.h Mon Feb 25 14:18:10 2008 @@ -33,7 +33,9 @@ virtual void dwnldProgress(const zypp::Url & uri, int value = -1, int rate = -1); - virtual void dwnldProgressEnd(const zypp::Url & uri, bool error); + virtual void dwnldProgressEnd(const zypp::Url & uri, + int rate = -1, + bool error = false); virtual void prompt(PromptId id, const std::string & prompt, Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev=8900&r1=8899&r2=8900&view=diff ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Mon Feb 25 14:18:10 2008 @@ -44,18 +44,16 @@ download-progress-element = element download { - attribute id { xsd:string }, - attribute label { xsd:string }, + attribute url { xsd:string }, attribute percent { xsd:integer }, attribute rate { xsd:integer } # download rate in bytes per second -# attribute done { xsd:boolean }, } download-progress-done = element download { - attribute id { xsd:string }, - attribute label { xsd:string }, - attribute done { xsd:boolean }, + attribute url { xsd:string }, + attribute rate { xsd:integer }, # download rate in bytes per second + attribute done { xsd:boolean }, # 0 on success, 1 on error } message-element = -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org