Fix context menu wording.

Signed-off-by: Camila San <hello@camila.codes>

src/gui/accountsettings.cpp

@@ -35,6 +35,7 @@
 #include "filesystem.h"
 #include "clientsideencryptionjobs.h"
 #include "syncresult.h"
+#include "vfs_windows.h"
 
 #include <math.h>
 
@@ -1164,6 +1165,10 @@ void AccountSettings::slotDeleteAccount()
 
     // IMPORTANT: "this" is deleted from this point on. We should probably remove this synchronous
     // .exec() QMessageBox magic above as it recurses into the event loop.
+
+#if defined(Q_OS_WIN)
+    VfsWindows::instance()->unmount();
+#endif
 }
 
 bool AccountSettings::event(QEvent *e)

src/gui/application.cpp

@@ -263,25 +263,19 @@ Application::~Application()
 
     // Remove the account from the account manager so it can be deleted.
     AccountManager::instance()->shutdown();
-#if defined(Q_OS_MAC)
-    if(cont)
-        cont->unmount();
-#endif
 
 #if defined(Q_OS_WIN)
-    Vfs_windows *_Vfs_windows = NULL;
+    VfsWindows::instance()->unmount();
-    _Vfs_windows = Vfs_windows::instance();
+#endif
-    if (_Vfs_windows) {
+
-        qDebug() << Q_FUNC_INFO << " Up drive: " << _Vfs_windows;
+#if defined(Q_OS_MAC)
-        WCHAR DriveLetter = L'X';
+    VfsMacController::instance()->unmount();
-        _Vfs_windows->downDrive(DriveLetter);
-    } else
-        qDebug() << Q_FUNC_INFO << " Bad up drive";
 #endif
 }
 
 void Application::slotAccountStateRemoved(AccountState *accountState)
 {
+    /*
 	if (_cronDeleteOnlineFiles)
     {
         disconnect(_cronDeleteOnlineFiles, SIGNAL(timeout()), this, SLOT(slotDeleteOnlineFiles()));
@@ -289,6 +283,7 @@ void Application::slotAccountStateRemoved(AccountState *accountState)
         delete _cronDeleteOnlineFiles;
         _cronDeleteOnlineFiles = NULL;
     }
+	*/
 
     if (_gui) {
         disconnect(accountState, &AccountState::stateChanged,
@@ -296,21 +291,7 @@ void Application::slotAccountStateRemoved(AccountState *accountState)
         disconnect(accountState->account().data(), &Account::serverVersionChanged,
             _gui.data(), &ownCloudGui::slotTrayMessageIfServerUnsupported);
     }
-#if defined(Q_OS_MAC)
-    if(cont)
-        cont->unmount();
-#endif
 
-#if defined(Q_OS_WIN)
-    Vfs_windows *_Vfs_windows = NULL;
-    _Vfs_windows = Vfs_windows::instance();
-    if (_Vfs_windows) {
-        qDebug() << Q_FUNC_INFO << " Up drive: " << _Vfs_windows;
-        WCHAR DriveLetter = L'X';
-        _Vfs_windows->downDrive(DriveLetter);
-    } else
-        qDebug() << Q_FUNC_INFO << " Bad up drive";
-#endif
     if (_folderManager) {
         disconnect(accountState, &AccountState::stateChanged,
             _folderManager.data(), &FolderMan::slotAccountStateChanged);
@@ -341,42 +322,17 @@ void Application::slotAccountStateAdded(AccountState *accountState)
 
     // Mount the virtual FileSystem.
 #if defined(Q_OS_MAC)
-    ConfigFile cfgFile;
+    QString rootPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/.cachedFiles";
-    cont = new VfsMacController(cfgFile.defaultFileStreamMirrorPath(), cfgFile.defaultFileStreamSyncPath(), accountState, this);
+    QString mountPath = "/Volumes/" + _theme->appName() + "fs";
+    VfsMacController::instance()->initialize(rootPath, mountPath, accountState);
+    VfsMacController::instance()->mount();
 #endif
 
-
 #if defined(Q_OS_WIN)
-    ConfigFile cfgFile;
+    QString rootPath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/cachedFiles/";
-    QDir pathDir(cfgFile.defaultFileStreamMirrorPath());
+    WCHAR mountLetter = L'X';
-    while (!pathDir.exists())
+    VfsWindows::instance()->initialize(rootPath, mountLetter, accountState);
-    {
+    VfsWindows::instance()->mount();
-        qDebug() << "\n dbg_dokan " << Q_FUNC_INFO << " !pathDir.exists() 3-0" << cfgFile.defaultFileStreamMirrorPath();
-        pathDir.mkdir(cfgFile.defaultFileStreamMirrorPath());
-        SetFileAttributes((const wchar_t *) cfgFile.defaultFileStreamMirrorPath().utf16(), FILE_ATTRIBUTE_HIDDEN);
-        Sleep(100);
-    }
-
-    Vfs_windows *_Vfs_windows = NULL;
-    _Vfs_windows = new Vfs_windows(accountState);
-
-    if (_Vfs_windows)
-    {
-        qDebug() << "\n dbg_sync " << Q_FUNC_INFO << " Up drive: " << Vfs_windows::instance();
-        _Vfs_windows->upDrive(cfgFile.defaultFileStreamMirrorPath(), cfgFile.defaultFileStreamLetterDrive());
-        Sleep(1000);
-        cfgFile.createAuxiliarDirectories();
-
-        /* Current owncloudgui::slotLogout */
-        //WCHAR DriveLetter = L'X';
-        //connect(this, SIGNAL(aboutToQuit()), _Vfs_windows, SLOT(unmount(DriveLetter)));
-
-        /* Current QuotaInfo::slotUpdateLastQuota */
-        //QuotaInfo _quotaInfo(accountState);
-        //connect(&_quotaInfo, SIGNAL(quotaUpdated(qint64, qint64)), _Vfs_windows, SLOT(quoting(qint64, qint64)));
-    }
-    else
-        qDebug() << "\n dbg_sync " << Q_FUNC_INFO << " Bad up drive";
 #endif
 
     //< For cron delete dir/files online. Execute each 60000 msec
@@ -387,7 +343,6 @@ void Application::slotAccountStateAdded(AccountState *accountState)
 	_cronDeleteOnlineFiles->start(60000);
 	*/
 
-
     /* See SocketApi::command_SET_DOWNLOAD_MODE
     //< Dummy example; Not uncomment
     SyncJournalDb::instance()->setSyncMode(QString("C:/Users/poncianoj/zd"), SyncJournalDb::SYNCMODE_OFFLINE);
@@ -843,6 +798,4 @@ void Application::showSettingsDialog()
     _gui->slotShowSettings();
 }
 
-
 } // namespace OCC
-

src/gui/folderman.cpp

@@ -126,11 +126,18 @@ int FolderMan::unloadAndDeleteAllFolders()
 {
     int cnt = 0;
 
+    // clear the list of existing folders.
+    Folder::MapIterator i(_folderMap);
+    while (i.hasNext()) {
+        i.next();
+        Folder *f = i.value();
         unloadFolder();
-    _folderMap.clear();
+        delete f;
+        cnt++;
+    }
     ASSERT(_folderMap.isEmpty());
 
-    _currentSyncFolder = nullptr;
+    _currentSyncFolder = 0;
     _scheduledFolders.clear();
     emit folderListChanged(_folderMap);
     emit scheduleQueueChanged();
@@ -659,7 +666,6 @@ void FolderMan::startScheduledSyncSoon()
         slotStartScheduledFolderSync();
     else
         _startScheduledSyncTimer.start(msDelay);
-
 }
 
 /*
@@ -730,14 +736,28 @@ void FolderMan::slotEtagPollTimerTimeout()
 
 void FolderMan::slotRemoveFoldersForAccount(AccountState *accountState)
 {
+    QVarLengthArray<Folder *, 16> foldersToRemove;
+    Folder::MapIterator i(_folderMap);
+    while (i.hasNext()) {
+        i.next();
+        Folder *folder = i.value();
+        if (folder->accountState() == accountState) {
+            foldersToRemove.append(folder);
+        }
+    }
+    
+    foreach (const auto &f, foldersToRemove) {
         removeFolder();
+    }
     emit folderListChanged(_folderMap);
 }
 
 void FolderMan::slotForwardFolderSyncStateChange()
 {
+    if (Folder *f = qobject_cast<Folder *>(sender())) {
         emit folderSyncStateChange();
     }
+}
 
 void FolderMan::slotServerVersionChanged(Account *account)
 {
@@ -826,7 +846,7 @@ void FolderMan::slotFolderSyncFinished(const SyncResult &)
         qPrintable(_currentSyncFolder->remoteUrl().toString()));
 
     //TODO FUSE
-    //_currentSyncFolder = nullptr;
+    //_currentSyncFolder = 0;
 
     startScheduledSyncSoon();
 }
@@ -943,14 +963,15 @@ void FolderMan::removeFolder()
 
     qCInfo(lcFolderMan) << "Removing " << _currentSyncFolder->alias();
 
-    const bool currentlyRunning = _currentSyncFolder->isBusy();
+    const bool currentlyRunning = _currentSyncFolder;
     if (currentlyRunning) {
         // abort the sync now
         terminateSyncProcess();
     }
 
-    _scheduledFolders.clear();
+    if (_scheduledFolders.removeAll(_currentSyncFolder)>0){
         emit scheduleQueueChanged();
+    }
 
     _currentSyncFolder->wipe();
     _currentSyncFolder->setSyncPaused(true);

src/gui/generalsettings.cpp

@@ -187,7 +187,6 @@ void GeneralSettings::slotToggleOptionalServerNotifications(bool enable)
 
 #ifdef Q_OS_WIN
     //< Set configuration paths.
-
     QString m_defaultFileStreamSyncPath = cfgFile.defaultFileStreamSyncPath();
     QString m_defaultFileStreamMirrorPath = cfgFile.defaultFileStreamMirrorPath();
     QString m_defaultFileStreamLetterDrive = cfgFile.defaultFileStreamLetterDrive();

src/gui/owncloudgui.cpp

@@ -1007,21 +1007,12 @@ void ownCloudGui::slotLogout()
         ai->signOutByUi();
     }
 
-    /*
-    * JP 09/2018.
-    * Down Virtual File System.
-    */
 #if defined(Q_OS_WIN)
-	Vfs_windows *_Vfs_windows = NULL;
+    VfsWindows::instance()->unmount();
-	_Vfs_windows = Vfs_windows::instance();
+#endif
-	if (_Vfs_windows)
+    
-	{
+#if defined(Q_OS_MAC)
-		qDebug() << "\n dbg_sync " << Q_FUNC_INFO << "up Drive:  " << _Vfs_windows;
+    VfsMacController::instance()->unmount();
-		WCHAR DriveLetter = L'X';
-		_Vfs_windows->downDrive(DriveLetter);
-	}
-	else
-		qDebug() << "\n dbg_sync " << Q_FUNC_INFO << " BAD up Drive";
 #endif
 }
 

src/gui/owncloudsetupwizard.cpp

@@ -336,6 +336,10 @@ void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url)
                                             .arg(url));
 
     testOwnCloudConnect();
