ref: refs/heads/master
commit c31829af1abb6c17b8b493ef5cc340e8ab28c577
Author: Duncan Mac-Vicar P
Date: Tue Feb 17 19:05:26 2009 +0100
start refactoring command line calling into a separate entity so we
could mix curl and aria usage
---
zypp/CMakeLists.txt | 2 +
zypp/media/TransferProgram.cc | 206 +++++++++++++++++++++++++++++++++++++++++
zypp/media/TransferProgram.h | 135 +++++++++++++++++++++++++++
3 files changed, 343 insertions(+), 0 deletions(-)
diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index d6c5239..6eb2f37 100644
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -270,6 +270,7 @@ SET( zypp_media_SRCS
media/CredentialFileReader.cc
media/CredentialManager.cc
media/CurlConfig.cc
+ media/TransferProgram.cc
)
SET( zypp_media_HEADERS
@@ -293,6 +294,7 @@ SET( zypp_media_HEADERS
media/CredentialFileReader.h
media/CredentialManager.h
media/CurlConfig.h
+ media/TransferProgram.h
)
INSTALL( FILES
diff --git a/zypp/media/TransferProgram.cc b/zypp/media/TransferProgram.cc
new file mode 100644
index 0000000..2542fed
--- /dev/null
+++ b/zypp/media/TransferProgram.cc
@@ -0,0 +1,206 @@
+#include <iostream>
+#include <vector>
+#include <sstream>
+
+#include "zypp/base/String.h"
+#include "zypp/base/Logger.h"
+#include "zypp/base/WatchFile.h"
+#include "zypp/base/ReferenceCounted.h"
+#include "zypp/base/NonCopyable.h"
+#include "zypp/ExternalProgram.h"
+#include "zypp/media/TransferProgram.h"
+
+using namespace std;
+
+#define ARIA2C_BINARY "/usr/bin/aria2c"
+#define CURL_BINARY "/usr/bin/curl"
+
+namespace zypp
+{
+namespace media
+{
+
+class TransferProgram::Impl
+{
+public:
+ Impl()
+ : _useproxy(false)
+ , _timeout(0)
+ {}
+
+ virtual ~Impl()
+ {}
+
+ virtual void execute()
+ {
+ ERR << "not implemented." << endl;
+ ZYPP_THROW(Exception("not implemented"));
+ }
+
+ /** Offer default Impl. */
+ static shared_ptr<Impl> nullimpl()
+ {
+ static shared_ptr<Impl> _nullimpl( new Impl );
+ return _nullimpl;
+ }
+
+private:
+ friend Impl * rwcowClone<Impl>( const Impl * rhs );
+ /** clone for RWCOW_pointer */
+ Impl * clone() const
+ { return new Impl( *this ); }
+
+public:
+ vector<string> _headers;
+ string _useragent;
+ string _username;
+ string _password;
+ bool _useproxy;
+ string _proxy_username;
+ string _proxy_password;
+ int _timeout;
+ Url _url;
+
+ TransferProgram::OutputLines _output;
+ ErrorFlags _errorFlags;
+ int _exitCode;
+};
+
+class Aria2cProgram : public TransferProgram::Impl
+{
+public:
+ virtual void execute()
+ {
+ ExternalProgram::Arguments args;
+
+ args.push_back(ARIA2C_BINARY);
+ args.push_back(str::form("--user-agent=%s", _useragent.c_str()));
+ args.push_back("--summary-interval=1");
+ args.push_back("--follow-metalink=mem");
+ args.push_back("--check-integrity=true");
+
+ // add the anonymous id.
+ for ( vector<string>::const_iterator it = _headers.begin();
+ it != _headers.end();
+ ++it )
+ args.push_back(str::form("--header=%s", it->c_str() ));
+
+ args.push_back( str::form("--connect-timeout=%d", _timeout));
+
+ ExternalProgram prog(args,ExternalProgram::Discard_Stderr, false, -1, true);
+ string line;
+ int count;
+ for(line = prog.receiveLine(), count=0;
+ !line.empty();
+ line = prog.receiveLine(), count++ )
+ {
+ // save the line
+ _output.push_back(line);
+
+ // trim trailing NL.
+ if ( line.empty() )
+ continue;
+ // make sure no \n is at the end
+ line = str::rtrim(line);
+
+ // process lines
+ }
+ _exitCode = prog.close();
+
+ // clear previous argument
+ args.clear();
+ }
+};
+
+class CurlProgram : public TransferProgram::Impl
+{
+public:
+ virtual void execute()
+ {
+ }
+};
+
+
+TransferProgram::TransferProgram()
+ : _impl()
+{
+
+}
+
+TransferProgram::OutputLines::const_iterator TransferProgram::outputLinesBegin() const
+{
+ return _impl->_output.begin();
+}
+
+TransferProgram::OutputLines::const_iterator TransferProgram::outputLinesEnd() const
+{
+ return _impl->_output.end();
+}
+
+string TransferProgram::output() const
+{
+ stringstream str;
+ OutputLines::const_iterator it;
+ for ( it = outputLinesBegin();
+ it != outputLinesEnd();
+ ++it )
+ {
+ str << *it;
+ }
+ return str.str();
+}
+
+void TransferProgram::execute()
+{
+ _impl->execute();
+}
+
+void TransferProgram::addHeader( const std::string &header )
+{
+ _impl->_headers.push_back(header);
+}
+
+void TransferProgram::setUserAgentString( const std::string &agent )
+{
+ _impl->_useragent = agent;
+}
+
+void TransferProgram::setUsername( const std::string &username )
+{
+ _impl->_username = username;
+}
+
+void TransferProgram::setPassword( const std::string &password )
+{
+ _impl->_password = password;
+}
+
+void TransferProgram::setProxyEnabled( bool enabled )
+{
+ _impl->_useproxy = enabled;
+}
+
+void TransferProgram::setProxyUsername( const std::string &proxyuser )
+{
+ _impl->_proxy_username = proxyuser;
+}
+
+void TransferProgram::setProxyPassword( const std::string &proxypass )
+{
+ _impl->_proxy_password = proxypass;
+}
+
+void TransferProgram::setTimeout( int t )
+{
+ _impl->_timeout = t;
+}
+
+void TransferProgram::setUrl( const zypp::Url &url)
+{
+ _impl->_url = url;
+}
+
+
+} // ns media
+} // ns zypp
+
diff --git a/zypp/media/TransferProgram.h b/zypp/media/TransferProgram.h
new file mode 100644
index 0000000..4441c62
--- /dev/null
+++ b/zypp/media/TransferProgram.h
@@ -0,0 +1,135 @@
+
+#ifndef TRANSFER_PROGRAM_H_
+#define TRANSFER_PROGRAM_H_
+
+#include <functional>
+#include <list>
+#include <string>
+#include <vector>
+#include "zypp/base/Flags.h"
+#include "zypp/base/PtrTypes.h"
+#include "zypp/Pathname.h"
+#include "zypp/Url.h"
+
+namespace zypp
+{
+namespace media
+{
+
+/**
+ * Easy access to the transfer command line program
+ *
+ */
+class TransferProgram
+{
+public:
+
+ typedef std::vectorstd::string OutputLines;
+
+ /**
+ * After calling the program, one or more error flags can
+ * be set according to the result.
+ */
+ enum ErrorFlag
+ {
+ /** Operation ended successfully */
+ NO_ERROR = 0x0,
+ };
+ ZYPP_DECLARE_FLAGS(ErrorFlags,ErrorFlag);
+
+ /**
+ * Constructs a gpg cmd line access.
+ * \p home is the home directory where keyrings are created.
+ *
+ * Gpg has one pubkeyring and one secret keyring in its home.
+ *
+ */
+ TransferProgram();
+
+ /**
+ * Executes command with a given argument
+ */
+ void execute();
+
+ /**
+ * Contains the error flags from the last command execution
+ */
+ ErrorFlags errorFlags() const;
+
+ /**
+ * contains the last command execution exit code
+ */
+ int exitCode() const;
+
+ /**
+ * begin iterator over output lines available after
+ * execute
+ */
+ OutputLines::const_iterator outputLinesBegin() const;
+
+ /**
+ * end iterator over output lines available after
+ * execute
+ */
+ OutputLines::const_iterator outputLinesEnd() const;
+
+ /**
+ * returns the full output for convenience
+ */
+ std::string output() const;
+
+ /**
+ * add a header, on the form "Foo: Bar"
+ */
+ void addHeader( const std::string &header );
+
+ /**
+ * sets the user agent ie: "Mozilla v3"
+ */
+ void setUserAgentString( const std::string &agent );
+
+ /**
+ * sets the auth username
+ */
+ void setUsername( const std::string &username );
+
+ /**
+ * sets the auth password
+ */
+ void setPassword( const std::string &password );
+
+ /**
+ * whether the proxy is used or not
+ */
+ void setProxyEnabled( bool enabled );
+
+ /**
+ * sets the proxy user
+ */
+ void setProxyUsername( const std::string &proxyuser );
+
+ /**
+ * sets the proxy password
+ */
+ void setProxyPassword( const std::string &proxypass );
+
+ /**
+ * set the connection timeout
+ */
+ void setTimeout( int t );
+
+ /**
+ * set url to download
+ */
+ void setUrl( const zypp::Url &url);
+
+ class Impl;
+protected:
+ RWCOW_pointer<Impl> _impl;
+};
+ZYPP_DECLARE_OPERATORS_FOR_FLAGS(TransferProgram::ErrorFlags);
+
+} // ns media
+} // ns zypp
+
+#endif
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
