mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-28 21:38:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14676 from Chocobo1/watcher

Browse source 
Revise folder monitoring functions in WebUI
This commit is contained in:
Chocobo1 2021-04-03 13:19:29 +08:00 committed by GitHub
commit 0b3d088782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/base/filesystemwatcher.cpp
View file

@ -30,6 +30,8 @@
#include <QtGlobal>
#include <chrono>
#if defined(Q_OS_MACOS) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
#include <cstring>
#include <sys/mount.h>
@ -42,9 +44,11 @@
#include "base/logger.h"
#include "base/utils/fs.h"
using namespace std::chrono_literals;
namespace
{
const int WATCH_INTERVAL = 10000; // 10 sec
const std::chrono::duration WATCH_INTERVAL = 10s;
const int MAX_PARTIAL_RETRIES = 5;
}

6
src/base/filesystemwatcher.h
View file

@ -31,7 +31,6 @@
#include <QDir>
#include <QFileSystemWatcher>
#include <QHash>
#include <QtContainerFwd>
#include <QTimer>
#include <QVector>
@ -39,9 +38,10 @@
* Subclassing QFileSystemWatcher in order to support Network File
* System watching (NFS, CIFS) on Linux and Mac OS.
*/
class FileSystemWatcher : public QFileSystemWatcher
class FileSystemWatcher final : public QFileSystemWatcher
{
Q_OBJECT
Q_DISABLE_COPY(FileSystemWatcher)
public:
explicit FileSystemWatcher(QObject *parent = nullptr);
@ -53,7 +53,7 @@ public:
signals:
void torrentsAdded(const QStringList &pathList);
protected slots:
private slots:
void scanLocalFolder(const QString &path);
void processPartialTorrents();
void scanNetworkFolders();

33
src/webui/api/appcontroller.cpp
View file

@ -394,15 +394,14 @@ void AppController::setPreferencesAction()
if (hasKey("scan_dirs"))
{
const QVariantHash nativeDirs = it.value().toHash();
QVariantHash oldScanDirs = pref->getScanDirs();
const QVariantHash oldScanDirs = pref->getScanDirs();
QVariantHash scanDirs;
ScanFoldersModel *model = ScanFoldersModel::instance();
for (auto i = nativeDirs.cbegin(); i != nativeDirs.cend(); ++i)
{
QString folder = Utils::Fs::toUniformPath(i.key());
int downloadType;
int downloadType = 0;
QString downloadPath;
ScanFoldersModel::PathStatus ec;
if (i.value().type() == QVariant::String)
{
downloadType = ScanFoldersModel::CUSTOM_LOCATION;
@ -411,23 +410,17 @@ void AppController::setPreferencesAction()
else
{
downloadType = i.value().toInt();
downloadPath = (downloadType == ScanFoldersModel::DEFAULT_LOCATION) ? "Default folder" : "Watch folder";
downloadPath = (downloadType == ScanFoldersModel::DEFAULT_LOCATION)
? QLatin1String("Default folder")
: QLatin1String("Watch folder");
}
if (!oldScanDirs.contains(folder))
ec = model->addPath(folder, static_cast<ScanFoldersModel::PathType>(downloadType), downloadPath);
else
ec = model->updatePath(folder, static_cast<ScanFoldersModel::PathType>(downloadType), downloadPath);
const QString folder = Utils::Fs::toUniformPath(i.key());
const ScanFoldersModel::PathStatus ec = !oldScanDirs.contains(folder)
? model->addPath(folder, static_cast<ScanFoldersModel::PathType>(downloadType), downloadPath)
: model->updatePath(folder, static_cast<ScanFoldersModel::PathType>(downloadType), downloadPath);
if (ec == ScanFoldersModel::Ok)
{
scanDirs.insert(folder, (downloadType == ScanFoldersModel::CUSTOM_LOCATION) ? QVariant(downloadPath) : QVariant(downloadType));
qDebug("New watched folder: %s to %s", qUtf8Printable(folder), qUtf8Printable(downloadPath));
}
else
{
qDebug("Watched folder %s failed with error %d", qUtf8Printable(folder), ec);
}
scanDirs.insert(folder, ((downloadType == ScanFoldersModel::CUSTOM_LOCATION) ? QVariant(downloadPath) : QVariant(downloadType)));
}
// Update deleted folders
@ -435,11 +428,9 @@ void AppController::setPreferencesAction()
{
const QString &folder = i.key();
if (!scanDirs.contains(folder))
{
model->removePath(folder);
qDebug("Removed watched folder %s", qUtf8Printable(folder));
}
}
pref->setScanDirs(scanDirs);
}
// Email notification upon download completion

91
src/webui/www/private/views/preferences.html
View file

@ -127,22 +127,6 @@
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr>
<td style="padding-top:4px;"><input type="text" id="new_watch_folder_txt" autocorrect="off" autocapitalize="none" /></td>
<td style="padding-top:4px;">
<div class="select-watched-folder-editable">
<select id="new_watch_folder_select" onchange="qBittorrent.Preferences.changeWatchFolderSelect(this)">
<option value="watch_folder">QBT_TR(Monitored folder)QBT_TR[CONTEXT=ScanFoldersModel]</option>
<option selected value="default_folder">QBT_TR(Default save location)QBT_TR[CONTEXT=ScanFoldersModel]</option>
<option value="other">QBT_TR(Other...)QBT_TR[CONTEXT=HttpServer]</option>
</select>
<input id="new_watch_folder_other_txt" type="text" value="QBT_TR(Monitored folder)QBT_TR[CONTEXT=ScanFoldersModel]" hidden />
<img src="icons/list-add.svg" alt="Add" style="padding-left:170px;width:16px;cursor:pointer;" onclick="qBittorrent.Preferences.addWatchFolder();" />
</div>
</td>
</tr>
</tfoot>
</table>
</fieldset>
@ -1283,37 +1267,17 @@
};
// Downloads tab
const WatchedFoldersTable = new HtmlTable($("watched_folders_tab"));
const watchedFoldersTable = new HtmlTable($("watched_folders_tab"));
const updateTempDirEnabled = function() {
const isTempDirEnabled = $('temppath_checkbox').getProperty('checked');
$('temppath_text').setProperty('disabled', !isTempDirEnabled);
};
const addWatchFolder = function() {
const new_folder = $('new_watch_folder_txt').getProperty('value').trim();
if (new_folder.length <= 0) return;
const new_other = $('new_watch_folder_other_txt').getProperty('value').trim();
if (new_other.length <= 0) return;
const new_select = $('new_watch_folder_select').getProperty('value').trim();
const i = $('watched_folders_tab').getChildren('tbody')[0].getChildren('tr').length;
pushWatchFolder(i, new_folder, new_select, new_other);
// Clear fields
$('new_watch_folder_txt').setProperty('value', '');
const elt = $('new_watch_folder_select');
elt.setProperty('value', 'watch_folder');
const text = elt.options[elt.selectedIndex].innerHTML;
$('new_watch_folder_other_txt').setProperty('value', text);
};
const changeWatchFolderSelect = function(item) {
if (item.value == "other") {
const changeWatchFolderSelect = (item) => {
if (item.value === "other") {
item.nextElementSibling.hidden = false;
item.nextElementSibling.value = 'QBT_TR(Type folder here)QBT_TR[CONTEXT=HttpServer]';
item.nextElementSibling.value = 'QBT_TR(Type folder here)QBT_TR[CONTEXT=ScanFoldersModel]';
item.nextElementSibling.select();
}
else {
@ -1323,40 +1287,47 @@
}
};
const pushWatchFolder = function(pos, folder, sel, other) {
const addWatchFolder = (folder = "", sel = "default_folder", other = "") => {
const pos = $('watched_folders_tab').getChildren('tbody')[0].getChildren('tr').length;
const myinput = "<input id='text_watch_" + pos + "' type='text' value='" + folder + "'>";
const disableInput = (sel != "other");
const disableInput = (sel !== "other");
const mycb = "<div class='select-watched-folder-editable'>"
+ "<select id ='cb_watch_" + pos + "' onchange='qBittorrent.Preferences.changeWatchFolderSelect(this)'>"
+ "<option value='watch_folder'>QBT_TR(Monitored folder)QBT_TR[CONTEXT=ScanFoldersModel]</option>"
+ "<option value='default_folder'>QBT_TR(Default save location)QBT_TR[CONTEXT=ScanFoldersModel]</option>"
+ "<option value='other'>QBT_TR(Other...)QBT_TR[CONTEXT=HttpServer]</option>"
+ "<option value='other'>QBT_TR(Other...)QBT_TR[CONTEXT=ScanFoldersModel]</option>"
+ "</select>"
+ "<input id='cb_watch_txt_" + pos + "' type='text' " + (disableInput ? "hidden " : "") + "/></div>";
+ "<input id='cb_watch_txt_" + pos + "' type='text' " + (disableInput ? "hidden " : "") + "/>"
+ "<img src='icons/list-add.svg' id='addFolderImg_" + pos + "' alt='Add' style='padding-left:170px;width:16px;cursor:pointer;' onclick='qBittorrent.Preferences.addWatchFolder();' />"
+ "</div>";
WatchedFoldersTable.push([myinput, mycb]);
watchedFoldersTable.push([myinput, mycb]);
$('cb_watch_' + pos).setProperty('value', sel);
if (disableInput) {
const elt = $('cb_watch_' + pos);
other = elt.options[elt.selectedIndex].innerHTML;
}
$('cb_watch_txt_' + pos).setProperty('value', other);
// hide previous img
if (pos > 0)
$('addFolderImg_' + (pos - 1)).style.display = "none";
};
const getWatchedFolders = function() {
const getWatchedFolders = () => {
const nb_folders = $("watched_folders_tab").getChildren("tbody")[0].getChildren("tr").length;
const folders = new Hash();
for (let i = 0; i < nb_folders; ++i) {
const fpath = $('text_watch_' + i).getProperty('value').trim();
if (fpath.length > 0) {
let other;
const sel = $('cb_watch_' + i).getProperty('value').trim();
if (sel == "other") {
let other;
if (sel === "other")
other = $('cb_watch_txt_' + i).getProperty('value').trim();
}
else {
other = (sel == "watch_folder") ? 0 : 1;
}
else
other = (sel === "watch_folder") ? 0 : 1;
folders.set(fpath, other);
}
}
@ -1663,19 +1634,19 @@
updateExportDirFinEnabled();
// Automatically add torrents from
let i = 0;
for (const folder in pref.scan_dirs) {
let sel;
for (const [folder, folderType] of Object.entries(pref.scan_dirs)) {
let sel = "";
let other = "";
if (typeof pref.scan_dirs[folder] == "string") {
other = pref.scan_dirs[folder];
sel = "other";
if (typeof folderType === "number") {
sel = (folderType === 0) ? "watch_folder" : "default_folder";
}
else {
sel = (pref.scan_dirs[folder] == 0) ? "watch_folder" : "default_folder";
sel = "other";
other = folderType;
}
pushWatchFolder(i++, folder, sel, other);
addWatchFolder(folder, sel, other);
}
addWatchFolder();
// Email notification upon download completion
$('mail_notification_checkbox').setProperty('checked', pref.mail_notification_enabled);