author | tille <tille> | 2002-04-23 22:41:02 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-23 22:41:02 (UTC) |
commit | f90935204b16126b40d4c562b26e37148ca03536 (patch) (side-by-side diff) | |
tree | 40a3e25d9e5078a3871ae7ba5b1fb86245ead187 /noncore | |
parent | ab7037fb8c10cc2ee37a3728caab7d4da4cdc1b3 (diff) | |
download | opie-f90935204b16126b40d4c562b26e37148ca03536.zip opie-f90935204b16126b40d4c562b26e37148ca03536.tar.gz opie-f90935204b16126b40d4c562b26e37148ca03536.tar.bz2 |
fixes: update and link creation
-rw-r--r-- | noncore/unsupported/oipkg/TODO | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/main.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 26 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/oipkg.pro | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettingsbase.ui | 8 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 148 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 18 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/runwindow.ui | 4 |
12 files changed, 142 insertions, 89 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO index 714baa4..d81e873 100644 --- a/noncore/unsupported/oipkg/TODO +++ b/noncore/unsupported/oipkg/TODO @@ -1,7 +1,9 @@ * search -* parse "to install" and "to remove" from status * Settings Class +* make oipkg determine dest of "to remove" apps +* tr() ;) * Dialog to display ipkg output live +* parse "to install" and "to remove" from status * install local file -* make oipkg determine dest of to remove apps +* install to dest with click on packet * error handling diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp index 264fd55..4af59b0 100644 --- a/noncore/unsupported/oipkg/main.cpp +++ b/noncore/unsupported/oipkg/main.cpp @@ -9,4 +9,4 @@ int main( int argc, char ** argv ) { - debugLevel = 1; - if (argc > 2) + debugLevel = 2; + if (argc > 0) { diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index b485a03..cb2b4cd 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -53,3 +53,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : packageList.setSettings( settings ); - newList(); + getList(); setSections(); @@ -68,2 +68,9 @@ void MainWindow::makeMenu() +//#define TOOLBAR +#ifdef TOOLBAR + QPEToolBar *secBar = new QPEToolBar( this ); + QComboBox *sections = new QComboBox( false, this ); + secBar->addTo( sections ); +#endif + contextMenu = new QPopupMenu( this ); @@ -136,4 +143,3 @@ void MainWindow::runIpkg() ipkg->commit( packageList ); - ipkg->runIpkg("update"); - packageList.update(); + updateList(); } @@ -142,9 +148,11 @@ void MainWindow::updateList() { - ipkg->runIpkg("update"); - packageList.update(); + // todo: packageList.clear(); + ipkg->update(); + getList(); } -void MainWindow::newList() +void MainWindow::getList() { packageList.update(); + displayList(); } @@ -219,3 +227,3 @@ void MainWindow::showSettings() if ( settings->showDialog( 0 ) ) - newList(); + getList(); } @@ -224,3 +232,3 @@ void MainWindow::showSettingsSrv() if ( settings->showDialog( 1 ) ) - newList(); + getList(); } @@ -229,3 +237,3 @@ void MainWindow::showSettingsDst() if ( settings->showDialog( 2 ) ) - newList(); + getList(); } diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 77604fd..95dcc90 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h @@ -30,3 +30,3 @@ protected slots: void runIpkg(); - void newList(); + void getList(); void updateList(); diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index 04230f5..c61af0f 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro @@ -2,4 +2,4 @@ DESTDIR = $(OPIEDIR)/bin TEMPLATE = app -CONFIG = qt warn_on release -#CONFIG = qt warn_on debug +#CONFIG = qt warn_on release +CONFIG = qt warn_on debug HEADERS = mainwindow.h \ diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index 82ea1c8..e317308 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp @@ -158,3 +158,3 @@ void Package::toggleProcess() { - _toProcess = !(_toProcess); + _toProcess = ! _toProcess; } diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp index d72ef75..5f6934d 100644 --- a/noncore/unsupported/oipkg/packagelist.cpp +++ b/noncore/unsupported/oipkg/packagelist.cpp @@ -207,5 +207,2 @@ void PackageList::update() - - -/** No descriptions */ void PackageList::setSettings( PackageManagerSettings *s ) @@ -215 +212,5 @@ void PackageList::setSettings( PackageManagerSettings *s ) +Package* PackageList::getByName( QString n ) +{ + origPackageList[n]; +} diff --git a/noncore/unsupported/oipkg/packagelist.h b/noncore/unsupported/oipkg/packagelist.h index eda8d22..68b89f0 100644 --- a/noncore/unsupported/oipkg/packagelist.h +++ b/noncore/unsupported/oipkg/packagelist.h @@ -28,2 +28,4 @@ public: void filterPackages(); + /** No descriptions */ + Package* getByName( QString ); diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui index 2efd2f3..ea507a8 100644 --- a/noncore/unsupported/oipkg/pksettingsbase.ui +++ b/noncore/unsupported/oipkg/pksettingsbase.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>357</width> + <width>353</width> <height>454</height> @@ -300,3 +300,3 @@ <name>enabled</name> - <bool>true</bool> + <bool>false</bool> </property> @@ -319,3 +319,3 @@ <name>enabled</name> - <bool>true</bool> + <bool>false</bool> </property> @@ -334,3 +334,3 @@ <name>enabled</name> - <bool>true</bool> + <bool>false</bool> </property> diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 528365e..681f2d4 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -26,10 +26,10 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) - : RunWindow ( p, name, f ) - // : QObject ( p ) +// : RunWindow ( p, name, f ) + : QObject ( p ) { settings = s; - + runwindow = new RunWindow ( p, name, f ); linkDest = new QCopChannel( "QPE/MakeLinks", this ); connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)), - this, SLOT(linkDestination( const QString &, const QString&)) ); + this, SLOT(linkDestination( const QString &, const QByteArray&)) ); } @@ -40,6 +40,13 @@ PmIpkg::~PmIpkg() +//#define PROC +#define SYSTEM int PmIpkg::runIpkg(const QString& args) { - pvDebug(4,"PmIpkg::runIpkg"); + pvDebug(2,"PmIpkg::runIpkg "+args); +#ifdef PROC + QStringList cmd = "/usr/bin/ipkg "; +#endif +#ifdef SYSTEM QString cmd = "/usr/bin/ipkg "; +#endif cmd += " -dest "+settings->getDestinationName(); @@ -47,11 +54,21 @@ int PmIpkg::runIpkg(const QString& args) - outPut->setText( outPut->text()+"<br><br>Starting to "+ args+"<br>\n"); - QString redirect = "/tmp/ipkg.pipe"; - cmd += args+" | tee "+redirect+" 2>&1&"; - - outPut->setText( outPut->text() + "running:<br>\n"+cmd+"<br>\n" ); - pvDebug( 0, "Execute >"+cmd+"<" ); - int r = system(cmd.latin1()); + out( "Starting to "+ args+"<br>\n"); + cmd += args; + out( "running:<br>\n"+cmd+"<br>\n" ); + int r = 0; +#ifdef PROC + QString o = "start"; + Process ipkg( cmd ); + QString description; + ipkg.exec("",o); + out( o ); +#endif +#ifdef SYSTEM + QString redirect = "/tmp/oipkg.pipe"; + cmd += " | tee "+redirect+" 2>&1"; + r = system(cmd.latin1()); QFile f( redirect ); - if ( f.open(IO_ReadOnly) ) { + while ( ! f.open(IO_ReadOnly) ) {}; + // if ( f.open(IO_ReadOnly) ) {}; + { QTextStream t( &f ); @@ -60,3 +77,3 @@ int PmIpkg::runIpkg(const QString& args) { - outPut->setText( outPut->text() + t.readLine() +"\n<br>" ); + out( t.readLine() +"<br>" ); } @@ -64,12 +81,4 @@ int PmIpkg::runIpkg(const QString& args) f.close(); - outPut->setText( outPut->text() + "\n<br><br>Finished!"); - outPut->setContentsPos(0,outPut->contentsHeight()); - - if ( r == 0 ) - { - QString param = args.left( args.find(" ") ); - QString file = args.right( args.length() - args.find(" ") ); - if ( param == "install" && settings->createLinks() ) - makeLinks( file); - } + out( "Finished!<br>"); +#endif @@ -80,7 +89,8 @@ void PmIpkg::makeLinks(QString file) { - outPut->setText( outPut->text() + "<br>creating links<br>" ); + out( "<br>creating links<br>" ); QString dest = settings->getDestinationUrl(); - system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe").latin1()); + out("for package "+file+" in "+dest+"<br>"); + system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe 2>&1").latin1()); QFile f( "/tmp/oipkg.pipe" ); - if ( ! f.open(IO_ReadOnly) )return; + while ( ! f.open(IO_ReadOnly) ) {}; QTextStream t( &f ); @@ -89,3 +99,4 @@ void PmIpkg::makeLinks(QString file) { - processLinkDir( t.readLine(), dest ); + fp = t.readLine(); + processLinkDir( fp, dest ); } @@ -98,9 +109,2 @@ void PmIpkg::processLinkDir( QString file, QString dest ) QFileInfo fileInfo( file ); - if ( fileInfo.isFile() ) - { - const char *instFile = strdup( (file).ascii() ); - const char *linkFile = strdup( (destFile).ascii()); - outPut->setText( outPut->text() + "linking: "+file+" -> "+destFile ); - symlink( instFile, linkFile ); - } if ( fileInfo.isDir() ) @@ -111,3 +115,2 @@ void PmIpkg::processLinkDir( QString file, QString dest ) d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - const QFileInfoList *list = d.entryInfoList(); @@ -115,3 +118,5 @@ void PmIpkg::processLinkDir( QString file, QString dest ) QFileInfo *fi; - while ( (fi=it.current()) ) { + while ( (fi=it.current()) ) + { + out( "<b>"+fi->absFilePath()+"</b>" ); processLinkDir( fi->absFilePath(), dest ); @@ -119,2 +124,10 @@ void PmIpkg::processLinkDir( QString file, QString dest ) } + } else + if ( fileInfo.isFile() ) + { + const char *instFile = strdup( (file).ascii() ); + const char *linkFile = strdup( (destFile).ascii()); + out( "linking: "+file+" -> "+destFile ); + qDebug( "linking: %s -> %s", instFile, linkFile ); + symlink( instFile, linkFile ); } @@ -124,9 +137,10 @@ void PmIpkg::commit( PackageList pl ) { - showMaximized(); - exec(); - outPut->setText( "<b>Starting...</b><br>\n"); + runwindow->showMaximized(); +// exec(); + runwindow->outPut->setText(""); + out( "<h1>Starting...</h1><br>\n"); QStringList to_remove, to_install; - QString rem="To remove:<br>\n"; - QString inst="To install:<br>\n";; + QString rem="<b>To remove:</b><br>\n"; + QString inst="<b>To install:</b><br>\n";; for( Package *pack = pl.first();pack ; (pack = pl.next()) ) @@ -138,3 +152,3 @@ void PmIpkg::commit( PackageList pl ) to_install.append( pack->name() ); - inst += pack->name()+"\n"; + inst += pack->name()+"<br>"; } @@ -143,3 +157,3 @@ void PmIpkg::commit( PackageList pl ) to_remove.append( pack->name() ); - rem += pack->name()+"\n"; + rem += pack->name()+"<br>"; } @@ -148,3 +162,3 @@ void PmIpkg::commit( PackageList pl ) - outPut->setText( outPut->text()+inst+rem); + out("<p>"+inst+"</p>"+"<p>"+rem+"</p>"); bool ok=TRUE; @@ -161,3 +175,11 @@ void PmIpkg::commit( PackageList pl ) for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) - if ( runIpkg("install " + *it) != 0 ) ok = false; + { + if ( runIpkg("install " + *it) == 0 ) + { + if ( settings->createLinks() ) + makeLinks( *it ); + }else{ + ok = false; + } + } @@ -170,14 +192,28 @@ void PmIpkg::commit( PackageList pl ) -void PmIpkg::linkDestination( QString src, QString dest ) +void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) +// add 3rd package parameter { - QDir d( src ); - d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - if (! d.exists() ) return; - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); - QFileInfo *fi; - while ( (fi=it.current()) ) { - processLinkDir( fi->absFilePath(), dest ); - ++it; + qDebug("msg="+msg+" -- "+QString(dest) ); +// QDir d( src ); +// d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); +//// if (! d.exists() ) return; +// const QFileInfoList *list = d.entryInfoList(); +// QFileInfoListIterator it( *list ); +// QFileInfo *fi; +// while ( (fi=it.current()) ) { +// processLinkDir( fi->absFilePath(), dest ); +// ++it; +// } +} + +void PmIpkg::update() +{ + runwindow->showMaximized(); + runIpkg( "update" ); } + +void PmIpkg::out( QString o ) +{ + runwindow->outPut->setText( runwindow->outPut->text()+o ); + runwindow->outPut->setContentsPos(0,runwindow->outPut->contentsHeight()); } diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index 98efaa6..e6486ff 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h @@ -12,2 +12,3 @@ +//#define DIA @@ -15,4 +16,5 @@ -class PmIpkg : public RunWindow -//class PmIpkg : public QObject + +//class PmIpkg : public RunWindow +class PmIpkg : public QObject { @@ -24,2 +26,4 @@ public: + void commit( PackageList ); + void update(); PackageList* getPackageList(); @@ -28,13 +32,13 @@ private: PackageManagerSettings* settings; + RunWindow *runwindow; QCopChannel *linkDest; - void processLinkDir( QString, QString ); - -public: void makeLinks(QString); + void processLinkDir( QString, QString ); + int runIpkg(const QString& args); - void commit( PackageList ); + void out( QString ); public slots: - void linkDestination( QString, QString ); + void linkDestination( const QString, const QByteArray ); }; diff --git a/noncore/unsupported/oipkg/runwindow.ui b/noncore/unsupported/oipkg/runwindow.ui index 23f58cf..9113f2d 100644 --- a/noncore/unsupported/oipkg/runwindow.ui +++ b/noncore/unsupported/oipkg/runwindow.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>201</width> + <width>197</width> <height>291</height> @@ -44,3 +44,3 @@ <name>progress</name> - <number>0</number> + <number>42</number> </property> |