summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
blob: cf6d114c71cba3d98b2656ce0e88c7cdc3e7b2cb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
--- ./plugins/infowidget/geoipmanager.cpp.orig	2021-04-14 10:30:03.000000000 -0500
+++ ./plugins/infowidget/geoipmanager.cpp	2021-04-22 14:25:11.954202268 -0500
@@ -45,7 +45,7 @@
 #ifdef USE_SYSTEM_GEOIP
     geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
 #else
-    geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("geoip.dat"));
+    geoip_data_file = QStringLiteral("/usr/share/apps/ktorrent/GeoIP/geoip.dat");
     if (geoip_data_file.isEmpty())
         geoip_data_file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("GeoIP.dat"));
 
@@ -56,11 +56,6 @@
         if (geo_ip) {
             QFileInfo fi(geoip_data_file);
             QDateTime now = QDateTime::currentDateTime();
-            if (fi.lastModified().daysTo(now) >= 30) {
-                // if the last time the geoip file was modified, was more then
-                // 30 days ago, redownload it
-                downloadDataBase();
-            }
         }
     }
 #endif
@@ -104,12 +99,6 @@
 
 void GeoIPManager::downloadDataBase()
 {
-#ifndef USE_SYSTEM_GEOIP
-    Out(SYS_INW | LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url << endl;
-    download_destination = kt::DataDir(CreateIfNotExists) + geoip_url.fileName();
-    KIO::CopyJob *job = KIO::copy(geoip_url, QUrl::fromLocalFile(download_destination), KIO::Overwrite | KIO::HideProgressInfo);
-    connect(job, &KIO::CopyJob::result, this, &GeoIPManager::databaseDownloadFinished);
-#endif
 }
 
 void GeoIPManager::databaseDownloadFinished(KJob *job)