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
@@ -126,33 +126,36 @@ void  LibraryDialog::Newlibrary()
 
                                 getAuthor();  // groks author
                                 author = author.stripWhiteSpace();
                                 if (authBox->isChecked()) { // this reverses the first name and last name of the author
                                             //                    odebug << "Sorting last name first" << oendl;
                                         QString lastName, firstName="";
                                         int finder=author.findRev( ' ', -1, TRUE);
                                         lastName=author.right( author.length()-finder);
                                         firstName=author.left(finder);
                                         lastName=lastName.stripWhiteSpace();
                                         firstName=firstName.stripWhiteSpace();
 
                                         if( lastName.find( firstName, 0, true)  == -1) // this avoids dup names
                                                 author=lastName+", "+firstName;
                                 }
 
-                                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)) {
 
                                             // fill string list or something to be able to resort the whole library
                                         if( author.isEmpty() )
                                                 QList_Item5 = new QListViewItem( ListView5, /* number,*/ title, author, year, file );
                                         else {
 
                                                 if(  (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
                                                          (author.left(1) >= QString("a")  && author.left(1) <= QString("f")) )
                                                         QList_Item1 = new QListViewItem( ListView1,/*  number,*/ title, author, year, file );
 
                                                 else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
                                                                  (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
                                                         QList_Item2 = new QListViewItem( ListView2,  /*number, */title, author, year, file );
 
                                                 else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
                                                                  (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
@@ -193,56 +196,65 @@ void LibraryDialog::Library()
                 QString indexLine;
                 qApp->processEvents();
                     //        int jig;
                 while ( !indexStream.eof() ) {
 
                         indexLine = indexStream.readLine();
                         if ( indexLine != "") {
                                 if( (indexLine.mid(4,4)).toInt() /* && !( indexLine.left(3)).toInt()*/ ) {
                                             //                    month = indexLine.left( 3);
                                         year = indexLine.mid(4,4);
                                             //                    title = indexLine.mid( 9, 50);
                                         file = indexLine.mid(60,12);
                                         if(file.left(1).find("[",0,TRUE) != -1)
                                                 file.remove(1,1);
                                         if( file.find("]",0,TRUE) != -1)
                                                 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);
                                         number = number.stripWhiteSpace();
                                             //                  title = indexLine.mid( indexLine.find(" ", 26, TRUE), indexLine.length() );
                                         title = indexLine.mid( 9,  50 );
                                         title = title.stripWhiteSpace();
                                             //odebug << "title is "+title << oendl;
                                         getAuthor();  // grok author
                                         author = author.stripWhiteSpace();
                                             //odebug << "author is "+author << oendl;
                                         if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
                                                 QString lastName, firstName="";
                                                 int finder=author.findRev( ' ', -1, TRUE);
                                                 lastName=author.right( author.length()-finder);
                                                 firstName=author.left(finder);
                                                 lastName=lastName.stripWhiteSpace();
                                                 firstName=firstName.stripWhiteSpace();
 
                                                 if( lastName.find( firstName, 0, true)  == -1) // this avoids dup names
                                                         author=lastName+", "+firstName;
                                         }
 
-                                        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
                                                 if( author.isEmpty() )
                                                         QList_Item5 = new QListViewItem( ListView5,  /*number, */title, author, year, file );
                                                 else  {
                                                         if(  (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
                                                                  (author.left(1) >= QString("a")  && author.left(1) <= QString("f")) )
                                                                 QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
 
                                                         else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
                                                                          (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
                                                                 QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
 
                                                         else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
                                                                          (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
                                                                 QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
 
@@ -583,43 +595,40 @@ bool LibraryDialog::setTitle()
 				DlglistItemTitle.replace(DlglistItemTitle.find("[",0,TRUE),1, "(" );
 		if( DlglistItemTitle.find("]",0,TRUE) !=-1)
 				DlglistItemTitle.replace(DlglistItemTitle.find("]",0,TRUE),1, ")" );
 		odebug << "Title being set is "+DlglistItemTitle << oendl;
 		int test = 0;
 		QString ramble, temp;
 		config.setGroup("Files");
 		QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
 		int  i_numofFiles = s_numofFiles.toInt();
 		for ( int i = 0; i <= i_numofFiles; i++){
 				temp.setNum( i);
 				ramble  = config.readEntry( temp, "" );
 				if( strcmp( ramble, File_Name) == 0){
 						test = 1;
 				}
 		}
-
-		if(test == 0 ) {
-
         config.setGroup("Files");
 				config.writeEntry( "NumberOfFiles", i_numofFiles +1 );
 				QString interger;
 				interger.setNum( i_numofFiles +1);
 				config.writeEntry( interger, File_Name);
 				config.setGroup( "Titles" );
 				config.writeEntry( File_Name, DlglistItemTitle);
-		}
+
 		test = 0;
 		return true;
 }
 
 
 void LibraryDialog::saveConfig()
 {
         Config config("Gutenbrowser");
         if( httpBox->isChecked() == TRUE) {
                 checked = 1;
                 config.setGroup( "Proxy" );
                 config.writeEntry("IsChecked", "TRUE");
         } else {
                 checked = 0;
                 config.setGroup( "Proxy" );
                 config.writeEntry("IsChecked", "FALSE");
@@ -737,34 +746,32 @@ void LibraryDialog::onButtonSearch()
                                 }
                         }
                 }
 
                 tabWidget->setCurrentPage( curTab);
 
                 Searchlist.sort();
                 SearchResultsDlg* SearchResultsDialog;
                 SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
 
                 SearchResultsDialog->showMaximized();
                 if( SearchResultsDialog->exec() != 0) {
                         texter = SearchResultsDialog->selText;
                             //           odebug << texter << oendl;
                         resultLs = SearchResultsDialog->resultsList;
                         i_berger = 1;
-                } else {
-										resultLs.clear();
 								}
                 Searchlist.clear();
 
                     //        if(SearchResultsDialog)
                     //        delete SearchResultsDialog;
                 QString tester;
                 for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
                         texter.sprintf("%s \n",(*it).latin1());
                             //           odebug << texter << oendl;
                         if( tester!=texter)
                                 parseSearchResults( texter);
                         tester = texter;
                 }
                 if(searchDlg)
                         delete searchDlg;
         }
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
@@ -208,49 +208,60 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
 				filename+="etc/gutenbrowser/";
 		odebug << "filename "+filename << oendl;
 			//    QString filename = QDir::homeDirPath()+"/Applications/gutenbrowser/";
 
 		filename += url.right( url.length() - url.findRev("/",-1,TRUE) -1);
 
 		Config config("Gutenbrowser");
 		config.setGroup( "Browser" );
 		QString brow = config.readEntry("Preferred", "Opera");
 		odebug << "Preferred browser is "+brow << oendl;
 		if(!showMsg) { //if we just get the gutenindex.all
 				cmd="wget -O " + filename +" " + url+" 2>&1" ;
 				chdir(local_library);
 				odebug << "Issuing the system command: " << cmd << "" << oendl;
 
 				Output *outDlg;
-				outDlg = new Output(this, tr("Gutenbrowser Output"),FALSE);
+
+				outDlg = new Output( 0, tr("Downloading Gutenberg Index...."),TRUE);
+
 				outDlg->showMaximized();
 				outDlg->show();
 				qApp->processEvents();
 				FILE *fp;
 				char line[130];
 				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);
 				while ( fgets( line, sizeof line, fp)) {
 						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)
 						delete outDlg;
 		} else {
 				if( brow == "Konq") {
 						cmd = "konqueror "+url+" &";
 				}
 				if( brow == "Opera")  { //for desktop testing
 						cmd = "opera "+url+" &";
 				}
 					//              if( brow == "Opera")  { // on Zaurus
 					//                  cmd = "operagui "+url+" &";
 					//              }
 				if( brow == "Mozilla")  {
 						cmd = "mozilla "+url+" &";
 				}
 				if( brow == "Netscape")  {