+
+	emit _ocWizard->basicSetupFinished(1);
+    _ocWizard->close();
+    emit ownCloudWizardDone(0);
 }
 
 void OwncloudSetupWizard::testOwnCloudConnect()

src/gui/quotainfo.cpp

@@ -120,13 +120,8 @@ void QuotaInfo::slotUpdateLastQuota(const QVariantMap &result)
     _lastQuotaTotalBytes = avail >= 0 ? _lastQuotaUsedBytes + avail : avail;
 
 #if defined(Q_OS_WIN)
-	Vfs_windows *m_Vfs_windows = NULL;
+    VfsWindows::instance()->setNumberOfBytes((unsigned long long)_lastQuotaTotalBytes);
-	m_Vfs_windows = Vfs_windows::instance();
+    VfsWindows::instance()->setNumberOfFreeBytes((unsigned long long)_lastQuotaUsedBytes);
-	if (m_Vfs_windows)
-	{
-		m_Vfs_windows->DsetTotalNumberOfBytes((unsigned long long)_lastQuotaTotalBytes);
-		m_Vfs_windows->DsetTotalNumberOfFreeBytes((unsigned long long)_lastQuotaUsedBytes);
-	}
 #endif
 
     emit quotaUpdated(_lastQuotaTotalBytes, _lastQuotaUsedBytes);

