parses "not-installed" from /usr/lib/ipkg/list

2 files changed, 10 insertions, 1 deletions

diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index b92cbb0..e7b017c 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,12 +1,13 @@
+* check for networt before installing from network
 * Settings Class
 * parse "to install" and "to remove" from status
 * install local file dialog
 * qcop
 * error handling
 * manage links
 * dependency checking
 * create dest if it does not exist
 * allow reinstalling
 * different types of filters and searches
 	i.e. name, desc, files etc
 * display new list after update
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index bfb48b3..4a09b40 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -39,193 +39,201 @@ void Package::init( PackageManagerSettings *s )
 
 Package::Package( QStringList pack, PackageManagerSettings *s  )
 {	
   init(s);
   parsePackage( pack );
 }
 
 Package::Package( QString n, PackageManagerSettings *s )
 {	
   init(s);
  	if ( !QFile::exists( n ) )
   {
 	  _name = QString( n );
   }else{
     pvDebug(4,"remote file: "+n);
    	parseIpkgFile( n );
     _useFileName = true;
     _fileName = QString( n );
   }
 }
 
 Package::Package( Package *pi )
 {
   init(pi->settings);
   copyValues( pi );
 }
 
 
 void Package::setValue( QString n, QString t )
 {
   if ( n == "Package" )
   {
       _name = QString( t );
   }else if ( n == "Installed-Size" )
   {
       _size = t;
 //  }else if ( n == "Priority")
 //  {
 
   }else if ( n == "Section")
   {
       setSection( t );
 //  }else if ( n == "Maintainer")
 //  {
 //
 //  }else if ( n == "Architecture")
 //  {
 
   }else if ( n == "Version")
   {
      _version = t;
 //  }else if ( n == "Pre-Depends")
 //  {
 //
 //  }else if ( n == "Depends")
 //  {
 
   }else if ( n == "Filename")
   {
     _fileName = t;
 //  }else if ( n == "Size")
 // 	{
 //  	
 //	}else if ( n == "MD5Sum")
 //	{
 
 	}else if ( n == "Description")
   {
       setDesc( t );
   }else if ( n == "Status")
   {
       if ( installed() ) return;
       _status = t;
 //  }else if ( n == "Essential")
 //  {
 
   }else{
   	_values.insert(n,new QString(t));
   }
 }
 
 QString Package::name()
 {
 	if (_displayName.isEmpty() ) return _name;
  	else return _displayName;
 }
 
 
 QString Package::installName()
 {
 	if (_useFileName) return _fileName;
   else return _name;
 }
 
 bool Package::installed()
 {
-  if (_status.contains("installed")) return true;
+  if (_status.contains("installed"))
+  {
+   	 if (_status.contains("not-installed"))
+     {
+       _toProcess = true;
+       return false;
+     }
+     else return true;
+  }
   else
 	if (_versions)
   {
 	  QDictIterator<Package> other( *_versions );
 		while ( other.current() )
     {
     	 if (other.current()->status().contains("installed")
       		 && other.current()->version() == version())
          	return true;
 	     ++other;
  		}
   }
   return false;
 }
 
 bool Package::otherInstalled()
 {
 	if (_versions)
   {
 	  QDictIterator<Package> other( *_versions );
 		while ( other.current() )
     {
     	 if (other.current()->installed()) return true;
 	     ++other;
  		}
   }
   return false;
 }
 
 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::version()
 {
   return _version;
 }
 
 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;
 }