diff --git a/dist/windows/options.nsi b/dist/windows/options.nsi index 450c987328e..a0ad9ba7cfd 100644 --- a/dist/windows/options.nsi +++ b/dist/windows/options.nsi @@ -19,7 +19,7 @@ XPStyle on !define CSIDL_APPDATA '0x1A' ;Application Data path !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path -!define PROG_VERSION "3.3.11.4" +!define PROG_VERSION "3.3.11.5" !define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt) diff --git a/dist/windows/qbittorrent.nsi b/dist/windows/qbittorrent.nsi new file mode 100644 index 00000000000..a5b9509cede --- /dev/null +++ b/dist/windows/qbittorrent.nsi @@ -0,0 +1,4 @@ +!include options.nsi +!include translations.nsi +!include installer.nsi +!include uninstaller.nsi diff --git a/dist/windows/translations/qt_ar.qm b/dist/windows/translations/qt_ar.qm deleted file mode 100644 index 372c1ab8fac..00000000000 Binary files a/dist/windows/translations/qt_ar.qm and /dev/null differ diff --git a/dist/windows/translations/qt_bg.qm b/dist/windows/translations/qt_bg.qm deleted file mode 100644 index 2cab8a1bf8b..00000000000 Binary files a/dist/windows/translations/qt_bg.qm and /dev/null differ diff --git a/dist/windows/translations/qt_ca.qm b/dist/windows/translations/qt_ca.qm deleted file mode 100644 index b9d29a1e0ce..00000000000 Binary files a/dist/windows/translations/qt_ca.qm and /dev/null differ diff --git a/dist/windows/translations/qt_cs.qm b/dist/windows/translations/qt_cs.qm deleted file mode 100644 index b04e24c6d66..00000000000 Binary files a/dist/windows/translations/qt_cs.qm and /dev/null differ diff --git a/dist/windows/translations/qt_da.qm b/dist/windows/translations/qt_da.qm deleted file mode 100644 index d198c7fd091..00000000000 Binary files a/dist/windows/translations/qt_da.qm and /dev/null differ diff --git a/dist/windows/translations/qt_de.qm b/dist/windows/translations/qt_de.qm deleted file mode 100644 index 3650eec5976..00000000000 Binary files a/dist/windows/translations/qt_de.qm and /dev/null differ diff --git a/dist/windows/translations/qt_es.qm b/dist/windows/translations/qt_es.qm deleted file mode 100644 index 7f721facaa2..00000000000 Binary files a/dist/windows/translations/qt_es.qm and /dev/null differ diff --git a/dist/windows/translations/qt_eu.qm b/dist/windows/translations/qt_eu.qm deleted file mode 100644 index 44beb43380a..00000000000 Binary files a/dist/windows/translations/qt_eu.qm and /dev/null differ diff --git a/dist/windows/translations/qt_fa.qm b/dist/windows/translations/qt_fa.qm deleted file mode 100644 index 0968c5d4ebc..00000000000 Binary files a/dist/windows/translations/qt_fa.qm and /dev/null differ diff --git a/dist/windows/translations/qt_fi.qm b/dist/windows/translations/qt_fi.qm deleted file mode 100644 index c7846764846..00000000000 Binary files a/dist/windows/translations/qt_fi.qm and /dev/null differ diff --git a/dist/windows/translations/qt_fr.qm b/dist/windows/translations/qt_fr.qm deleted file mode 100644 index d40706bfa17..00000000000 Binary files a/dist/windows/translations/qt_fr.qm and /dev/null differ diff --git a/dist/windows/translations/qt_gl.qm b/dist/windows/translations/qt_gl.qm deleted file mode 100644 index 4f7e3c433f0..00000000000 Binary files a/dist/windows/translations/qt_gl.qm and /dev/null differ diff --git a/dist/windows/translations/qt_he.qm b/dist/windows/translations/qt_he.qm deleted file mode 100644 index 04da4c9fa71..00000000000 Binary files a/dist/windows/translations/qt_he.qm and /dev/null differ diff --git a/dist/windows/translations/qt_hu.qm b/dist/windows/translations/qt_hu.qm deleted file mode 100644 index 0487443235e..00000000000 Binary files a/dist/windows/translations/qt_hu.qm and /dev/null differ diff --git a/dist/windows/translations/qt_it.qm b/dist/windows/translations/qt_it.qm deleted file mode 100644 index a4b9f255963..00000000000 Binary files a/dist/windows/translations/qt_it.qm and /dev/null differ diff --git a/dist/windows/translations/qt_ja.qm b/dist/windows/translations/qt_ja.qm deleted file mode 100644 index 99648eaa53a..00000000000 Binary files a/dist/windows/translations/qt_ja.qm and /dev/null differ diff --git a/dist/windows/translations/qt_ko.qm b/dist/windows/translations/qt_ko.qm deleted file mode 100644 index c01c33b7346..00000000000 Binary files a/dist/windows/translations/qt_ko.qm and /dev/null differ diff --git a/dist/windows/translations/qt_lt.qm b/dist/windows/translations/qt_lt.qm deleted file mode 100644 index 8a2255325fe..00000000000 Binary files a/dist/windows/translations/qt_lt.qm and /dev/null differ diff --git a/dist/windows/translations/qt_nl.qm b/dist/windows/translations/qt_nl.qm deleted file mode 100644 index ce9f56f47ce..00000000000 Binary files a/dist/windows/translations/qt_nl.qm and /dev/null differ diff --git a/dist/windows/translations/qt_pl.qm b/dist/windows/translations/qt_pl.qm deleted file mode 100644 index c2ea0947bfc..00000000000 Binary files a/dist/windows/translations/qt_pl.qm and /dev/null differ diff --git a/dist/windows/translations/qt_pt.qm b/dist/windows/translations/qt_pt.qm deleted file mode 100644 index 9ac3b08d965..00000000000 Binary files a/dist/windows/translations/qt_pt.qm and /dev/null differ diff --git a/dist/windows/translations/qt_pt_BR.qm b/dist/windows/translations/qt_pt_BR.qm deleted file mode 100644 index 4bafaad2e02..00000000000 Binary files a/dist/windows/translations/qt_pt_BR.qm and /dev/null differ diff --git a/dist/windows/translations/qt_ru.qm b/dist/windows/translations/qt_ru.qm deleted file mode 100644 index d54bae8eb3a..00000000000 Binary files a/dist/windows/translations/qt_ru.qm and /dev/null differ diff --git a/dist/windows/translations/qt_sk.qm b/dist/windows/translations/qt_sk.qm deleted file mode 100644 index 9e8f8622d00..00000000000 Binary files a/dist/windows/translations/qt_sk.qm and /dev/null differ diff --git a/dist/windows/translations/qt_sl.qm b/dist/windows/translations/qt_sl.qm deleted file mode 100644 index 2575b3fab4b..00000000000 Binary files a/dist/windows/translations/qt_sl.qm and /dev/null differ diff --git a/dist/windows/translations/qt_sv.qm b/dist/windows/translations/qt_sv.qm deleted file mode 100644 index 294ae141cc1..00000000000 Binary files a/dist/windows/translations/qt_sv.qm and /dev/null differ diff --git a/dist/windows/translations/qt_tr.qm b/dist/windows/translations/qt_tr.qm deleted file mode 100644 index b0d14e9ff66..00000000000 Binary files a/dist/windows/translations/qt_tr.qm and /dev/null differ diff --git a/dist/windows/translations/qt_uk.qm b/dist/windows/translations/qt_uk.qm deleted file mode 100644 index 2d9dabc61b1..00000000000 Binary files a/dist/windows/translations/qt_uk.qm and /dev/null differ diff --git a/dist/windows/translations/qt_zh_CN.qm b/dist/windows/translations/qt_zh_CN.qm deleted file mode 100644 index d6f3648ff65..00000000000 Binary files a/dist/windows/translations/qt_zh_CN.qm and /dev/null differ diff --git a/dist/windows/translations/qt_zh_TW.qm b/dist/windows/translations/qt_zh_TW.qm deleted file mode 100644 index b391a6b69b8..00000000000 Binary files a/dist/windows/translations/qt_zh_TW.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_ca.qm b/dist/windows/translations/qtbase_ca.qm deleted file mode 100644 index 7c7cf0b8234..00000000000 Binary files a/dist/windows/translations/qtbase_ca.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_cs.qm b/dist/windows/translations/qtbase_cs.qm deleted file mode 100644 index 1dca943f3eb..00000000000 Binary files a/dist/windows/translations/qtbase_cs.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_de.qm b/dist/windows/translations/qtbase_de.qm deleted file mode 100644 index d73d2203227..00000000000 Binary files a/dist/windows/translations/qtbase_de.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_fi.qm b/dist/windows/translations/qtbase_fi.qm deleted file mode 100644 index 980e087c35a..00000000000 Binary files a/dist/windows/translations/qtbase_fi.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_fr.qm b/dist/windows/translations/qtbase_fr.qm deleted file mode 100644 index 8353f0a934a..00000000000 Binary files a/dist/windows/translations/qtbase_fr.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_he.qm b/dist/windows/translations/qtbase_he.qm deleted file mode 100644 index 0ac1ed22079..00000000000 Binary files a/dist/windows/translations/qtbase_he.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_hu.qm b/dist/windows/translations/qtbase_hu.qm deleted file mode 100644 index 4b67de34ed5..00000000000 Binary files a/dist/windows/translations/qtbase_hu.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_it.qm b/dist/windows/translations/qtbase_it.qm deleted file mode 100644 index 4c76a0b1547..00000000000 Binary files a/dist/windows/translations/qtbase_it.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_ja.qm b/dist/windows/translations/qtbase_ja.qm deleted file mode 100644 index 74409b1a5a2..00000000000 Binary files a/dist/windows/translations/qtbase_ja.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_ko.qm b/dist/windows/translations/qtbase_ko.qm deleted file mode 100644 index f960d8ac450..00000000000 Binary files a/dist/windows/translations/qtbase_ko.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_lv.qm b/dist/windows/translations/qtbase_lv.qm deleted file mode 100644 index c1dbfbd2e9f..00000000000 Binary files a/dist/windows/translations/qtbase_lv.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_pl.qm b/dist/windows/translations/qtbase_pl.qm deleted file mode 100644 index 021088e4f88..00000000000 Binary files a/dist/windows/translations/qtbase_pl.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_ru.qm b/dist/windows/translations/qtbase_ru.qm deleted file mode 100644 index a11b7c75a6a..00000000000 Binary files a/dist/windows/translations/qtbase_ru.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_sk.qm b/dist/windows/translations/qtbase_sk.qm deleted file mode 100644 index 5f6b2f33c8b..00000000000 Binary files a/dist/windows/translations/qtbase_sk.qm and /dev/null differ diff --git a/dist/windows/translations/qtbase_uk.qm b/dist/windows/translations/qtbase_uk.qm deleted file mode 100644 index 7d588e99f3f..00000000000 Binary files a/dist/windows/translations/qtbase_uk.qm and /dev/null differ diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 681c68bd2e3..7ba76e425f5 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -1413,13 +1413,15 @@ void Session::removeBannedIP(const QString &ip) void Session::EraseIPFilter() { m_nativeSession->set_ip_filter(libt::ip_filter()); - processBannedIPs(); + disableIPFilter(); + enableIPFilter(); } void Session::AutoEraseIPFilter() { m_nativeSession->set_ip_filter(libt::ip_filter()); - processBannedIPs(); + disableIPFilter(); + enableIPFilter(); Logger::instance()->addMessage(tr("[Task Scheduler] IP Filter erased."), Log::INFO); } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 77cf79b1c5b..8131cc1dfb6 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1359,44 +1359,39 @@ void MainWindow::updateGUI() QString pid = peer.pid().left(8); QString country = peer.country(); - if(client >= "0.0.0.0" && client <= "9.99.99.9999" || client.contains("Xunlei") || client.contains("XL") || pid.contains("-XL") || pid.contains("-SD")) { - qDebug("Auto Banning Xunlei peer %s...", ip.toLocal8Bit().data()); - Logger::instance()->addMessage(tr("Auto banning Xunlei peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); + if (client >= "0.0.0.0" && client <= "9.99.99.9999" || client.contains("Xunlei") || client.contains("XL") || pid.contains("-XL") || pid.contains("-SD")) { + qDebug("Auto Banning Xunlei Peer %s...", ip.toLocal8Bit().data()); + Logger::instance()->addMessage(tr("Auto banning Xunlei Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); BitTorrent::Session::instance()->blockIP(ip); continue; } - if(client.contains("Xf") || pid.contains("-XF")) { - qDebug("Auto Banning Xfplay peer %s...", ip.toLocal8Bit().data()); - Logger::instance()->addMessage(tr("Auto banning Xfplay peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); + if (client.contains("Xf") || pid.contains("-XF")) { + qDebug("Auto Banning Xfplay Peer %s...", ip.toLocal8Bit().data()); + Logger::instance()->addMessage(tr("Auto banning Xfplay Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); BitTorrent::Session::instance()->blockIP(ip); continue; } - if(client.contains("QQ") || pid.contains("-QD")) - { - qDebug("Auto Banning QQDownload peer %s...", ip.toLocal8Bit().data()); - Logger::instance()->addMessage(tr("Auto banning QQDownload peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); + if (client.contains("QQ") || pid.contains("-QD")) { + qDebug("Auto Banning QQDownload Peer %s...", ip.toLocal8Bit().data()); + Logger::instance()->addMessage(tr("Auto banning QQDownload Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); BitTorrent::Session::instance()->blockIP(ip); continue; } - if(client.contains("Baidu") || pid.contains("-BD")) - { - qDebug("Auto Banning Baidu peer %s...", ip.toLocal8Bit().data()); - Logger::instance()->addMessage(tr("Auto banning Baidu peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); + if (client.contains("Baidu") || pid.contains("-BN")) { + qDebug("Auto Banning Baidu Peer %s...", ip.toLocal8Bit().data()); + Logger::instance()->addMessage(tr("Auto banning Baidu Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); BitTorrent::Session::instance()->blockIP(ip); continue; } - - if(client.contains("Unknown")) - { - if(m_AutoBan && country == "CN") { - qDebug("Auto Banning Unknown peer %s...", ip.toLocal8Bit().data()); - Logger::instance()->addMessage(tr("Auto banning Unknown peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); - BitTorrent::Session::instance()->banIP(ip); - continue; + if(m_AutoBan) { + if(client.contains("Unknown") && country == "CN") { + qDebug("Auto Banning Unknown Peer %s...", ip.toLocal8Bit().data()); + Logger::instance()->addMessage(tr("Auto banning Unknown Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); + BitTorrent::Session::instance()->blockIP(ip); } } diff --git a/version.pri b/version.pri index 18a0fa975ec..4c3d62b531b 100644 --- a/version.pri +++ b/version.pri @@ -4,7 +4,7 @@ PROJECT_NAME = qbittorrent VER_MAJOR = 3 VER_MINOR = 3 VER_BUGFIX = 11 -VER_BUILD = 4 +VER_BUILD = 5 VER_STATUS = # Should be empty for stable releases! # Don't touch the rest part