From c19c9859e36aa6d37071558803771eb8f7a201ff Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Wed, 6 Apr 2011 09:52:02 +0200 Subject: [PATCH] add alias to folder --- src/mirall/application.cpp | 3 ++- src/mirall/folder.cpp | 10 ++++++++-- src/mirall/folder.h | 8 +++++++- src/mirall/folderwizard.cpp | 1 + src/mirall/gitfolder.cpp | 7 +++++-- src/mirall/gitfolder.h | 4 +++- src/mirall/unisonfolder.cpp | 7 +++++-- src/mirall/unisonfolder.h | 4 +++- test/testunisonfolder.cpp | 8 ++++---- 9 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp index 173a9f80e3..3530c6d5f8 100644 --- a/src/mirall/application.cpp +++ b/src/mirall/application.cpp @@ -144,7 +144,8 @@ void Application::setupFolderFromConfigFile(const QString &file) { if (!backend.isNull()) { if (backend.toString() == "unison") { - folder = new UnisonFolder(path.toString(), + folder = new UnisonFolder(file, + path.toString(), settings.value("backend:unison/secondPath").toString(), this); } diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 1dcdd717fa..7d2f78f037 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -14,11 +14,12 @@ namespace Mirall { -Folder::Folder(const QString &path, QObject *parent) +Folder::Folder(const QString &alias, const QString &path, QObject *parent) : QObject(parent), _path(path), _pollTimer(new QTimer(this)), - _pollInterval(DEFAULT_POLL_INTERVAL_SEC) + _pollInterval(DEFAULT_POLL_INTERVAL_SEC), + _alias(alias) { _openAction = new QAction(QIcon(FOLDER_ICON), path, this); _openAction->setIconVisibleInMenu(true); @@ -51,6 +52,11 @@ Folder::~Folder() { } +QString Folder::alias() const +{ + return _alias; +} + QString Folder::path() const { return _path; diff --git a/src/mirall/folder.h b/src/mirall/folder.h index 2f916f54ab..a0d7594c5c 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -17,9 +17,14 @@ class Folder : public QObject Q_OBJECT public: - Folder(const QString &path, QObject *parent = 0L); + Folder(const QString &alias, const QString &path, QObject *parent = 0L); virtual ~Folder(); + /** + * alias or nickname + */ + QString alias() const; + /** * local folder path */ @@ -72,6 +77,7 @@ private: // poll timer for remote syncs QTimer *_pollTimer; int _pollInterval; + QString _alias; protected slots: diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp index 53f0b8b1c9..628f6bfd77 100644 --- a/src/mirall/folderwizard.cpp +++ b/src/mirall/folderwizard.cpp @@ -15,6 +15,7 @@ FolderWizardSourcePage::FolderWizardSourcePage() { _ui.setupUi(this); registerField("*sourceFolder", _ui.localFolderLineEdit); + registerField("*alias", _ui.aliasFolderLineEdit); } FolderWizardSourcePage::~FolderWizardSourcePage() diff --git a/src/mirall/gitfolder.cpp b/src/mirall/gitfolder.cpp index 0dec2b295e..671f1ad00c 100644 --- a/src/mirall/gitfolder.cpp +++ b/src/mirall/gitfolder.cpp @@ -4,8 +4,11 @@ namespace Mirall { -GitFolder::GitFolder(const QString &path, const QString &remote, QObject *parent) - : Folder(path, parent) + GitFolder::GitFolder(const QString &alias, + const QString &path, + const QString &remote, + QObject *parent) + : Folder(alias, path, parent) , _remote(remote) { _syncProcess = new QProcess(); diff --git a/src/mirall/gitfolder.h b/src/mirall/gitfolder.h index e334e3d7ed..ad63fa534e 100644 --- a/src/mirall/gitfolder.h +++ b/src/mirall/gitfolder.h @@ -16,7 +16,9 @@ public: * path : Local folder to be keep in sync * remote: git repo url to sync from/to */ - GitFolder(const QString &path, const QString &remote, QObject *parent = 0L); + GitFolder(const QString &alias, + const QString &path, + const QString &remote, QObject *parent = 0L); virtual ~GitFolder(); virtual void startSync(); diff --git a/src/mirall/unisonfolder.cpp b/src/mirall/unisonfolder.cpp index 828a1ce8a0..0f1b3f6d53 100644 --- a/src/mirall/unisonfolder.cpp +++ b/src/mirall/unisonfolder.cpp @@ -8,8 +8,11 @@ namespace Mirall { -UnisonFolder::UnisonFolder(const QString &path, const QString &secondPath, QObject *parent) - : Folder(path, parent), + UnisonFolder::UnisonFolder(const QString &alias, + const QString &path, + const QString &secondPath, + QObject *parent) + : Folder(alias, path, parent), _unison(new QProcess(this)), _secondPath(secondPath), _syncCount(0) diff --git a/src/mirall/unisonfolder.h b/src/mirall/unisonfolder.h index 8d6a8ba109..07295798fb 100644 --- a/src/mirall/unisonfolder.h +++ b/src/mirall/unisonfolder.h @@ -15,7 +15,9 @@ class UnisonFolder : public Folder { Q_OBJECT public: - UnisonFolder(const QString &path, const QString &secondPath, QObject *parent = 0L); + UnisonFolder(const QString &alias, + const QString &path, + const QString &secondPath, QObject *parent = 0L); virtual ~UnisonFolder(); QString secondPath() const; diff --git a/test/testunisonfolder.cpp b/test/testunisonfolder.cpp index 82f61eb2b6..1bf297a5d8 100644 --- a/test/testunisonfolder.cpp +++ b/test/testunisonfolder.cpp @@ -15,12 +15,10 @@ void TestUnisonFolder::initTestCase() { - Mirall::INotify::initialize(); } void TestUnisonFolder::cleanupTestCase() { - Mirall::INotify::cleanup(); } void TestUnisonFolder::testSyncFiles() @@ -30,13 +28,15 @@ void TestUnisonFolder::testSyncFiles() qDebug() << tmp1.path() << tmp2.path(); - - Mirall::UnisonFolder folder(tmp1.path(), tmp2.path(), this); + Mirall::INotify::initialize(); + Mirall::UnisonFolder folder("alias", tmp1.path(), tmp2.path(), this); // create a directory in the first QDir(tmp1.path()).mkdir("foo"); QTest::qWait(1000); QVERIFY(QDir(tmp2.path() + "/foo").exists()); + + Mirall::INotify::cleanup(); } QTEST_MAIN(TestUnisonFolder)