| -rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 67f90a3..93daaba 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -55,211 +55,211 @@ DataManager::DataManager() destList.setAutoDelete( TRUE ); } DataManager::~DataManager() { } Server *DataManager :: getServer( const char *name ) { QListIterator<Server> it( serverList ); while ( it.current() && it.current()->getServerName() != name ) { ++it; } return it.current(); } Destination *DataManager :: getDestination( const char *name ) { QListIterator<Destination> it( destList ); while ( it.current() && it.current()->getDestinationName() != name ) { ++it; } return it.current(); } void DataManager :: loadServers() { // First add our local server - not really a server but // the local config (which packages are installed) serverList.append( new Server( LOCAL_SERVER, "" ) ); serverList.append( new Server( LOCAL_IPKGS, "" ) ); #ifdef QWS Config cfg( "aqpkg" ); cfg.setGroup( "destinations" ); #endif // Read file from /etc/ipkg.conf QString ipkg_conf = IPKG_CONF; FILE *fp; fp = fopen( ipkg_conf, "r" ); char line[130]; QString lineStr; if ( fp == NULL ) { return; } else { while ( fgets( line, sizeof line, fp) != NULL ) { 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 = new Server( alias, url ); if ( lineStr.startsWith( "src" ) ) s->setActive( true ); else s->setActive( false ); serverList.append( s ); } else if ( lineStr.startsWith( "dest" ) ) { char alias[20]; char path[50]; sscanf( lineStr, "%*[^ ] %s %s", alias, path ); Destination *d = new Destination( alias, path ); bool linkToRoot = true; #ifdef QWS QString key = alias; key += "_linkToRoot"; linkToRoot = cfg.readBoolEntry( key, true ); #endif d->linkToRoot( linkToRoot ); destList.append( d ); } else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) ) { char type[20]; char val[100]; sscanf( lineStr, "%*[^ ] %s %s", type, val ); - if ( stricmp( type, "http_proxy" ) == 0 ) + if ( qstricmp( type, "http_proxy" ) == 0 ) { httpProxy = val; if ( lineStr.startsWith( "#" ) ) httpProxyEnabled = false; else httpProxyEnabled = true; } - if ( stricmp( type, "ftp_proxy" ) == 0 ) + if ( qstricmp( type, "ftp_proxy" ) == 0 ) { ftpProxy = val; if ( lineStr.startsWith( "#" ) ) ftpProxyEnabled = false; else ftpProxyEnabled = true; } - if ( stricmp( type, "proxy_username" ) == 0 ) + if ( qstricmp( type, "proxy_username" ) == 0 ) proxyUsername = val; - if ( stricmp( type, "proxy_password" ) == 0 ) + if ( qstricmp( type, "proxy_password" ) == 0 ) proxyPassword = val; } } } fclose( fp ); reloadServerData( ); } void DataManager :: reloadServerData( ) { emit progressSetSteps( serverList.count() ); emit progressSetMessage( tr( "Reading configuration..." ) ); QString serverName; int i = 0; Server *server; QListIterator<Server> it( serverList ); for ( ; it.current(); ++it ) { server = it.current(); serverName = server->getServerName(); i++; emit progressUpdate( i ); qApp->processEvents(); // Now we've read the config file in we need to read the servers // The local server is a special case. This holds the contents of the // status files the number of which depends on how many destinations // we've set up // The other servers files hold the contents of the server package list if ( serverName == LOCAL_SERVER ) server->readStatusFile( destList ); else if ( serverName == LOCAL_IPKGS ) server->readLocalIpks( getServer( LOCAL_SERVER ) ); else server->readPackageFile( getServer( LOCAL_SERVER ) ); } } void DataManager :: writeOutIpkgConf() { QFile f( IPKG_CONF ); if ( !f.open( IO_WriteOnly ) ) { return; } QTextStream t( &f ); /* QString ipkg_conf = IPKG_CONF; ofstream out( ipkg_conf ); */ t << "# Written by AQPkg\n"; t << "# Must have one or more source entries of the form:\n"; t << "#\n"; t << "# src <src-name> <source-url>\n"; t << "#\n"; t << "# and one or more destination entries of the form:\n"; t << "#\n"; t << "# dest <dest-name> <target-path>\n"; t << "#\n"; t << "# where <src-name> and <dest-names> are identifiers that\n"; t << "# should match [a-zA-Z0-9._-]+, <source-url> should be a\n"; t << "# URL that points to a directory containing a Familiar\n"; t << "# Packages file, and <target-path> should be a directory\n"; t << "# that exists on the target system.\n\n"; // Write out servers Server *server; QListIterator<Server> it( serverList ); while ( it.current() ) { server = it.current(); QString alias = server->getServerName(); // Don't write out local as its a dummy if ( alias != LOCAL_SERVER && alias != LOCAL_IPKGS ) { QString url = server->getServerUrl();; if ( !server->isServerActive() ) t << "#"; t << "src " << alias << " " << url << endl; } ++it; } t << endl; // Write out destinations QListIterator<Destination> it2( destList ); while ( it2.current() ) { t << "dest " << it2.current()->getDestinationName() << " " << it2.current()->getDestinationPath() << endl; |