| -rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 51 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 4 |
2 files changed, 51 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 1420242..e7fb75a 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -99,23 +99,22 @@ void DataManager :: loadServers() lineStr = line; if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) ) { char alias[20]; char url[100]; - // Looks a little wierd but read up to the r of src (throwing it away), // then read up to the next space and throw that away, the alias // is next. // Should Handle #src, # src, src, and combinations of sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url ); Server s( alias, url ); if ( lineStr.startsWith( "src" ) ) - s.setActive( true ); + s.setActive( true ); else - s.setActive( false ); + s.setActive( false ); serverList.push_back( s ); } else if ( lineStr.startsWith( "dest" ) ) { @@ -130,16 +129,35 @@ void DataManager :: loadServers() linkToRoot = cfg.readBoolEntry( key, true ); #endif d.linkToRoot( linkToRoot ); destList.push_back( d ); } + else if ( lineStr.startsWith( "option" ) ) + { + char type[20]; + char val[100]; + sscanf( lineStr, "%*[^ ] %s %s", type, val ); + if ( stricmp( type, "http_proxy" ) == 0 ) + httpProxy = val; + if ( stricmp( type, "ftp_proxy" ) == 0 ) + ftpProxy = val; + if ( stricmp( type, "proxy_username" ) == 0 ) + proxyUsername = val; + if ( stricmp( type, "proxy_password" ) == 0 ) + proxyPassword = val; + } } } fclose( fp ); + cout << "httpProxy = " << httpProxy << endl; + cout << "ftpProxy = " << ftpProxy << endl; + cout << "proxyUsername = " << proxyUsername << endl; + cout << "proxyPassword = " << proxyPassword << endl; + reloadServerData( ); } void DataManager :: reloadServerData( ) { vector<Server>::iterator it = serverList.begin(); @@ -175,13 +193,13 @@ void DataManager :: writeOutIpkgConf() out << "#" << endl; out << "# where <src-name> and <dest-names> are identifiers that" << endl; out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl; out << "# URL that points to a directory containing a Familiar" << endl; out << "# Packages file, and <target-path> should be a directory" << endl; out << "# that exists on the target system." << endl << endl; - + // Write out servers vector<Server>::iterator it = serverList.begin(); while ( it != serverList.end() ) { QString alias = it->getServerName(); // Don't write out local as its a dummy @@ -204,12 +222,37 @@ void DataManager :: writeOutIpkgConf() while ( it2 != destList.end() ) { out << "dest " << it2->getDestinationName() << " " << it2->getDestinationPath() << endl; it2++; } + out << "# Proxy Support" << endl; + out << "#" << endl; + + if ( httpProxy == "" ) + out << "#option http_proxy http://proxy.tld:3128" << endl; + else + out << "option http_proxy " << httpProxy << endl; + + if ( ftpProxy == "" ) + out << "#option ftp_proxy http://proxy.tld:3128" << endl; + else + out << "option ftp_proxy " << ftpProxy << endl; + if ( proxyUsername == "" ) + out << "#option proxy_username <username>" << endl; + else + out << "option proxy_username " << proxyUsername << endl; + if ( proxyPassword == "" ) + out << "#option proxy_password <password>" << endl << endl; + else + out << "option proxy_password " << proxyPassword << endl<< endl; + + out << "# Offline mode (for use in constructing flash images offline)" << endl; + out << "#option offline_root target" << endl; + + out.close(); } void DataManager :: setAvailableCategories( QString section ) { diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h index 3a64d92..14b0b2f 100644 --- a/noncore/settings/aqpkg/datamgr.h +++ b/noncore/settings/aqpkg/datamgr.h @@ -58,12 +58,16 @@ public: static QString getAvailableCategories() { return availableCategories; } static void setAvailableCategories( QString section ); private: static QString availableCategories; QString activeServer; + QString httpProxy; + QString ftpProxy; + QString proxyUsername; + QString proxyPassword; vector<Server> serverList; vector<Destination> destList; }; #endif |