fix index dl from main view, user 8 bit files by default, do not show audio files

2 files changed, 31 insertions, 13 deletions

diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 7426e80..549c1d2 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -141,3 +141,6 @@ void  LibraryDialog::Newlibrary()
 
-                                if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) && (file.find( "]",0, TRUE) == -1) ) {
+            if( !number.isEmpty()
+                                                                && (title.find( "reserved",0, FALSE) == -1)
+                                                                && (file.find( "]",0, TRUE) == -1)
+                                                                && (title.find( "Audio",0, FALSE) == -1)) {
 
@@ -208,4 +211,11 @@ void LibraryDialog::Library()
                                                 file = file.left( file.find("]",0,TRUE));
-                                            //odebug << "file is "+file << oendl;
-                                            ///               number = indexLine.mid(  indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
+
+                                                         
+                                                         if(file.find("?", 0, false) != -1 ) {
+                                                                         QString tmpfile = file.replace(QRegExp("[?]"), "8");
+        //                                                               qDebug( "file is now " + tmpfile );
+                                                                         file = tmpfile;
+                                                         }
+
+//             number = indexLine.mid(  indexLine.find( "]", 0, TRUE ) +1, indexLine.find( " ", 0, TRUE )+1 );
                                         number = indexLine.mid(55,5);
@@ -231,3 +241,5 @@ void LibraryDialog::Library()
 
-                                        if( !number.isEmpty() && (title.find( "reserved",0, FALSE) == -1) /*&& (file.find( "]",0, TRUE))*/ ) {
+                                                                                if( !number.isEmpty()
+                                                                                                && (title.find( "reserved",0, FALSE) == -1)
+                                                                                                &&(title.find( "Audio",0, FALSE) == -1)) {
                                                     // fill string list or something to be able to sort by Author
@@ -598,5 +610,2 @@ bool LibraryDialog::setTitle()
                 }
-
-                if(test == 0 ) {
-
         config.setGroup("Files");
@@ -608,3 +617,3 @@ bool LibraryDialog::setTitle()
                                 config.writeEntry( File_Name, DlglistItemTitle);
-                }
+
                 test = 0;
@@ -752,4 +761,2 @@ void LibraryDialog::onButtonSearch()
                         i_berger = 1;
-                } else {
-                                                                                resultLs.clear();
                                                                 }
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index fac21da..c7cdd83 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -223,3 +223,5 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
                                 Output *outDlg;
-                                outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
+
+                                outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
+
                                 outDlg->showMaximized();
@@ -230,5 +232,8 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
                                 outDlg->OutputEdit->append( tr("Running wget") );
+                                outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                                 sleep(1);
                                 fp = popen(  (const char *) cmd, "r");
-                                odebug << "Issuing the command\n"+cmd << oendl;
+                                if ( !fp ) {
+                                } else {
+                                                        //odebug << "Issuing the command\n"+cmd << oendl;
                                         //                 system(cmd);
@@ -236,6 +241,12 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
                                                 outDlg->OutputEdit->append(line);
-//                        outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+                                                                outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
                                 }
                                 pclose(fp);
+                                                outDlg->OutputEdit->append("Finished downloading\n");
+                                                outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+                                                qApp->processEvents();
+
+                                }
                                 outDlg->close();
+
                                 if(outDlg)