1 files changed, 27 insertions, 20 deletions

diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 5f0e5fa..0499e19 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,38 +1,38 @@
 #include "package.h"
 
 #include <qpe/process.h>
 #include <qpe/stringutil.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "debug.h"
 
-Package::~Package()
-{
-}
+//Package::~Package()
+//{
+//}
 
 Package::Package( PackageManagerSettings *s )
 {
 	init(s);
 }
 
 void Package::init( PackageManagerSettings *s )
 {
 	settings = s;
   _size = "";
   _section = "";
   _subsection = "";
   _shortDesc = "";
   _desc = "";
   _name = "";
   _toProcess = false;
   _status = "";
   _dest = settings->getDestinationName();
   _link = settings->createLinks();
 }
 
 Package::Package( QStringList pack, PackageManagerSettings *s  )
 {	
   init(s);
@@ -40,82 +40,73 @@ Package::Package( QStringList pack, PackageManagerSettings *s  )
 }
 
 Package::Package( QString n, PackageManagerSettings *s )
 {	
   init(s);
  	if ( !QFile::exists( n ) )
   {
 	  _name = QString( n );
   }else{
    	parseIpkgFile( n );
     _toProcess = true;
     _packageName = QString( n );
   }
 }
 
 Package::Package( Package *pi )
 {
   init(pi->settings);
   copyValues( pi );
 }
 
 
 void Package::setValue( QString n, QString t )
 {
-  if ( n == "Status" && installed() ) return;
   if ( n == "Package" )
     {
       _name = QString( t );
-    }
-  if ( n == "Installed-Size" )
+  }else if ( n == "Installed-Size" )
     {
       _size = t;
-    }
-  if ( n == "Priority")
+  }else if ( n == "Priority")
     {
 
-    }
-  if ( n == "Section")
+  }else if ( n == "Section")
     {
       setSection( t );
-    }
-  if ( n == "Maintainer")
+  }else if ( n == "Maintainer")
     {
 
-    }
-  if ( n == "Architecture")
+  }else if ( n == "Architecture")
     {
 
-    }
-  if ( n == "Version")
+  }else if ( n == "Version")
     {
 
-    }
-  if ( n == "Pre-Depends")
+  }else if ( n == "Pre-Depends")
     {
 
-    }
-  if ( n == "Depends")
+  }else if ( n == "Depends")
     {
 
     }else if ( n == "Filename")
       {
 
       }else if ( n == "Size")
  	{
 
 	}else if ( n == "MD5Sum")
 	  {
 
 	  }
   if ( n == "Description")
     {
       setDesc( t );
     }
   if ( n == "Status")
     {
       if ( installed() ) return;
       _status = t;
     }
   if ( t == "Essential")
     {
 
@@ -132,48 +123,64 @@ bool Package::installed()
   return _status.contains("installed");
 }
 
 void Package::setDesc( QString s )
 {
   _desc = s;
   _shortDesc = s.left( s.find("\n") );
 }
 
 QString Package::desc()
 {
   return _desc;
 }
 
 QString Package::shortDesc()
 {
   return _shortDesc;
 }
 
 QString Package::size()
 {
   return _size;
 }
 
+QString Package::sizeUnits()
+{
+	int i = _size.toInt();
+ 	int c = 0;
+  QString ret;
+ 	QStringList unit;
+  unit << "B" << "KB" << "MB" << "GB" << "TB"; //prepair for the future ;)
+	while (i > 1)
+ 	{
+  	ret=QString::number(i)+" "+unit[c];
+   	c++;
+   	i /= 1024;
+  }
+  return ret;
+}
+
 bool Package::toProcess()
 {
   return _toProcess;
 }
 
 bool Package::toRemove()
 {
   if ( _toProcess && installed() ) return true;
   else return false;
 }
 
 bool Package::toInstall()
 {
   if ( _toProcess && !installed() ) return true;
   else return false;
 }
 
 void Package::toggleProcess()
 {
   _toProcess = ! _toProcess;
 }