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 2020-12-11 11:37:19.450009584 -0600
+++ ./plugins/infowidget/geoipmanager.cpp 2020-12-11 11:39:48.834012926 -0600
@@ -42,7 +42,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"));
@@ -53,11 +53,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
@@ -101,12 +96,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)
|
