Diffstat (limited to 'noncore/settings/aqpkg/server.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index fc5ed12..04f5ab7 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
@@ -59,17 +59,19 @@ void Server :: cleanUp() | |||
59 | packageList.clear(); | 59 | packageList.clear(); |
60 | } | 60 | } |
61 | 61 | ||
62 | void Server :: readStatusFile( vector<Destination> &destList ) | 62 | void Server :: readStatusFile( QList<Destination> &destList ) |
63 | { | 63 | { |
64 | cleanUp(); | 64 | cleanUp(); |
65 | 65 | ||
66 | vector<Destination>::iterator dit; | 66 | Destination *dest; |
67 | QListIterator<Destination> dit( destList ); | ||
67 | bool rootRead = false; | 68 | bool rootRead = false; |
68 | for ( dit = destList.begin() ; dit != destList.end() ; ++dit ) | 69 | for ( ; dit.current(); ++dit ) |
69 | { | 70 | { |
71 | dest = dit.current(); | ||
70 | bool installingToRoot = false; | 72 | bool installingToRoot = false; |
71 | 73 | ||
72 | QString path = dit->getDestinationPath(); | 74 | QString path = dest->getDestinationPath(); |
73 | if ( path.right( 1 ) != "/" ) | 75 | if ( path.right( 1 ) != "/" ) |
74 | path += "/"; | 76 | path += "/"; |
75 | 77 | ||
@@ -80,7 +82,7 @@ void Server :: readStatusFile( vector<Destination> &destList ) | |||
80 | } | 82 | } |
81 | 83 | ||
82 | packageFile = path + "usr/lib/ipkg/status"; | 84 | packageFile = path + "usr/lib/ipkg/status"; |
83 | readPackageFile( 0, false, installingToRoot, &( *dit ) ); | 85 | readPackageFile( 0, false, installingToRoot, &( *dest ) ); |
84 | } | 86 | } |
85 | 87 | ||
86 | // Ensure that the root status file is read | 88 | // Ensure that the root status file is read |
@@ -115,11 +117,11 @@ void Server :: readLocalIpks( Server *local ) | |||
115 | // Changed to display the filename (excluding the path) | 117 | // Changed to display the filename (excluding the path) |
116 | QString packageName = Utils::getFilenameFromIpkFilename( file ); | 118 | QString packageName = Utils::getFilenameFromIpkFilename( file ); |
117 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); | 119 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); |
118 | packageList.push_back( Package( packageName ) ); | 120 | Package *package = new Package( packageName ); |
119 | packageList.back().setVersion( ver ); | 121 | package->setVersion( ver ); |
120 | packageList.back().setFilename( file ); | 122 | package->setFilename( file ); |
121 | packageList.back().setPackageStoredLocally( true ); | 123 | package->setPackageStoredLocally( true ); |
122 | 124 | packageList.append( package ); | |
123 | } | 125 | } |
124 | #else | 126 | #else |
125 | QString names[] = { "advancedfm_0.9.1-20020811_arm.ipk", "libopie_0.9.1-20020811_arm.ipk", "libopieobex_0.9.1-20020811.1_arm.ipk", "opie-addressbook_0.9.1-20020811_arm.ipk" }; | 127 | QString names[] = { "advancedfm_0.9.1-20020811_arm.ipk", "libopie_0.9.1-20020811_arm.ipk", "libopieobex_0.9.1-20020811.1_arm.ipk", "opie-addressbook_0.9.1-20020811_arm.ipk" }; |
@@ -180,10 +182,10 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
180 | currPackage = getPackage( value ); | 182 | currPackage = getPackage( value ); |
181 | if ( !currPackage ) | 183 | if ( !currPackage ) |
182 | { | 184 | { |
183 | packageList.push_back( Package( value ) ); | 185 | Package *package = new Package( value ); |
184 | currPackage = &(packageList.back()); | 186 | packageList.append( package ); |
187 | currPackage = package; | ||
185 | currPackage->setInstalledTo( dest ); | 188 | currPackage->setInstalledTo( dest ); |
186 | |||
187 | if ( installingToRoot ) | 189 | if ( installingToRoot ) |
188 | currPackage->setInstalledToRoot( true ); | 190 | currPackage->setInstalledToRoot( true ); |
189 | } | 191 | } |
@@ -239,32 +241,35 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR | |||
239 | 241 | ||
240 | void Server :: buildLocalPackages( Server *local ) | 242 | void Server :: buildLocalPackages( Server *local ) |
241 | { | 243 | { |
242 | for ( unsigned int i = 0 ; i < packageList.size() ; ++i ) | 244 | Package *curr; |
245 | QListIterator<Package> it( packageList ); | ||
246 | for ( ; it.current(); ++it ) | ||
243 | { | 247 | { |
244 | QString name = packageList[i].getPackageName(); | 248 | curr = it.current(); |
249 | QString name = curr->getPackageName(); | ||
245 | 250 | ||
246 | // If the package name is an ipk name, then convert the filename to a package name | 251 | // If the package name is an ipk name, then convert the filename to a package name |
247 | if ( name.find( ".ipk" ) != -1 ) | 252 | if ( name.find( ".ipk" ) != -1 ) |
248 | name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() ); | 253 | name = Utils::getPackageNameFromIpkFilename( curr->getFilename() ); |
249 | 254 | ||
250 | if ( local ) | 255 | if ( local ) |
251 | { | 256 | { |
252 | Package *p = local->getPackage( name ); | 257 | Package *p = local->getPackage( name ); |
253 | packageList[i].setLocalPackage( p ); | 258 | curr->setLocalPackage( p ); |
254 | if ( p ) | 259 | if ( p ) |
255 | { | 260 | { |
256 | // Set some default stuff like size and things | 261 | // Set some default stuff like size and things |
257 | if ( p->getInstalledVersion() == packageList[i].getVersion() ) | 262 | if ( p->getInstalledVersion() == curr->getVersion() ) |
258 | { | 263 | { |
259 | p->setPackageSize( packageList[i].getPackageSize() ); | 264 | p->setPackageSize( curr->getPackageSize() ); |
260 | p->setSection( packageList[i].getSection() ); | 265 | p->setSection( curr->getSection() ); |
261 | p->setDescription( packageList[i].getDescription() ); | 266 | p->setDescription( curr->getDescription() ); |
262 | } | 267 | } |
263 | } | 268 | } |
264 | 269 | ||
265 | } | 270 | } |
266 | else | 271 | else |
267 | packageList[i].setLocalPackage( 0 ); | 272 | curr->setLocalPackage( 0 ); |
268 | } | 273 | } |
269 | 274 | ||
270 | } | 275 | } |
@@ -278,10 +283,11 @@ Package *Server :: getPackage( const char *name ) | |||
278 | { | 283 | { |
279 | Package *ret = 0; | 284 | Package *ret = 0; |
280 | 285 | ||
281 | for ( unsigned int i = 0 ; i < packageList.size() && ret == 0; ++i ) | 286 | QListIterator<Package> it( packageList ); |
287 | for ( ; it.current(); ++it ) | ||
282 | { | 288 | { |
283 | if ( packageList[i].getPackageName() == name ) | 289 | if ( it.current()->getPackageName() == name ) |
284 | ret = &packageList[i]; | 290 | ret = it.current(); |
285 | } | 291 | } |
286 | 292 | ||
287 | return ret; | 293 | return ret; |
@@ -289,18 +295,19 @@ Package *Server :: getPackage( const char *name ) | |||
289 | 295 | ||
290 | QString Server :: toString() | 296 | QString Server :: toString() |
291 | { | 297 | { |
292 | QString ret = "Server\n name - " + serverName + | 298 | QString ret = QString( "Server\n name - %1\n url - %2\n" ).arg( serverName ).arg( serverUrl ); |
293 | "\n url - " + serverUrl + | ||
294 | "\n"; | ||
295 | 299 | ||
296 | for ( unsigned int i = 0 ; i < packageList.size() ; ++i ) | 300 | QListIterator<Package> it( packageList ); |
297 | ret += "\n " + packageList[i].toString(); | 301 | for ( ; it.current(); ++it ) |
302 | { | ||
303 | ret.append( QString( "\n %1" ).arg( it.current()->toString() ) ); | ||
304 | } | ||
298 | 305 | ||
299 | 306 | ||
300 | return ret; | 307 | return ret; |
301 | } | 308 | } |
302 | 309 | ||
303 | vector<Package> &Server::getPackageList() | 310 | QList<Package> &Server::getPackageList() |
304 | { | 311 | { |
305 | return packageList; | 312 | return packageList; |
306 | } | 313 | } |