Implement new GeoIPManager class.

Author: glassez

configure

@@ -716,7 +716,6 @@ enable_dependency_tracking
 enable_silent_rules
 with_qt5
 with_libtorrent_rasterbar0_16
-with_geoip_database_embedded
 with_qtsingleapplication
 with_qjson
 enable_debug
@@ -1387,10 +1386,6 @@ Optional Packages:
   --with-libtorrent-rasterbar0.16
                           Compile using libtorrent-rasterbar 0.16.x series
                           (default=no)
-  --with-geoip-database-embedded
-                          Embed the GeoIP database in the qBittorrent
-                          executable (please follow instructions in
-                          src/gui/geoip/README) (default=no)
   --with-qtsingleapplication=[system|shipped]
                           Use the shipped qtsingleapplication library or the
                           system one (default=shipped)
@@ -4194,15 +4189,6 @@ fi
 
 
 
-# Check whether --with-geoip-database-embedded was given.
-if test "${with_geoip_database_embedded+set}" = set; then :
-  withval=$with_geoip_database_embedded;
-else
-  with_geoip_database_embedded=no
-fi
-
-
-
 # Check whether --with-qtsingleapplication was given.
 if test "${with_qtsingleapplication+set}" = set; then :
   withval=$with_qtsingleapplication;
@@ -4429,7 +4415,6 @@ $as_echo "yes" >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
               enable_qt_dbus=no
-              enable_geoip_database=no
               QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui" ;; #(
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gui" >&5
@@ -5493,23 +5478,6 @@ $as_echo "$with_libtorrent_rasterbar0_16" >&6; }
         as_fn_error $? "Unknown option \"$with_libtorrent_rasterbar0_16\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to embed the GeoIP database" >&5
-$as_echo_n "checking whether to embed the GeoIP database... " >&6; }
-case "x$with_geoip_database_embedded" in #(
-  "xno") :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED" ;; #(
-  "xyes") :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED" ;; #(
-  *) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_geoip_database_embedded" >&5
-$as_echo "$with_geoip_database_embedded" >&6; }
-        as_fn_error $? "Unknown option \"$with_geoip_database_embedded\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
-esac
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which qtsingleapplication to use" >&5
 $as_echo_n "checking which qtsingleapplication to use... " >&6; }
 case "x$with_qtsingleapplication" in #(

configure.ac

@@ -24,12 +24,6 @@ AC_ARG_WITH(libtorrent-rasterbar0.16,
             [],
             [with_libtorrent_rasterbar0_16=no])
 
