Browse Source

Fix to last commit

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
828ecb6b3c
  1. 14
      src/misc.cpp
  2. 3
      src/misc.h
  3. 4
      src/searchengine.cpp

14
src/misc.cpp

@ -363,6 +363,20 @@ void misc::copyDir(QString src_path, QString dst_path) {
} }
} }
void misc::chmod644(const QDir& folder) {
qDebug("chmod644(%s)", qPrintable(folder.absolutePath()));
if(!folder.exists()) return;
foreach(const QFileInfo &fi, folder.entryInfoList(QDir::Dirs|QDir::Files|QDir::NoSymLinks)) {
if(fi.fileName().startsWith(".")) continue;
if(fi.isDir()) {
misc::chmod644(QDir(fi.absoluteFilePath()));
} else {
QFile f(fi.absoluteFilePath());
f.setPermissions(f.permissions()|QFile::ReadUser|QFile::WriteUser|QFile::ReadGroup|QFile::ReadOther);
}
}
}
QString misc::updateLabelInSavePath(const QString& defaultSavePath, QString save_path, const QString old_label, const QString new_label) { QString misc::updateLabelInSavePath(const QString& defaultSavePath, QString save_path, const QString old_label, const QString new_label) {
if(old_label == new_label) return save_path; if(old_label == new_label) return save_path;
qDebug("UpdateLabelInSavePath(%s, %s, %s)", qPrintable(save_path), qPrintable(old_label), qPrintable(new_label)); qDebug("UpdateLabelInSavePath(%s, %s, %s)", qPrintable(save_path), qPrintable(old_label), qPrintable(new_label));

3
src/misc.h

@ -40,6 +40,7 @@
#include <boost/date_time/posix_time/conversion.hpp> #include <boost/date_time/posix_time/conversion.hpp>
#include <QPoint> #include <QPoint>
#include <QFile> #include <QFile>
#include <QDir>
#include <libtorrent/torrent_info.hpp> #include <libtorrent/torrent_info.hpp>
#include <libtorrent/torrent_handle.hpp> #include <libtorrent/torrent_handle.hpp>
@ -75,6 +76,8 @@ public:
return QString(o.str().c_str()); return QString(o.str().c_str());
} }
static void chmod644(const QDir& folder);
static inline QString removeLastPathPart(QString path) { static inline QString removeLastPathPart(QString path) {
if(path.isEmpty()) return path; if(path.isEmpty()) return path;
path = path.replace("\\", "/"); path = path.replace("\\", "/");

4
src/searchengine.cpp

@ -549,6 +549,10 @@ void SearchEngine::updateNova() {
} }
} }
} }
#ifndef Q_WS_WIN
// Fix permissions
misc::chmod644(QDir(misc::searchEngineLocation()));
#endif
} }
// Slot called when search is Finished // Slot called when search is Finished

Loading…
Cancel
Save