Changed so that the size of a package is passed down into the local package

(as long as the package installed is the same version as the package
available in the feed)

3 files changed, 27 insertions, 19 deletions

diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index fd75450..526de5e 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -1,124 +1,124 @@
 /***************************************************************************
                           package.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "package.h"
 #include "global.h"
 
 Package::Package( QString &name )
 {
     packageName = name;
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::Package( char *name )
 {
     packageName = name;
     localPackage = 0;
     installed = false;
     packageStoredLocally = false;
     installedToRoot = false;
     installed = false;
     installedTo = 0;
 }
 
 Package::~Package()
 {
 }
 
 QString Package :: toString()
 {
     QString ret = "Package - " + getPackageName() +
            "\n              version - " + getVersion();
 
     if ( localPackage )
         ret += "\n              inst version - " + localPackage->getVersion();
 
 
     return ret;
 }
 
-void Package :: setStatus( QString &s )
+void Package :: setStatus( const QString &s )
 {
     status = s;
 
     if ( status.find( "installed" ) != -1 )
         installed = true;
 }
 
 void Package :: setLocalPackage( Package *p )
 {
     localPackage = p;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
-void Package :: setVersion( QString &v )
+void Package :: setVersion( const QString &v )
 {
     version = v;
 
     if ( localPackage )
         if ( localPackage->getVersion() != getVersion() )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
 }
 
-void Package :: setPackageName( QString &name )
+void Package :: setPackageName( const QString &name )
 {
     packageName = name;
 }
 
-void Package :: setDescription( QString &d )
+void Package :: setDescription( const QString &d )
 {
     description = d;
 }
 
-void Package :: setFilename( QString &f )
+void Package :: setFilename( const QString &f )
 {
 	filename = f;
 }
 
 
 QString Package :: getInstalledVersion()
 {
     if ( localPackage )
         return localPackage->getVersion();
     else
         return getVersion();
 }
 
 QString Package :: getInstalledPackageName()
 {
     if ( localPackage )
         return localPackage->getPackageName();
     else
         return getPackageName();
 }
 
 bool Package :: isInstalled()
 {
     return installed || ( localPackage && localPackage->isInstalled() );
 }
diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h
index 7545818..f5a132f 100644
--- a/noncore/settings/aqpkg/package.h
+++ b/noncore/settings/aqpkg/package.h
@@ -1,89 +1,89 @@
 /***************************************************************************
                           package.h  -  description
                              -------------------
     begin                : Mon Aug 26 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef PACKAGE_H
 #define PACKAGE_H
 
 #include <stdlib.h>
 
 /**
   *@author Andy Qua
   */
 
 #include <qstring.h>
 #include "destination.h"
 
 class Package
 {
 public:
 	Package( QString &name );
 	Package( char *name );
 	~Package();
 
     void setLocalPackage( Package *p );
-    void setPackageName( QString &name );
-    void setVersion( QString &v );
-    void setStatus( QString &s );
-    void setDescription( QString &d );
-    void setFilename( QString &f );
+    void setPackageName( const QString &name );
+    void setVersion( const QString &v );
+    void setStatus( const QString &s );
+    void setDescription( const QString &d );
+    void setFilename( const QString &f );
 	void setPackageStoredLocally( bool local )	{ packageStoredLocally = local; }
     void setInstalledToRoot( bool root )        { installedToRoot = root; }
     void setInstalledTo( Destination *d )       { installedTo = d; }
     void setDependancies( QString &deps )       { dependancies = deps; }
-    void setPackageSize( QString size )         { packageSize = size; }
-    void setSection( QString sect)              { section = sect; }
+    void setPackageSize( const QString &size )         { packageSize = size; }
+    void setSection( const QString &sect)              { section = sect; }
 
     Package *getLocalPackage()      { return localPackage; }
     QString getPackageName()        { return packageName; }
     QString getVersion()            { return version; }
     QString getStatus()             { return status; }
     QString getDescription()        { return description; }
     QString getFilename()           { return filename; }
     QString getDependancies()       { return dependancies; }
     QString getPackageSize()        { return packageSize; }
     QString getSection()            { return section; }
 
     bool isInstalled();
 	bool isPackageStoredLocally()	{ return packageStoredLocally; }
     bool isInstalledToRoot()     { return installedToRoot; }
     QString getInstalledVersion();
     QString getInstalledPackageName();
     Destination *getInstalledTo()   { return installedTo; }
 
     QString toString();
 
 
 private:
     Package *localPackage;
 
     QString packageName;
     QString version;
     QString status;
     QString description;
     QString filename;
     bool packageStoredLocally;
     bool installedToRoot;
     bool installed;
     bool differentVersionAvailable;
     QString dependancies;
     QString packageSize;
     QString section;
 
     Destination *installedTo;
 };
 
 #endif
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 7c3257b..726cf00 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -58,241 +58,249 @@ void Server :: cleanUp()
     packageList.clear();
 }
 
 void Server :: readStatusFile(  vector<Destination> &destList )
 {
     cleanUp();
 
     vector<Destination>::iterator dit;
     bool rootRead = false;
     for ( dit = destList.begin() ; dit != destList.end() ; ++dit )
     {
         bool installingToRoot = false;
         
         QString path = dit->getDestinationPath();
         if ( path.right( 1 ) != "/" )
             path += "/";
             
         if ( path == "/" )
         {
             rootRead = true;
             installingToRoot = true;
         }   
         
         packageFile = path + "usr/lib/ipkg/status";
         readPackageFile( 0, false, installingToRoot, dit );
     }
 
     // Ensure that the root status file is read
     if ( !rootRead )
     {
         cout << "Reading status file " << "/usr/lib/ipkg/status" << endl;
         packageFile = "/usr/lib/ipkg/status";
         readPackageFile( 0, false, true );
     }
 }
 
 void Server :: readLocalIpks( Server *local )
 {
     cleanUp();
 
 #ifdef QWS
     // First, get any local IPKGs in the documents area
     // Only applicable to Qtopie/Opie
 
 	DocLnkSet files;
 	Global::findDocuments( &files, "application/ipkg" );
 
 	// Now add the items to the list
 	QListIterator<DocLnk> it( files.children() );
 
 	for ( ; it.current() ; ++it )
 	{
         // OK, we have a local IPK file, I think the standard naming conventions
         // for these are packagename_version_arm.ipk
         QString file = (*it)->file();
 
         // Changed to display the filename (excluding the path)
         QString packageName = Utils::getFilenameFromIpkFilename( file );
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
         packageList.push_back( Package( packageName ) );
         packageList.back().setVersion( ver );
         packageList.back().setFilename( file );
         packageList.back().setPackageStoredLocally( true );
         
 	}
 #else
 	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" };
 	for ( int i = 0 ; i < 4 ; ++i )
 	{
 		// OK, we have a local IPK file, I think the standard naming conventions
 		// for these are packagename_version_arm.ipk
 		QString file = names[i];
 		int p = file.find( "_" );
 		QString tmp = file.mid( 0, p );
 		packageList.push_back( Package( tmp ) );
 		int p2 = file.find( "_", p+1 );
 		tmp = file.mid( p+1, p2-(p+1) );
 		packageList.back().setVersion( tmp );
 		packageList.back().setPackageStoredLocally( true );
 	}
 #endif
 
     // build local packages
     buildLocalPackages( local );
 }
 
 void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest )
 {
     ifstream in( packageFile );
 	if ( !in.is_open() )
         return;
 
     char line[1001];
     char k[21];
     char v[1001];
     QString key;
     QString value;
 
     if ( clearAll )
         cleanUp();
     Package *currPackage = 0;
 
     bool newPackage = true;
     do
     {
         in.getline( line, 1000 );
         if ( in.eof() )
             continue;
 
         k[0] = '\0';
         v[0] = '\0';
 
         sscanf( line, "%[^:]: %[^\n]", k, v );
         key = k;
         value = v;
         key = key.stripWhiteSpace();
         value = value.stripWhiteSpace();
         if ( key == "Package" && newPackage )
         {
             newPackage = false;
 
             currPackage = getPackage( value );
             if ( !currPackage )
             {
     			packageList.push_back( Package( value ) );
 	    		currPackage = &(packageList.back());
                 currPackage->setInstalledTo( dest );
 
                 if ( installingToRoot )
                     currPackage->setInstalledToRoot( true );
             }
             else
             {
                 if (currPackage->getStatus().find( "deinstall" ) != -1 )
                     currPackage->setInstalledTo( dest );
             }
         }
         else if ( key == "Version" )
         {
             if ( currPackage )
                 currPackage->setVersion( value );
         }
         else if ( key == "Status" )
         {
             if ( currPackage )
                 currPackage->setStatus( value );
         }
         else if ( key == "Description" )
         {
             if ( currPackage )
                 currPackage->setDescription( value );
         }
         else if ( key == "Filename" )
         {
             if ( currPackage )
                 currPackage->setFilename( value );
         }
         else if ( key == "Size" )
         {
             if ( currPackage )
                 currPackage->setPackageSize( value );
         }
         else if ( key == "Section" )
         {
             if ( currPackage )
                 currPackage->setSection( value );
 
             DataManager::setAvailableCategories( value );
         }
         else if ( key == "" )
         {
             newPackage = true;
         }
     } while ( !in.eof() );
 
     in.close();
 
     // build local packages
     buildLocalPackages( local );
 }
 
 void Server :: buildLocalPackages( Server *local )
 {
     for ( unsigned int i = 0 ; i < packageList.size() ; ++i )
     {
 		QString name = packageList[i].getPackageName();
 
         // If the package name is an ipk name, then convert the filename to a package name
         if ( name.find( ".ipk" ) != -1 )
             name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() );
 
         if ( local )
-            packageList[i].setLocalPackage( local->getPackage( name ) );
+        {
+            Package *p = local->getPackage( name );
+            packageList[i].setLocalPackage( p );
+            if ( p )
+            {
+                // Set some default stuff like size and things
+                if ( p->getInstalledVersion() == packageList[i].getVersion() )
+                {
+                    p->setPackageSize( packageList[i].getPackageSize() );
+                    p->setSection( packageList[i].getSection() );
+                    p->setDescription( packageList[i].getDescription() );
+                }
+            }
+            
+        }
         else
             packageList[i].setLocalPackage( 0 );
     }
 
 }
 
 Package *Server :: getPackage( QString &name )
 {
     return getPackage( (const char *)name );
 }
 
 Package *Server :: getPackage( const char *name )
 {
     Package *ret = 0;
 
     for ( unsigned int i = 0 ; i < packageList.size() && ret == 0; ++i )
     {
 		if ( packageList[i].getPackageName() == name )
 			ret = &packageList[i];
 	}
 
     return ret;
 }
 
 QString Server :: toString()
 {
     QString ret = "Server\n   name - " + serverName +
                        "\n   url - " + serverUrl +
                        "\n";
 
     for ( unsigned int i = 0 ; i < packageList.size() ; ++i )
         ret += "\n   " + packageList[i].toString();
 
 
     return ret;
-}                     /*
-void addAvailableSection( QString section )
-{
-  if ( DataManager::availableCategories.find( value ) == -1 )
-//                DataManager::availableCategories += "#" + value;
 }
-*/
 
 vector<Package> &Server::getPackageList()
 {
     return packageList;
 }