-AC_ARG_WITH(geoip-database-embedded,
-            [AS_HELP_STRING([--with-geoip-database-embedded],
-                            [Embed the GeoIP database in the qBittorrent executable (please follow instructions in src/gui/geoip/README) (default=no)])],
-            [],
-            [with_geoip_database_embedded=no])
-
 AC_ARG_WITH(qtsingleapplication,
             [AS_HELP_STRING([--with-qtsingleapplication=@<:@system|shipped@:>@],
                             [Use the shipped qtsingleapplication library or the system one (default=shipped)])],
@@ -198,17 +192,6 @@ AS_CASE(["x$with_libtorrent_rasterbar0_16"],
         [AC_MSG_RESULT([$with_libtorrent_rasterbar0_16])
         AC_MSG_ERROR([Unknown option "$with_libtorrent_rasterbar0_16". Use either "yes" or "no".])])
 
-AC_MSG_CHECKING([whether to embed the GeoIP database])
-AS_CASE(["x$with_geoip_database_embedded"],
-        ["xno"],
-              [AC_MSG_RESULT([no])
-              QBT_REMOVE_DEFINES="$QBT_REMOVE_DEFINES WITH_GEOIP_EMBEDDED"],
-        ["xyes"],
-               [AC_MSG_RESULT([yes])
-               QBT_ADD_DEFINES="$QBT_ADD_DEFINES WITH_GEOIP_EMBEDDED"],
-        [AC_MSG_RESULT([$with_geoip_database_embedded])
-        AC_MSG_ERROR([Unknown option "$with_geoip_database_embedded". Use either "yes" or "no".])])
-
 AC_MSG_CHECKING([which qtsingleapplication to use])
 AS_CASE(["x$with_qtsingleapplication"],
         ["xshipped"],

macxconf.pri

@@ -56,6 +56,3 @@ QMAKE_BUNDLE_DATA += qt_translations
 
 ICON = $$DIST_PATH/qbittorrent_mac.icns
 QMAKE_INFO_PLIST = $$DIST_PATH/Info.plist
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -13,8 +13,4 @@ LIBS += \
 RC_FILE = qbittorrent_os2.rc
 
 # LIBTORRENT DEFINES
-DEFINES += WITH_SHIPPED_GEOIP_H
 DEFINES += BOOST_ASIO_DYN_LINK
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On eCS(OS/2), GeoIP database must be embedded.")

src/app/application.cpp

@@ -65,6 +65,7 @@
 #include "core/scanfoldersmodel.h"
 #include "core/net/smtp.h"
 #include "core/net/downloadmanager.h"
+#include "core/net/geoipmanager.h"
 #include "core/bittorrent/session.h"
 #include "core/bittorrent/torrenthandle.h"
 
@@ -232,10 +233,14 @@ int Application::exec(const QStringList &params)
 #else
     GuiIconProvider::initInstance();
 #endif
+
     BitTorrent::Session::initInstance();
     connect(BitTorrent::Session::instance(), SIGNAL(torrentFinished(BitTorrent::TorrentHandle *const)), SLOT(torrentFinished(BitTorrent::TorrentHandle *const)));
     connect(BitTorrent::Session::instance(), SIGNAL(allTorrentsFinished()), SLOT(allTorrentsFinished()));
 
+#ifndef DISABLE_COUNTRIES_RESOLUTION
+    Net::GeoIPManager::initInstance();
+#endif
     ScanFoldersModel::initInstance(this);
 
 #ifndef DISABLE_WEBUI
@@ -446,6 +451,9 @@ void Application::cleanup()
 
     ScanFoldersModel::freeInstance();
     BitTorrent::Session::freeInstance();
+#ifndef DISABLE_COUNTRIES_RESOLUTION
+    Net::GeoIPManager::freeInstance();
+#endif
     Preferences::freeInstance();
     Logger::freeInstance();
     IconProvider::freeInstance();

src/core/bittorrent/peerinfo.cpp

@@ -28,6 +28,7 @@
 
 #include <libtorrent/version.hpp>
 
+#include "core/net/geoipmanager.h"
 #include "core/utils/string.h"
 #include "peerinfo.h"
 
@@ -69,11 +70,12 @@ bool PeerInfo::fromLSD() const
     return (m_nativeInfo.source & libt::peer_info::lsd);
 }
 
+#ifndef DISABLE_COUNTRIES_RESOLUTION
 QString PeerInfo::country() const
 {
-    return QString(QByteArray(m_nativeInfo.country, 2));
+    return Net::GeoIPManager::instance()->lookup(address().ip);
 }
-
+#endif
 
 bool PeerInfo::isInteresting() const
 {

src/core/bittorrent/peerinfo.h

@@ -89,7 +89,9 @@ namespace BitTorrent
         qlonglong totalDownload() const;
         QBitArray pieces() const;
         QString connectionType() const;
+#ifndef DISABLE_COUNTRIES_RESOLUTION
         QString country() const;
+#endif
 
     private:
         libtorrent::peer_info m_nativeInfo;

src/core/bittorrent/private/sessionprivate.h

@@ -50,9 +50,6 @@ struct SessionPrivate
     virtual bool isTempPathEnabled() const = 0;
     virtual bool isAppendExtensionEnabled() const = 0;
     virtual bool useAppendLabelToSavePath() const = 0;
-#ifndef DISABLE_COUNTRIES_RESOLUTION
-    virtual bool isResolveCountriesEnabled() const = 0;
-#endif
     virtual QString defaultSavePath() const = 0;
     virtual QString tempPath() const = 0;
     virtual qreal globalMaxRatio() const = 0;

src/core/bittorrent/private/torrenthandleprivate.h

@@ -42,9 +42,6 @@ struct TorrentHandlePrivate
     virtual void handleDefaultSavePathChanged() = 0;
     virtual void handleTempPathChanged() = 0;
     virtual void handleAppendExtensionToggled() = 0;
-#ifndef DISABLE_COUNTRIES_RESOLUTION
-    virtual void handleResolveCountriesToggled() = 0;
-#endif
 
 protected:
     ~TorrentHandlePrivate() {}

src/core/bittorrent/session.cpp

@@ -63,7 +63,7 @@ using namespace BitTorrent;
 //#include <libtorrent/extensions/metadata_transfer.hpp>
 
 #ifndef DISABLE_COUNTRIES_RESOLUTION
-#include "geoipmanager.h"
+#include "core/net/geoipmanager.h"
 #endif
 
 #include "core/utils/misc.h"
@@ -141,10 +141,6 @@ Session::Session(QObject *parent)
     , m_globalMaxRatio(-1)
     , m_numResumeData(0)
     , m_extraLimit(0)
-#ifndef DISABLE_COUNTRIES_RESOLUTION
-    , m_geoipDBLoaded(false)
-    , m_resolveCountries(false)
-#endif
     , m_appendLabelToSavePath(false)
     , m_appendExtension(false)
     , m_refreshInterval(0)
@@ -252,13 +248,6 @@ bool Session::useAppendLabelToSavePath() const
     return m_appendLabelToSavePath;
 }
 
-#ifndef DISABLE_COUNTRIES_RESOLUTION
-bool Session::isResolveCountriesEnabled() const
-{
-    return m_resolveCountries;
-}
-#endif
-
 QString Session::defaultSavePath() const
 {
     return m_defaultSavePath;
@@ -577,25 +566,6 @@ void Session::configure()
         delete m_bwScheduler;
     }
 
-#ifndef DISABLE_COUNTRIES_RESOLUTION
-    // Resolve countries
-    qDebug("Loading country resolution settings");
-    const bool new_resolv_countries = pref->resolvePeerCountries();
-    if (m_resolveCountries != new_resolv_countries) {
-        qDebug("in country resolution settings");
-        m_resolveCountries = new_resolv_countries;
-        if (m_resolveCountries && !m_geoipDBLoaded) {
-            qDebug("Loading geoip database");
-            GeoIPManager::loadDatabase(m_nativeSession);
-            m_geoipDBLoaded = true;
-        }
-
-        // Update torrent handles
-        foreach (TorrentHandlePrivate *const torrent, m_torrents)
-            torrent->handleResolveCountriesToggled();
-    }
-#endif
-
     Logger* const logger = Logger::instance();
 
     // * Session settings