add alias to folder

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);
         }

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;

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:
 

src/mirall/folderwizard.cpp

@@ -15,6 +15,7 @@ FolderWizardSourcePage::FolderWizardSourcePage()
 {
     _ui.setupUi(this);
     registerField("*sourceFolder", _ui.localFolderLineEdit);
+    registerField("*alias", _ui.aliasFolderLineEdit);
 }
 
 FolderWizardSourcePage::~FolderWizardSourcePage()

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();

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();

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)

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;

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)