mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-17 03:11:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.

Browse source
This commit is contained in:
Klaas Freitag 2014-06-25 11:11:27 +02:00
parent 0e45dd7a3d
commit e17243bc1f
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mirall/account.cpp
View file

@ -29,6 +29,7 @@
#include <QSslSocket> #include <QSslSocket>
#include <QNetworkCookieJar> #include <QNetworkCookieJar>
#include <QFileInfo> #include <QFileInfo>
#include <QDir>
#include <QDebug> #include <QDebug>
@ -124,12 +125,14 @@ Account* Account::restore()
// if the settings file could not be opened, the childKeys list is empty // if the settings file could not be opened, the childKeys list is empty
if( settings->childKeys().isEmpty() ) { if( settings->childKeys().isEmpty() ) {
// Now try to open the original ownCloud settings to see if they exist. // Now try to open the original ownCloud settings to see if they exist.
QString oCCfgFile = settings->fileName(); QString oCCfgFile = QDir::fromNativeSeparators( settings->fileName() );
// replace the last two segments with ownCloud/owncloud.cfg // replace the last two segments with ownCloud/owncloud.cfg
oCCfgFile = oCCfgFile.left( oCCfgFile.lastIndexOf('/')); oCCfgFile = oCCfgFile.left( oCCfgFile.lastIndexOf('/'));
oCCfgFile = oCCfgFile.left( oCCfgFile.lastIndexOf('/')); oCCfgFile = oCCfgFile.left( oCCfgFile.lastIndexOf('/'));
oCCfgFile += QLatin1String("/ownCloud/owncloud.cfg"); oCCfgFile += QLatin1String("/ownCloud/owncloud.cfg");
qDebug() << "Migrate: checking old config " << oCCfgFile;
QFileInfo fi( oCCfgFile ); QFileInfo fi( oCCfgFile );
if( fi.isReadable() ) { if( fi.isReadable() ) {
QSettings *oCSettings = new QSettings(oCCfgFile, QSettings::IniFormat); QSettings *oCSettings = new QSettings(oCCfgFile, QSettings::IniFormat);
@ -142,7 +145,9 @@ Account* Account::restore()
// in case the urls are equal reset the settings object to read from // in case the urls are equal reset the settings object to read from
// the ownCloud settings object // the ownCloud settings object
if( oCUrl == overrideUrl ) { qDebug() << "Migrate oC config if " << oCUrl << " == " << overrideUrl << ":"
<< (QUrl(oCUrl) == QUrl(overrideUrl) ? "Yes" : "No");
if( QUrl(oCUrl) == QUrl(overrideUrl) ) {
migratedCreds = true; migratedCreds = true;
settings.reset( oCSettings ); settings.reset( oCSettings );
} else { } else {

8
src/mirall/accountmigrator.cpp
View file

@ -21,6 +21,7 @@
#include <QStringList> #include <QStringList>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QDebug>
namespace Mirall { namespace Mirall {
@ -55,7 +56,10 @@ QStringList AccountMigrator::migrateFolderDefinitons()
oCPath = oCPath.left( oCPath.lastIndexOf('/')); oCPath = oCPath.left( oCPath.lastIndexOf('/'));
themePath += QLatin1String( "folders"); themePath += QLatin1String( "folders");
oCPath += QLatin1String( "ownCloud/folders" ); oCPath += QLatin1String( "/ownCloud/folders" );
qDebug() << "Migrator: theme-path: " << themePath;
qDebug() << "Migrator: ownCloud path: " << oCPath;
// get a dir listing of the ownCloud folder definitions and copy // get a dir listing of the ownCloud folder definitions and copy
// them over to the theme dir // them over to the theme dir
@ -69,6 +73,7 @@ QStringList AccountMigrator::migrateFolderDefinitons()
QString oCFile = oCPath+QDir::separator()+file; QString oCFile = oCPath+QDir::separator()+file;
if( QFile::copy( oCFile, themeFile ) ) { if( QFile::copy( oCFile, themeFile ) ) {
re.append(file); re.append(file);
qDebug() << "Migrator: Folder definition migrated: " << file;
// fix the connection entry of the folder definition // fix the connection entry of the folder definition
QSettings settings(themeFile, QSettings::IniFormat); QSettings settings(themeFile, QSettings::IniFormat);
@ -79,7 +84,6 @@ QStringList AccountMigrator::migrateFolderDefinitons()
} }
return re; return re;
} }
} }