Include GeoIP database for country look-ups

2008-09-19 20:11:50 +00:00 · 2008-09-19 20:11:50 +00:00 · a0f90acfc8
commit a0f90acfc8
parent 34d34b785c
4 changed files with 9 additions and 0 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Deluge 0.9.10 - "1.0.0_RC10" (In Development)
+ Core:
+  * Include GeoIP database for country look-ups
+
 Deluge 0.9.09 - "1.0.0_RC9" (15 September 2008)
 Core:
  * Bug fixes in libtorrent including a crash when the tracker doesn't
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@ -212,6 +212,10 @@ class Core(
        # Set the user agent
        self.settings = lt.session_settings()
        self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
+
+        # Load the GeoIP DB for country look-ups
+        self.session.load_country_db(
+            pkg_resources.resource_filename("deluge", os.path.join("data", "GeoIP.dat")))
        
        # Set session settings
        self.settings.lazy_bitfields = 1
--- a/deluge/data/GeoIP.dat
+++ b/deluge/data/GeoIP.dat
--- a/setup.py
+++ b/setup.py
@ -311,6 +311,7 @@ setup(
                                "data/pixmaps/*.ico",
                                "data/pixmaps/flags/*.png",
                                "data/revision",
+                                "data/GeoIP.dat",
                                "plugins/*.egg",
                                "i18n/*.pot",
                                "i18n/*/LC_MESSAGES/*.mo",