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
@@ -43,73 +43,73 @@ Package::Package( char *name )
 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 )
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
@@ -22,43 +22,43 @@
 
 /**
   *@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();
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
@@ -234,33 +234,47 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
 
     // 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 )
@@ -270,29 +284,23 @@ Package *Server :: getPackage( const char *name )
         }
 
     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;
 }