- Not loading/applying options everytime we show options window anymore...

- Fixed ip filter
- Updated version number
- Disabled debug mode
*** Release is approaching :) ***

Changelog

@@ -35,6 +35,8 @@
     - BUGFIX: Fixed selective download
     - BUGFIX: Fixed memory leaks in torrent properties
     - BUGFIX: Fixed tooltip behaviour for trayicon
+    - BUGFIX: Fixed Ipfilter.dat loading
+    - BUGFIX: Not loading options every time we display options anymore
     - COSMETIC: Now displaying the number of downloads in tab title
     - COSMETIC: Redesigned download from url dialog
     - COSMETIC: Added a message to warn user that we started download from an url

src/GUI.cpp

@@ -1631,8 +1631,10 @@ void GUI::configureSession(){
     }
     // Apply filtering settings
     if(options->isFilteringEnabled()){
+      qDebug("Ip Filter enabled");
       s->set_ip_filter(options->getFilter());
     }else{
+      qDebug("Ip Filter disabled");
       s->set_ip_filter(ip_filter());
     }
     // Apply Proxy settings
@@ -2297,7 +2299,7 @@ void GUI::setLocale(QString locale){
 
 // Display Program Options
 void GUI::showOptions() const{
-  options->showLoad();
+  options->show();
 }
 
 // Is executed each time options are saved

src/about_imp.h

@@ -23,7 +23,7 @@
 #define ABOUT_H
 
 #include "ui_about.h"
-#define VERSION "v0.7.0rc5"
+#define VERSION "v0.7.0rc6"
 
 class about : public QDialog, private Ui::AboutDlg{
   Q_OBJECT

src/options_imp.cpp

@@ -565,13 +565,6 @@ int options_imp::getMaxConnec() const{
   }
 }
 
-void options_imp::showLoad(){
-  if(!loadOptions()){
-    std::cout << "Warning: Couldn't load options" << '\n';
-  }
-  this->show();
-}
-
 void options_imp::on_okButton_clicked(){
   if(applyButton->isEnabled()){
     saveOptions();
@@ -784,6 +777,7 @@ void options_imp::on_browse_button_clicked(){
 //
 // Lines may be commented using '#' or '//'
 void options_imp::processFilterFile(const QString& filePath){
+  qDebug("Processing filter files");
   filtersList->clear();
   QString manualFilters= misc::qBittorrentPath() + "ipfilter.dat";
   QStringList filterFiles(manualFilters);
@@ -794,27 +788,26 @@ void options_imp::processFilterFile(const QString& filePath){
     if (file.exists()){
       if(!file.open(QIODevice::ReadOnly | QIODevice::Text)){
         QMessageBox::critical(0, tr("I/O Error"), tr("Couldn't open:")+" "+filePath+" "+tr("in read mode."));
-        return;
+        continue;
       }
       unsigned int nbLine = 0;
       while (!file.atEnd()) {
         ++nbLine;
         QByteArray line = file.readLine();
-        QString strLine = QString(line.data());
+        if(!line.startsWith('#') && !line.startsWith("//")){
-        if(!strLine.startsWith('#') && !strLine.startsWith("//")){
           // Line is not commented
-          QStringList partsList = strLine.split(',');
+          QList<QByteArray> partsList = line.split(',');
           unsigned int nbElem = partsList.size();
-          if(nbElem != 2 && nbElem != 3){
+          if(nbElem < 2){
-            QMessageBox::critical(0, tr("Invalid Line"), tr("Line")+" "+QString(misc::toString(nbLine).c_str())+" "+tr("is malformed."));
+            std::cout << "Ipfilter.dat: line " << nbLine << " is malformed.\n";
-            return;
+            continue;
           }
           int nbAccess = partsList.at(1).trimmed().toInt();
           if(nbAccess <= 127){
             QString strComment;
             QString strStartIP = partsList.at(0).split('-').at(0).trimmed();
             QString strEndIP = partsList.at(0).split('-').at(1).trimmed();
-            if(partsList.size() == 3){
+            if(nbElem > 2){
               strComment = partsList.at(2).trimmed();
             }else{
               strComment = QString();
@@ -822,17 +815,19 @@ void options_imp::processFilterFile(const QString& filePath){
             // Split IP
             IP = strStartIP.split('.');
             if(IP.size() != 4){
+              std::cout << "Ipfilter.dat: line " << nbLine << ", first IP is malformed.\n";
               continue;
             }
-            address start(address::from_string(strStartIP.toStdString()));
+            address_v4 start((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
             IP = strEndIP.split('.');
             if(IP.size() != 4){
+              std::cout << "Ipfilter.dat: line " << nbLine << ", second IP is malformed.\n";
               continue;
             }
-            address last(address::from_string(strEndIP.toStdString()));
+            address_v4 last((IP.at(0).toInt() << 24) + (IP.at(1).toInt() << 16) + (IP.at(2).toInt() << 8) + IP.at(3).toInt());
             // add it to list
-            QStringList item(strStartIP);
+            QStringList item(QString(start.to_string().c_str()));
-            item.append(strEndIP);
+            item.append(QString(last.to_string().c_str()));
             if(!i){
               item.append("Manual");
             }else{

src/options_imp.h

@@ -70,8 +70,6 @@ class options_imp : public QDialog, private Ui::Dialog{
     QString getPreviewProgram() const;
     bool getUseOSDAlways() const;
     bool getUseOSDWhenHiddenOnly() const;
-    // Other
-    void showLoad();
 
 
   protected slots:

src/src.pro

@@ -4,7 +4,7 @@ ICONS_PATH = Icons
 TRAYICON_CPP = trayicon
 
 #Set the following variable to 1 to enable debug
-DEBUG_MODE = 1
+DEBUG_MODE = 0
 
 # Global
 TEMPLATE = app