src/gui/socketapi.cpp

@@ -1230,8 +1230,7 @@ void SocketApi::command_GET_DOWNLOAD_MODE(const QString &localFileC, SocketListe
         localFile.replace(0, 3, QString(""));
     localFile.replace("\\", "/");
 #elif defined(Q_OS_MAC)
-    ConfigFile cfg;
+	QString relative_prefix = cfgFile.getFsMirrorPath();
-    QString relative_prefix = cfg.defaultFileStreamMirrorPath();
 	localFile = localFile.replace(0, relative_prefix.length(), QString(""));
 #endif
 

src/gui/vfs_windows.h

@@ -25,29 +25,40 @@
 
 #include <QMutex>
 #include <QWaitCondition>
+#include <QRunnable>
+#include <QThreadPool>
+#include <QStorageInfo>
 #include "syncwrapper.h"
 
 namespace OCC {
 
-class Vfs_windows : public QObject
+class CleanIgnoredTask : public QObject, public QRunnable
 {
 	Q_OBJECT
 public:
-	static Vfs_windows* instance();
+	void run();
+};
 
-	Vfs_windows(AccountState *);
+class VfsWindows : public QObject
-	~Vfs_windows();
+{
-	void upDrive(QString, QString);
+    Q_OBJECT
-	void downDrive(WCHAR DriveLetter);
+public:
-	bool removeDir(const QString &);
+    ~VfsWindows();
+    static VfsWindows *instance();
+    void initialize(QString rootPath, WCHAR mountLetter, AccountState *accountState);
+    void mount();
+    void unmount();
+    bool removeRecursively(const QString &dirName);
+    bool removeDir();
 
-	void DsetTotalNumberOfBytes(unsigned long long n);
+	void setNumberOfBytes(unsigned long long numberOfBytes);
-	unsigned long long DgetTotalNumberOfBytes();
+    unsigned long long getNumberOfBytes();
 
-	void DsetTotalNumberOfFreeBytes(unsigned long long n);
+    void setNumberOfFreeBytes(unsigned long long numberOfFreeBytes);
-	unsigned long long DgetTotalNumberOfFreeBytes();
+    unsigned long long getNumberOfFreeBytes();
 
 	QStringList* contentsOfDirectoryAtPath(QString path, QVariantMap &error);
+	QList<QString> ignoredList;
 
 	void createFileAtPath(QString path, QVariantMap &error);
 	void moveFileAtPath(QString path, QString npath,QVariantMap &error);
@@ -61,10 +72,23 @@ public:
 	void endDeleteDirectoryAtPath(QString path, QVariantMap &error);
 
 private:
-	static Vfs_windows *_instance;
+	VfsWindows();
+    QList<QString> getLogicalDrives();
+    static VfsWindows *_instance;
     QMap<QString, OCC::DiscoveryDirectoryResult *> _fileListMap;
     QPointer<OCC::DiscoveryFolderFileList> _remotefileListJob;
-	QString rootPath_;
+    QString rootPath;
+    WCHAR mountLetter;
+
+	// @Capacity
+    //*TotalNumberOfBytes = (ULONGLONG)1024L * 1024 * 1024 * 50;
+    unsigned long long numberOfBytes = 0;
+    // @Used space
+    //*TotalNumberOfFreeBytes = (ULONGLONG)1024L * 1024 * 10;
+    unsigned long long numberOfFreeBytes = 0;
+    // @Free space
+    //*FreeBytesAvailable = (ULONGLONG)(*TotalNumberOfBytes - *TotalNumberOfFreeBytes); / *1024 * 1024 * 10;
+    unsigned long long freeBytesAvailable = 0;
 
 	// To sync
 	OCC::SyncWrapper *_syncWrapper;
@@ -93,4 +117,3 @@ public slots:
 } // namespace OCC
 
 #endif // VFS_WINDOWS_H
-