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

Move helper function to Utils::Fs

Browse source
This commit is contained in:
Chocobo1 2018-03-19 15:32:38 +08:00
parent 1876dbd523
commit bfbd978d3f
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
4 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/base/filesystemwatcher.cpp
View file

@ -28,29 +28,23 @@
#include "filesystemwatcher.h"
#include <QtGlobal>
#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
#include <cstring>
#include <sys/mount.h>
#include <sys/param.h>
#elif !defined Q_OS_WIN && !defined Q_OS_HAIKU
#include <sys/vfs.h>
#endif
#include "algorithm.h"
#include <QtGlobal>
#include "base/algorithm.h"
#include "base/bittorrent/magneturi.h"
#include "base/bittorrent/torrentinfo.h"
#include "base/global.h"
#include "base/preferences.h"
#include "base/utils/fs.h"
namespace
{
// usually defined in /usr/include/linux/magic.h
const unsigned long CIFS_MAGIC_NUMBER = 0xFF534D42;
const unsigned long NFS_SUPER_MAGIC = 0x6969;
const unsigned long SMB_SUPER_MAGIC = 0x517B;
const int WATCH_INTERVAL = 10000; // 10 sec
const int MAX_PARTIAL_RETRIES = 5;
}
@ -88,7 +82,7 @@ void FileSystemWatcher::addPath(const QString &path)
if (!dir.exists()) return;
// Check if the path points to a network file system or not
if (isNetworkFileSystem(path)) {
if (Utils::Fs::isNetworkFileSystem(path)) {
// Network mode
qDebug("Network folder detected: %s", qUtf8Printable(path));
qDebug("Using file polling mode instead of inotify...");
@ -199,28 +193,3 @@ void FileSystemWatcher::processTorrentsInDir(const QDir &dir)
m_partialTorrentTimer->start(WATCH_INTERVAL);
}
}
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
bool FileSystemWatcher::isNetworkFileSystem(const QString &path)
{
QString file = path;
if (!file.endsWith('/'))
file += '/';
file += '.';
struct statfs buf {};
if (statfs(file.toLocal8Bit().constData(), &buf) != 0)
return false;
#ifdef Q_OS_MAC
// XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
return ((strncmp(buf.f_fstypename, "nfs", sizeof(buf.f_fstypename)) == 0)
|| (strncmp(buf.f_fstypename, "cifs", sizeof(buf.f_fstypename)) == 0)
|| (strncmp(buf.f_fstypename, "smbfs", sizeof(buf.f_fstypename)) == 0));
#else
return ((buf.f_type == CIFS_MAGIC_NUMBER)
|| (buf.f_type == NFS_SUPER_MAGIC)
|| (buf.f_type == SMB_SUPER_MAGIC));
#endif
}
#endif

3
src/base/filesystemwatcher.h
View file

@ -64,9 +64,6 @@ protected slots:
private:
void processTorrentsInDir(const QDir &dir);
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
static bool isNetworkFileSystem(const QString &path);
#endif
#ifndef Q_OS_WIN

35
src/base/utils/fs.cpp
View file

@ -31,8 +31,6 @@
#include "fs.h"
#include <cstring>
#include <sys/stat.h>
#include <sys/types.h>
#include <QDebug>
#include <QDir>
@ -42,6 +40,9 @@
#include <QCoreApplication>
#include <QStorageInfo>
#include <sys/stat.h>
#include <sys/types.h>
#if defined(Q_OS_WIN)
#include <Windows.h>
#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
@ -301,3 +302,33 @@ bool Utils::Fs::isRegularFile(const QString &path)
return (st.st_mode & S_IFMT) == S_IFREG;
}
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
bool Utils::Fs::isNetworkFileSystem(const QString &path)
{
QString file = path;
if (!file.endsWith('/'))
file += '/';
file += '.';
struct statfs buf {};
if (statfs(file.toLocal8Bit().constData(), &buf) != 0)
return false;
#ifdef Q_OS_MAC
// XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
return ((strncmp(buf.f_fstypename, "nfs", sizeof(buf.f_fstypename)) == 0)
|| (strncmp(buf.f_fstypename, "cifs", sizeof(buf.f_fstypename)) == 0)
|| (strncmp(buf.f_fstypename, "smbfs", sizeof(buf.f_fstypename)) == 0));
#else
// usually defined in /usr/include/linux/magic.h
const unsigned long CIFS_MAGIC_NUMBER = 0xFF534D42;
const unsigned long NFS_SUPER_MAGIC = 0x6969;
const unsigned long SMB_SUPER_MAGIC = 0x517B;
return ((buf.f_type == CIFS_MAGIC_NUMBER)
|| (buf.f_type == NFS_SUPER_MAGIC)
|| (buf.f_type == SMB_SUPER_MAGIC));
#endif
}
#endif

4
src/base/utils/fs.h
View file

@ -63,6 +63,10 @@ namespace Utils
void removeDirRecursive(const QString &path);
QString tempPath();
#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
bool isNetworkFileSystem(const QString &path);
#endif
}
}