diff --git a/MSHttpRequest/main.cpp b/MSHttpRequest/main.cpp index 7be0d82..29aeab4 100644 --- a/MSHttpRequest/main.cpp +++ b/MSHttpRequest/main.cpp @@ -208,7 +208,7 @@ int main(int argc, char *argv[]) QByteArray payload; - payload.append("{\"t_val\":\"This is payload for POST request\"}"); + payload.append(R"({"t_val":"This is payload for POST request"})"); req->addHeader(QStringLiteral("Content-Length"),QString::number(payload.length()).toLocal8Bit()); @@ -333,7 +333,7 @@ int main(int argc, char *argv[]) QByteArray payload2; - payload2.append("{\"t_val\":\"This is payload for PUT request\"}"); + payload2.append(R"({"t_val":"This is payload for PUT request"})"); req->addHeader(QStringLiteral("Content-Length"),QString::number(payload2.length()).toLocal8Bit()); diff --git a/MSHttpRequest/mshttprequest.cpp b/MSHttpRequest/mshttprequest.cpp index 5072031..fbca199 100644 --- a/MSHttpRequest/mshttprequest.cpp +++ b/MSHttpRequest/mshttprequest.cpp @@ -74,9 +74,8 @@ bool MSHttpRequest::setMethod(const QString &method){ this->requestMethod=method.toUpper(); return true; } - else{ - return false; - } + + return false; } //============================================================================================== @@ -116,13 +115,10 @@ QString MSHttpRequest::getReplyHeader(const QByteArray &headerName){ QList> hl = this->cUrlObject->replyHeaders; - for(int i=0;i& i) { return i.first == headerName; }); + if (iter != hl.end()) + return iter->second; return QString(); } @@ -161,23 +157,22 @@ void MSHttpRequest::setInputDataStream(QMultiBuffer *data){ this->dataStreamType = dataStreamTypes::DS_MultiBuffer; - for(int i = 0;i < data->items.size(); i++){ + for(auto & item : data->items){ - if(data->items[i].fileName == ""){ - QIODevice* dd = ((QIODevice*)qvariant_cast (data->items[i].slot)); + if(item.fileName == ""){ + QIODevice* dd = ((QIODevice*)qvariant_cast (item.slot)); dd->open(QIODevice::ReadOnly); QByteArray b = dd->readAll(); this->dataStreamMultiBuffer.append(QPair(dataStreamTypes::DS_ByteArray,b)); } else{ - QFile* f = qvariant_cast (data->items[i].slot); + QFile* f = qvariant_cast (item.slot); this->dataStreamMultiBuffer.append(QPair(dataStreamTypes::DS_File,f->fileName().toLocal8Bit())); } } - return; } //============================================================================================== @@ -323,7 +318,7 @@ void MSHttpRequest::post(const QByteArray &data){ } // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -519,7 +514,7 @@ void MSHttpRequest::post(QIODevice *data){ // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -682,7 +677,7 @@ void MSHttpRequest::put(const QByteArray &data){ } // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -868,7 +863,7 @@ void MSHttpRequest::put(QIODevice *data){ } // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -947,7 +942,7 @@ void MSHttpRequest::deleteResource(){ // cUrlObject->requestOptions[CURLOPT_POSTFIELDSIZE] = 0; // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -1004,7 +999,7 @@ void MSHttpRequest::get(){ QString p = ""; - if(this->queryItems.size() > 0){ + if(!this->queryItems.empty()){ QHash::iterator i = this->queryItems.begin(); @@ -1025,7 +1020,7 @@ void MSHttpRequest::get(){ } // set request headers - if(this->requestHeaders.size() > 0){ + if(!this->requestHeaders.empty()){ QStringList h; QHash::iterator i = this->requestHeaders.begin(); @@ -1128,10 +1123,10 @@ void MSHttpRequest::exec(){ ds << this->dataStreamMultiBuffer.size(); - for(int i =0; i< this->dataStreamMultiBuffer.size(); i++){ + for(const auto & i : this->dataStreamMultiBuffer){ - ds << this->dataStreamMultiBuffer[i].first; - ds << this->dataStreamMultiBuffer[i].second; + ds << i.first; + ds << i.second; } } @@ -1159,8 +1154,6 @@ void MSHttpRequest::exec(){ delete(exe); - return ; - } //============================================================================================== @@ -1193,12 +1186,7 @@ QString MSHttpRequest::readReplyText(){ bool MSHttpRequest::replyOK(){ - if(this->replyError == QNetworkReply::NetworkError::NoError){ - return true; - } - else{ - return false; - } + return this->replyError == QNetworkReply::NetworkError::NoError; } //============================================================================================== diff --git a/MSHttpRequest/msnetworkcookiejar.cpp b/MSHttpRequest/msnetworkcookiejar.cpp index f98b18f..c234485 100644 --- a/MSHttpRequest/msnetworkcookiejar.cpp +++ b/MSHttpRequest/msnetworkcookiejar.cpp @@ -72,12 +72,7 @@ MSNetworkCookieJar::~MSNetworkCookieJar(){ } bool MSNetworkCookieJar::isCookieRemoved(){ - if(this->cookieFile == nullptr){ - return true; - } - else{ - return false; - } + return this->cookieFile == nullptr; } //MSNetworkCookieJar MSNetworkCookieJar::operator =(MSNetworkCookieJar c) diff --git a/MSHttpRequest/msnetworkproxy.h b/MSHttpRequest/msnetworkproxy.h index e0b716b..cddfec5 100644 --- a/MSHttpRequest/msnetworkproxy.h +++ b/MSHttpRequest/msnetworkproxy.h @@ -40,9 +40,8 @@ class MSNetworkProxy : public QObject if(this->proxyAddr != ""){ return this->proxyType + "://" + this->proxyAddr + ":" + this->proxyPort; } - else{ - return QString("ggggggg"); - } + + return QString("ggggggg"); } diff --git a/MSHttpRequest/qmultibuffer.cpp b/MSHttpRequest/qmultibuffer.cpp index 6b68eed..037c998 100644 --- a/MSHttpRequest/qmultibuffer.cpp +++ b/MSHttpRequest/qmultibuffer.cpp @@ -26,7 +26,7 @@ void QMultiBuffer::append(QIODevice* d){ s.fileName = f->fileName(); } - if(this->items.size() == 0){ + if(this->items.empty()){ s.beginPos = 0; s.endPos = d->size()-1; } @@ -47,7 +47,7 @@ void QMultiBuffer::append(QByteArray *d){ slotBound s = {this->items.size(),0,0,""}; - if(this->items.size() == 0){ + if(this->items.empty()){ s.beginPos = 0; s.endPos = d->size()-1; } @@ -110,10 +110,9 @@ qint64 QMultiBuffer::readData(char *data, qint64 maxlen){ ((QIODevice*)(qvariant_cast (this->items[currentSlot].slot)))->close(); break; } - else{ - ((QIODevice*)(qvariant_cast (this->items[currentSlot].slot)))->close(); - currentSlot++; - } + + ((QIODevice*)(qvariant_cast (this->items[currentSlot].slot)))->close(); + currentSlot++; } this->cursor += w; @@ -143,10 +142,8 @@ bool QMultiBuffer::seek(qint64 pos){ this->cursor = pos; return true; } - else{ - return false; - } + return false; } @@ -156,15 +153,15 @@ qint64 QMultiBuffer::size() const{ qint64 sz=0; - for(int i=0; i< this->items.size();i++){ + for(const auto& item : this->items){ - QString vt = this->items[i].slot.typeName(); + QString vt = item.slot.typeName(); if( vt == "QBuffer*"){ - sz += ((QBuffer*)(qvariant_cast (this->items[i].slot)))->size(); + sz += ((QBuffer*)(qvariant_cast (item.slot)))->size(); } if( vt == "QIODevice*"){ - sz += ((QFile*)(qvariant_cast (this->items[i].slot)))->size(); + sz += ((QFile*)(qvariant_cast (item.slot)))->size(); } } diff --git a/README.MD b/README.MD index 9654495..00538e6 100644 --- a/README.MD +++ b/README.MD @@ -1,61 +1,52 @@ # The CloudCross Project ## Current version: 1.4.6 + Release date: **2020-01-16** Author: **Kamensky Vladimir** - - -The CloudCross is a open source project for a synchronization between your devices and various cloud storages. This software is a cross-platform and could be run on Linux, Windows and Mac OS. +The CloudCross is a open source project for a synchronization between your devices and various cloud storages. This software is a cross-platform and could be run on Linux, Windows and Mac OS. CloudCross allows you to sync only a portion of the local/remote files and folders using black or white lists (.include and .exclude files). At the same time you have the opportunity to choose which files have the advantage - local or remote. Thus, you can keep relevance either local files or files on cloud storage. ### For install on Gentoo Linux and hopefully its derivatives (Funtoo, Calculate etc.) - -a CloudCross ebuild may be found in [programmador](https://bitbucket.org/programmador/gentoo-overlay/overview) overlay. - - For simple including of overlays in Your system [Layman](https://wiki.gentoo.org/wiki/Layman) may be used: - - layman -a -s programmador - - Now CloudCross should be installable: - - emerge --ask net-misc/cloudcross - -### For install on deb-based distributions (Debian,Ubuntu,Linux Mint): - - sudo apt-get install build-essential qt5-default qtbase5-dev qt5-qmake libcurl4-openssl-dev +a CloudCross ebuild may be found in [programmador](https://bitbucket.org/programmador/gentoo-overlay/overview) overlay. + For simple including of overlays in Your system [Layman](https://wiki.gentoo.org/wiki/Layman) may be used: -### For install on rpm-based distributions (Redhat,CentOS, Fedora, Alt Linux): + layman -a -s programmador - yum groupinstall 'Development Tools' + Now CloudCross should be installable: - yum install qt5-qtbase qt5-qtbase-devel curl-devel + emerge --ask net-misc/cloudcross +### For install on deb-based distributions (Debian,Ubuntu,Linux Mint) + sudo apt-get install build-essential qt5-default qtbase5-dev qt5-qmake libcurl4-openssl-dev -### For install on Arch Linux: +### For install on rpm-based distributions (Redhat,CentOS, Fedora, Alt Linux) - pacman -S base-devel qt5-base curl + yum groupinstall 'Development Tools' + yum install qt5-qtbase qt5-qtbase-devel curl-devel +### For install on Arch Linux + pacman -S base-devel qt5-base curl -### Then to build CloudCross from source follow the next sequence: +### Then to build CloudCross from source follow the next sequence -1. Download archive. -2. Unpack it. +1. Download archive. +2. Unpack it. 3. Go to unpacked folder. -4. mkdir build -5. cd build -6. qmake ../CloudCross.pro -7. make +4. `mkdir build` +5. `cd build` +6. `qmake ../CloudCross.pro` +7. `make` As a result, in the build directory will be appears a three subdirectories with a result of compilation. In a *ccross-app* folder we need a **ccross** file, in a *ccross-curl-executor* we need a **ccross-curl** file. These two file is a main CloudCross executables. Copy these files to /usr/bin directory. -For detailed usage instructions see https://cloudcross.mastersoft24.ru/usage - +For detailed usage instructions see diff --git a/build/debug/ccross-app/ccross b/build/debug/ccross-app/ccross deleted file mode 100755 index d7f12fe..0000000 Binary files a/build/debug/ccross-app/ccross and /dev/null differ diff --git a/build/debug/ccross-curl-executor/ccross-curl b/build/debug/ccross-curl-executor/ccross-curl deleted file mode 100755 index 5ee1ccb..0000000 Binary files a/build/debug/ccross-curl-executor/ccross-curl and /dev/null differ diff --git a/ccross-app/main.cpp b/ccross-app/main.cpp index 63bc639..63b6380 100644 --- a/ccross-app/main.cpp +++ b/ccross-app/main.cpp @@ -104,7 +104,7 @@ void printHelp(){ qInfo()<< QObject::tr(" -s [ --list ] Print remote cloud file list") ; qInfo()<< QObject::tr(" --use-include Use .include file. Without this option by default use .exclude file.\n" " If these files does'nt exists, they are ignore") ; - qInfo()<< QObject::tr(" --prefer arg Define sync strategy. It can be a one of \"remote\" or \"local\". By default it's \"local\"") ; + qInfo()<< QObject::tr(R"( --prefer arg Define sync strategy. It can be a one of "remote" or "local". By default it's "local")") ; qInfo()<< QObject::tr(" --no-hidden Not sync hidden files and folders") ; qInfo()<< QObject::tr(" --no-new-rev Do not create new revisions of files, overwrite their instead") ; qInfo()<< QObject::tr(" --convert-doc Convert office document to Google Doc format when upload\n" @@ -1119,7 +1119,7 @@ int main(int argc, char *argv[]) MSProvidersPool* providers=new MSProvidersPool(); - QStringList opts=a.arguments(); + QStringList opts=QCoreApplication::arguments(); MSOptParser* parser=new MSOptParser(); @@ -1171,7 +1171,7 @@ int main(int argc, char *argv[]) - if(prov.size() != 0){ + if(!prov.empty()){ if(prov[0] == "google"){ currentProvider=ProviderType::Google; } @@ -1204,11 +1204,11 @@ int main(int argc, char *argv[]) QStringList wp=parser->getParamByName("path"); - if(wp.size()==0){ + if(wp.empty()){ wp=parser->getParamByName("p"); } - if(wp.size()!=0){ + if(!wp.empty()){ providers->setWorkPath(wp[0]); } @@ -1432,7 +1432,7 @@ int main(int argc, char *argv[]) mailru_login=parser->getParamByName("--login"); mailru_password=parser->getParamByName("--password"); - if((mailru_login.size()==0)||(mailru_password.size()==0)){ + if((mailru_login.empty())||(mailru_password.empty())){ qInfo()<< "Provider Mail.ru. Login and password required. Application terminated."; return 1; } @@ -1452,9 +1452,8 @@ int main(int argc, char *argv[]) if(r){ return 0; } - else{ - return 1; - } + + return 1; case 3: // --version @@ -1480,7 +1479,7 @@ int main(int argc, char *argv[]) s=MSCloudProvider::SyncStrategy::PreferRemote; } else{ - qInfo()<< "--prefer option value must be an one of \"local\" or \"remote\""; + qInfo()<< R"(--prefer option value must be an one of "local" or "remote")"; return 0; break; } @@ -1520,9 +1519,8 @@ int main(int argc, char *argv[]) if(r){ return 0; } - else{ - return 1; - } + + return 1; case 6: // --no-hidden @@ -1579,7 +1577,7 @@ int main(int argc, char *argv[]) } else{ - qInfo()<< "--force option value must be an one of \"upload\" or \"download\""; + qInfo()<< R"(--force option value must be an one of "upload" or "download")"; return 1; } @@ -1646,9 +1644,8 @@ int main(int argc, char *argv[]) if(r){ return 0; } - else{ - return 1; - } + + return 1; case 20: // --filter-type @@ -1692,9 +1689,8 @@ int main(int argc, char *argv[]) if(r){ return 0; } - else{ - return 1; - } + + return 1; case 24: // --no-sync @@ -1734,10 +1730,8 @@ int main(int argc, char *argv[]) if(r){ return 0; } - else{ - return 1; - } + return 1; } } diff --git a/ccross-app/src/Dropbox/msdropbox.cpp b/ccross-app/src/Dropbox/msdropbox.cpp index fb34863..5b55da3 100644 --- a/ccross-app/src/Dropbox/msdropbox.cpp +++ b/ccross-app/src/Dropbox/msdropbox.cpp @@ -44,14 +44,12 @@ // 150000000 -MSDropbox::MSDropbox() : - MSCloudProvider() +MSDropbox::MSDropbox() { this->providerName= QStringLiteral("Dropbox"); this->tokenFileName= QStringLiteral(".dbox"); this->stateFileName= QStringLiteral(".dbox_state"); this->trashFileName= QStringLiteral(".trash_dbox"); - } @@ -169,11 +167,10 @@ bool MSDropbox::onAuthFinished(const QString &html, MSCloudProvider *provider){ emit providerAuthComplete(); return true; } - else{ - this->providerAuthStatus=false; - emit providerAuthComplete(); - return false; - } + + this->providerAuthStatus=false; + emit providerAuthComplete(); + return false; } @@ -245,7 +242,6 @@ void MSDropbox::loadStateFile(){ this->lastSyncTime=QJsonValue(job[QStringLiteral("last_sync")].toObject()[QStringLiteral("sec")]).toVariant().toULongLong(); key.close(); - return; } @@ -491,7 +487,7 @@ bool MSDropbox::readRemote(){ //QString parentId,QString currentPath - }while(hasMore==true); + }while(hasMore); return true; @@ -511,19 +507,13 @@ bool MSDropbox::_readRemote(const QString &rootPath){ bool MSDropbox::isFile(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[".tag"].toString()=="file"){ - return true; - } - return false; + return remoteObject.toObject()[".tag"].toString()=="file"; } //======================================================================================= bool MSDropbox::isFolder(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[QStringLiteral(".tag")].toString()==QStringLiteral("folder")){ - return true; - } - return false; + return remoteObject.toObject()[QStringLiteral(".tag")].toString()==QStringLiteral("folder"); } //======================================================================================= @@ -547,7 +537,7 @@ bool MSDropbox::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -580,7 +570,7 @@ bool MSDropbox::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -635,7 +625,7 @@ bool MSDropbox::createSyncFileList(){ // make separately lists of objects QList keys = this->syncFileList.uniqueKeys(); - if((keys.size()>3) && (this->getFlag(QStringLiteral("singleThread")) == false)){// split list to few parts + if((keys.size()>3) && (!this->getFlag(QStringLiteral("singleThread")))){// split list to few parts this->threadsRunning = new QSemaphore(3); @@ -664,8 +654,8 @@ bool MSDropbox::createSyncFileList(){ MSSyncThread* threads[3] = {thr1, thr2, thr3}; int j = 0; - for(int i = 0; ithreadSyncList.insert(keys[i],this->syncFileList.find(keys[i]).value()); + for(const auto & key : keys){ + threads[j++]->threadSyncList.insert(key,this->syncFileList.find(key).value()); if (j == 3) j = 0; } @@ -958,20 +948,17 @@ MSFSObject::ObjectState MSDropbox::filelist_defineObjectState(const MSLocalFSObj // } } - else{ - - if(local.objectType == MSLocalFSObject::Type::folder){ - return MSFSObject::ObjectState::Sync; - } - if(local.modifiedDate > remote.modifiedDate){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + if(local.objectType == MSLocalFSObject::Type::folder){ + return MSFSObject::ObjectState::Sync; + } + if(local.modifiedDate > remote.modifiedDate){ + return MSFSObject::ObjectState::ChangedLocal; } + + return MSFSObject::ObjectState::ChangedRemote; + } @@ -983,9 +970,9 @@ MSFSObject::ObjectState MSDropbox::filelist_defineObjectState(const MSLocalFSObj if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::NewLocal; } - else{ - return MSFSObject::ObjectState::DeleteRemote; - } + + return MSFSObject::ObjectState::DeleteRemote; + } @@ -994,9 +981,8 @@ MSFSObject::ObjectState MSDropbox::filelist_defineObjectState(const MSLocalFSObj if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::DeleteLocal; } - else{ - return MSFSObject::ObjectState::NewRemote; - } + + return MSFSObject::ObjectState::NewRemote; } @@ -1462,12 +1448,7 @@ bool MSDropbox::filelist_FSObjectHasParent(const MSFSObject &fsObject){ // return true; // } - if((fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/"))){ - return true; - } - else{ - return false; - } + return (fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/")); } @@ -1495,9 +1476,8 @@ MSFSObject MSDropbox::filelist_getParentFSObject(const MSFSObject &fsObject){ if(parent != this->syncFileList.end()){ return parent.value(); } - else{ - return MSFSObject(); - } + + return MSFSObject(); } @@ -1515,14 +1495,7 @@ void MSDropbox::filelist_populateChanges(const MSFSObject &changedFSObject){ bool MSDropbox::testReplyBodyForError(const QString &body) { - if(body.contains(QStringLiteral("\"error\": {"))){ - - return false; - - } - else{ - return true; - } + return !body.contains(QStringLiteral("\"error\": {")); } @@ -2223,9 +2196,8 @@ bool MSDropbox::remote_file_makeFolder(MSFSObject *object){ //exit(1); return false; } - else{ - return true; - } + + return true; } if(!this->testReplyBodyForError(req->readReplyText())){ @@ -2309,12 +2281,9 @@ bool MSDropbox::remote_file_trash(MSFSObject *object){ delete(req); return false; } - else{ - delete(req); - return true; - } - + delete(req); + return true; } @@ -2820,7 +2789,7 @@ QString MSDropbox::getInfo(){ QJsonDocument json = QJsonDocument::fromJson(content.toUtf8()); QJsonObject job = json.object(); - if(job[QStringLiteral("allocation")].toObject().size()== 0){ + if(job[QStringLiteral("allocation")].toObject().empty()){ //qInfo()<< "Error getting cloud information " ; return QStringLiteral("false"); } diff --git a/ccross-app/src/GoogleDrive/msgoogledrive.cpp b/ccross-app/src/GoogleDrive/msgoogledrive.cpp index 0188d6d..c3d1129 100644 --- a/ccross-app/src/GoogleDrive/msgoogledrive.cpp +++ b/ccross-app/src/GoogleDrive/msgoogledrive.cpp @@ -43,15 +43,12 @@ #include "iostream" -MSGoogleDrive::MSGoogleDrive() : - MSCloudProvider() +MSGoogleDrive::MSGoogleDrive() { this->providerName="GoogleDrive"; this->tokenFileName=".grive"; this->stateFileName=".grive_state"; this->trashFileName=".trash"; - - } //======================================================================================= @@ -169,12 +166,10 @@ bool MSGoogleDrive::onAuthFinished(const QString &html, MSCloudProvider *provide return true; } - else{ - this->providerAuthStatus=false; - emit providerAuthComplete(); - return false; - } + this->providerAuthStatus=false; + emit providerAuthComplete(); + return false; } @@ -246,7 +241,6 @@ void MSGoogleDrive::loadStateFile(){ this->lastSyncTime=QJsonValue(job[QStringLiteral("last_sync")].toObject()[QStringLiteral("sec")]).toVariant().toULongLong(); key.close(); - return; } @@ -321,10 +315,9 @@ bool MSGoogleDrive::refreshToken(){ delete(req); return true; } - else{ - delete(req); - return false; - } + + delete(req); + return false; } @@ -518,7 +511,7 @@ QHash MSGoogleDrive::get(const QString &parentId, int target v= i.value(); - if(v.toObject()[QStringLiteral("parents")].toArray().size()==0){ + if(v.toObject()[QStringLiteral("parents")].toArray().empty()){ if(i != driveJSONFileList.end()){ i++; continue; @@ -589,19 +582,13 @@ QHash MSGoogleDrive::get(const QString &parentId, int target //======================================================================================= bool MSGoogleDrive::isFile(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[QStringLiteral("mimeType")].toString() != QStringLiteral("application/vnd.google-apps.folder")){ - return true; - } - return false; + return remoteObject.toObject()[QStringLiteral("mimeType")].toString() != QStringLiteral("application/vnd.google-apps.folder"); } //======================================================================================= bool MSGoogleDrive::isFolder(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[QStringLiteral("mimeType")].toString() == QStringLiteral("application/vnd.google-apps.folder")){ - return true; - } - return false; + return remoteObject.toObject()[QStringLiteral("mimeType")].toString() == QStringLiteral("application/vnd.google-apps.folder"); } //======================================================================================= @@ -1042,15 +1029,9 @@ bool MSGoogleDrive::readLocalSingle(const QString &path){ bool MSGoogleDrive::filterGoogleDocsMimeTypes(const QString &mime){// return true if this mime is Google document - if((mime == QStringLiteral("application/vnd.google-apps.document"))|| - (mime == QStringLiteral("application/vnd.google-apps.presentation"))|| - (mime == QStringLiteral("application/vnd.google-apps.spreadsheet"))){ - - return true; - } - else{ - return false; - } + return (mime == QStringLiteral("application/vnd.google-apps.document")) + || (mime == QStringLiteral("application/vnd.google-apps.presentation")) + || (mime == QStringLiteral("application/vnd.google-apps.spreadsheet")); } //======================================================================================= @@ -1063,23 +1044,13 @@ bool MSGoogleDrive::filterOfficeMimeTypes(const QString &mime){// return true if QRegularExpressionMatch m = regex2.match(mime); - if(m.hasMatch()){ - return true; - } - else{ - return false; - } + return m.hasMatch(); } bool MSGoogleDrive::filterOfficeFileExtensions(QString ext){ - if(ext == "xlsx" || ext == "docx" || ext =="pptx" || ext=="odt" || ext=="ods" || ext == "odp"){ - return true; - } - else{ - return false; - } + return ext == "xlsx" || ext == "docx" || ext =="pptx" || ext=="odt" || ext=="ods" || ext == "odp"; } @@ -1171,17 +1142,11 @@ bool MSGoogleDrive::getRemoteFileList(){ // return this->syncFileList; - bool r = this->createHashFromRemote(); - if(!r){ - return false; - } - - r = this->readRemote(this->getRoot(),"/");// top level files and folders - if(!r){ + if(!this->createHashFromRemote()){ return false; } - return true; + return this->readRemote(this->getRoot(),"/");// top level files and folders } //======================================================================================= @@ -1205,7 +1170,7 @@ bool MSGoogleDrive::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -1239,7 +1204,7 @@ bool MSGoogleDrive::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -1294,7 +1259,7 @@ bool MSGoogleDrive::createSyncFileList(){ // make separately lists of objects QList keys = this->syncFileList.uniqueKeys(); - if((keys.size()>3) && (this->getFlag(QStringLiteral("singleThread")) == false)){// split list to few parts + if((keys.size()>3) && (!this->getFlag(QStringLiteral("singleThread")))){// split list to few parts this->threadsRunning = new QSemaphore(3); @@ -1322,8 +1287,8 @@ bool MSGoogleDrive::createSyncFileList(){ MSSyncThread* threads[3] = {thr1, thr2, thr3}; int j = 0; - for(int i = 0; ithreadSyncList.insert(keys[i],this->syncFileList.find(keys[i]).value()); + for(const auto & key : keys){ + threads[j++]->threadSyncList.insert(key,this->syncFileList.find(key).value()); if (j == 3) j = 0; } @@ -1371,31 +1336,23 @@ MSFSObject::ObjectState MSGoogleDrive::filelist_defineObjectState(const MSLocalF return MSFSObject::ObjectState::Sync; } - else{ - // compare last modified date for local and remote - if(local.modifiedDate==remote.modifiedDate){ - - if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + // compare last modified date for local and remote + if(local.modifiedDate==remote.modifiedDate){ + if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ + return MSFSObject::ObjectState::ChangedLocal; } - else{ - if(local.modifiedDate > remote.modifiedDate){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + return MSFSObject::ObjectState::ChangedRemote; - } } + if(local.modifiedDate > remote.modifiedDate){ + return MSFSObject::ObjectState::ChangedLocal; + } + + return MSFSObject::ObjectState::ChangedRemote; } @@ -1405,9 +1362,8 @@ MSFSObject::ObjectState MSGoogleDrive::filelist_defineObjectState(const MSLocalF if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::NewLocal; } - else{ - return MSFSObject::ObjectState::DeleteRemote; - } + + return MSFSObject::ObjectState::DeleteRemote; } @@ -1416,9 +1372,8 @@ MSFSObject::ObjectState MSGoogleDrive::filelist_defineObjectState(const MSLocalF if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::DeleteLocal; } - else{ - return MSFSObject::ObjectState::NewRemote; - } + + return MSFSObject::ObjectState::NewRemote; } @@ -1520,12 +1475,7 @@ bool MSGoogleDrive::filelist_FSObjectHasParent(const MSFSObject &fsObject){ // return true; // } - if((fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/"))){ - return true; - } - else{ - return false; - } + return (fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/")); } //======================================================================================= @@ -1550,9 +1500,8 @@ MSFSObject MSGoogleDrive::filelist_getParentFSObject(const MSFSObject &fsObject) if(parent != this->syncFileList.end()){ return parent.value(); } - else{ - return MSFSObject(); - } + + return MSFSObject(); } @@ -1988,7 +1937,7 @@ bool MSGoogleDrive::remote_file_get(MSFSObject* object){ object->local.mimeType=QStringLiteral("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); req->addQueryItem("mimeType", object->local.mimeType); - if((object->local.exist == false)&&(object->getObjectExtension().isEmpty())){ + if((!object->local.exist)&&(object->getObjectExtension().isEmpty())){ object->fileName=object->fileName+QStringLiteral(".docx"); } @@ -1999,7 +1948,7 @@ bool MSGoogleDrive::remote_file_get(MSFSObject* object){ object->local.mimeType=QStringLiteral("application/vnd.openxmlformats-officedocument.presentationml.presentation"); req->addQueryItem("mimeType", object->local.mimeType); - if((object->local.exist == false)&&(object->getObjectExtension().isEmpty())){ + if((!object->local.exist)&&(object->getObjectExtension().isEmpty())){ object->fileName=object->fileName+QStringLiteral(".pptx"); } @@ -2977,21 +2926,12 @@ bool MSGoogleDrive::testReplyBodyForError(const QString &body){// return true if if(e.isNull()){ return true; } - else{ - - int code=e.toInt(0); - if(code != 0){ - return false; - } - else{ - return true; - } - } + int code=e.toInt(0); + return code == 0; } - else{ - return true; - } + + return true; } @@ -3287,7 +3227,7 @@ QString MSGoogleDrive::getInfo(){ //int zz=job["storageQuota"].toObject().size(); - if(job[QStringLiteral("storageQuota")].toObject().size()== 0){ + if(job[QStringLiteral("storageQuota")].toObject().empty()){ //qInfo()<< "Error getting cloud information " ; return QStringLiteral("false"); } diff --git a/ccross-app/src/MailRu/msmailru.cpp b/ccross-app/src/MailRu/msmailru.cpp index 6539338..a16fbb8 100644 --- a/ccross-app/src/MailRu/msmailru.cpp +++ b/ccross-app/src/MailRu/msmailru.cpp @@ -163,14 +163,10 @@ bool MSMailRu::auth(){ //req->deleteLater(); return true; } - else{ - this->providerAuthStatus=false; - delete(req); - return false; - } - - + this->providerAuthStatus=false; + delete(req); + return false; } @@ -182,7 +178,7 @@ void MSMailRu::saveTokenFile(const QString &path) QFile key(path+"/"+this->tokenFileName); key.open(QIODevice::WriteOnly | QIODevice::Text); QTextStream outk(&key); - outk << "{\"access_token\" : \""+this->token+"\", \"build\": \""+this->build+"\", \"x_page_id\": \""+this->x_page_id+"\", \"login\": \""+this->login+"\", \"password\": \""+this->password+"\" }"; + outk << R"({"access_token" : ")"+this->token+R"(", "build": ")"+this->build+R"(", "x_page_id": ")"+this->x_page_id+R"(", "login": ")"+this->login+R"(", "password": ")"+this->password+R"(" })"; key.close(); } @@ -246,7 +242,6 @@ void MSMailRu::loadStateFile() this->lastSyncTime=QJsonValue(job["last_sync"].toObject()["sec"]).toVariant().toULongLong(); key.close(); - return; } //======================================================================================= @@ -584,7 +579,7 @@ bool MSMailRu::remote_file_insert(MSFSObject *object, const char *newParameter){ // if(content.contains( QStringLiteral("400"))){// need remove and re-upload bool r=this->remote_file_trash(object); - if(r == true){ + if(r){ this->remote_file_insert(object); //delete(this->cookies); @@ -638,9 +633,8 @@ bool MSMailRu::remote_file_insert(MSFSObject *object, const char *newParameter){ return true; } - else{ - return false; - } + + return false; } @@ -703,7 +697,7 @@ bool MSMailRu::remote_file_makeFolder(MSFSObject *object){ if(error == "exists"){// need remove and re-upload bool r=this->remote_file_trash(object); - if(r == true){ + if(r){ this->remote_file_makeFolder(object); ////this->cookies->deleteLater();//delete(this->cookies); @@ -735,12 +729,7 @@ bool MSMailRu::remote_file_makeFolder(MSFSObject *object){ delete(this->cookies); delete(req); - if(status == 200){ - return true; - } - else{ - return false; - } + return status == 200; } @@ -804,12 +793,7 @@ bool MSMailRu::remote_file_trash(MSFSObject *object){ delete(this->cookies); delete(req); - if(status == 200){ - return true; - } - else{ - return false; - } + return status == 200; } @@ -974,20 +958,17 @@ MSFSObject::ObjectState MSMailRu::filelist_defineObjectState(const MSLocalFSObje // } } - else{ - - if(local.objectType == MSLocalFSObject::Type::folder){ - return MSFSObject::ObjectState::Sync; - } - if(local.modifiedDate > remote.modifiedDate){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + if(local.objectType == MSLocalFSObject::Type::folder){ + return MSFSObject::ObjectState::Sync; + } + if(local.modifiedDate > remote.modifiedDate){ + return MSFSObject::ObjectState::ChangedLocal; } + + return MSFSObject::ObjectState::ChangedRemote; + } @@ -999,9 +980,8 @@ MSFSObject::ObjectState MSMailRu::filelist_defineObjectState(const MSLocalFSObje if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::NewLocal; } - else{ - return MSFSObject::ObjectState::DeleteRemote; - } + + return MSFSObject::ObjectState::DeleteRemote; } @@ -1010,9 +990,8 @@ MSFSObject::ObjectState MSMailRu::filelist_defineObjectState(const MSLocalFSObje if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::DeleteLocal; } - else{ - return MSFSObject::ObjectState::NewRemote; - } + + return MSFSObject::ObjectState::NewRemote; } @@ -1478,12 +1457,7 @@ bool MSMailRu::filelist_FSObjectHasParent(const MSFSObject &fsObject){ // return true; // } - if((fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/"))){ - return true; - } - else{ - return false; - } + return (fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/")); } //======================================================================================= @@ -1509,9 +1483,8 @@ MSFSObject MSMailRu::filelist_getParentFSObject(const MSFSObject &fsObject){ if(parent != this->syncFileList.end()){ return parent.value(); } - else{ - return MSFSObject(); - } + + return MSFSObject(); } //======================================================================================= @@ -1532,14 +1505,7 @@ void MSMailRu::filelist_populateChanges(const MSFSObject &changedFSObject){ bool MSMailRu::testReplyBodyForError(const QString &body){ - if(body.contains("Error transferring ")){ - - return false; - - } - else{ - return true; - } + return !body.contains("Error transferring "); } //======================================================================================= @@ -1568,7 +1534,7 @@ bool MSMailRu::readRemote(const QString &path, MSNetworkCookieJar* cookie) this->auth(); - if(this->providerAuthStatus == false){ + if(!this->providerAuthStatus){ qInfo()<options.insert("filter-type", "wildcard"); continue; } - else if(instream.pos() == 7 && line == "regexp"){ + if(instream.pos() == 7 && line == "regexp"){ this->options.insert("filter-type", "regexp"); continue; } @@ -2071,7 +2031,7 @@ bool MSMailRu::createSyncFileList(){ this->options.insert("filter-type", "wildcard"); continue; } - else if(instream.pos() == 7 && line == "regexp"){ + if(instream.pos() == 7 && line == "regexp"){ this->options.insert("filter-type", "regexp"); continue; } @@ -2128,7 +2088,7 @@ bool MSMailRu::createSyncFileList(){ this->setFlag("singleThread",true); // avoid multithreading - if((keys.size()>3) && (this->getFlag("singleThread") == false)){// split list to few parts + if((keys.size()>3) && (!this->getFlag("singleThread"))){// split list to few parts this->threadsRunning = new QSemaphore(3); @@ -2156,8 +2116,8 @@ bool MSMailRu::createSyncFileList(){ MSSyncThread* threads[3] = {thr1, thr2, thr3}; int j = 0; - for(int i = 0; ithreadSyncList.insert(keys[i],this->syncFileList.find(keys[i]).value()); + for(const auto& key : keys){ + threads[j++]->threadSyncList.insert(key,this->syncFileList.find(key).value()); if (j == 3) j = 0; } @@ -2378,15 +2338,7 @@ bool MSMailRu::directUpload(const QString &url, const QString &remotePath){ //this->cookies->deleteLater();//delete(this->cookies); delete(req); - if(status == 200){ - - - - return true; - } - else{ - return false; - } + return status == 200; } diff --git a/ccross-app/src/OneDrive/msonedrive.cpp b/ccross-app/src/OneDrive/msonedrive.cpp index 739ef99..21dde72 100644 --- a/ccross-app/src/OneDrive/msonedrive.cpp +++ b/ccross-app/src/OneDrive/msonedrive.cpp @@ -38,9 +38,7 @@ QByteArray excludeChars = "/:"; -MSOneDrive::MSOneDrive(): - MSCloudProvider() - +MSOneDrive::MSOneDrive() { this->providerName= QStringLiteral("OneDrive"); this->tokenFileName= QStringLiteral(".ondr"); @@ -97,16 +95,15 @@ bool MSOneDrive::remote_file_get(MSFSObject *object){ return true; } - else{ - if(c.contains("expired_token")){ - delete(req); - this->refreshToken(); - req = new MSHttpRequest(this->proxyServer); - qInfo() << QStringLiteral("OneDrive token expired. Refreshing token done. Retry last operation. ") ; + if(c.contains("expired_token")){ + delete(req); + this->refreshToken(); + req = new MSHttpRequest(this->proxyServer); - goto afterReauth; - } + qInfo() << QStringLiteral("OneDrive token expired. Refreshing token done. Retry last operation. ") ; + + goto afterReauth; } return false; @@ -271,8 +268,8 @@ bool MSOneDrive::remote_file_insert(MSFSObject *object){ return true; } - else{ // multipass uploading + { // multipass uploading do{ req = new MSHttpRequest(this->proxyServer); @@ -379,12 +376,8 @@ bool MSOneDrive::remote_file_insert(MSFSObject *object){ file.close(); delete(req); return true; - } - - - } @@ -521,11 +514,9 @@ bool MSOneDrive::remote_file_trash(MSFSObject *object){ delete(req); return true; } - else{ - delete(req); - return false; - } + delete(req); + return false; } @@ -749,7 +740,6 @@ void MSOneDrive::loadStateFile(){ this->lastSyncTime=QJsonValue(job[QStringLiteral("last_sync")].toObject()[QStringLiteral("sec")]).toVariant().toULongLong(); key.close(); - return; } @@ -822,31 +812,23 @@ MSFSObject::ObjectState MSOneDrive::filelist_defineObjectState(const MSLocalFSOb return MSFSObject::ObjectState::Sync; } - else{ - // compare last modified date for local and remote - if(local.modifiedDate==remote.modifiedDate){ - - if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + // compare last modified date for local and remote + if(local.modifiedDate==remote.modifiedDate){ + if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ + return MSFSObject::ObjectState::ChangedLocal; } - else{ - if(local.modifiedDate > remote.modifiedDate){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + return MSFSObject::ObjectState::ChangedRemote; - } } + if(local.modifiedDate > remote.modifiedDate){ + return MSFSObject::ObjectState::ChangedLocal; + } + + return MSFSObject::ObjectState::ChangedRemote; } @@ -856,9 +838,8 @@ MSFSObject::ObjectState MSOneDrive::filelist_defineObjectState(const MSLocalFSOb if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::NewLocal; } - else{ - return MSFSObject::ObjectState::DeleteRemote; - } + + return MSFSObject::ObjectState::DeleteRemote; } @@ -867,9 +848,8 @@ MSFSObject::ObjectState MSOneDrive::filelist_defineObjectState(const MSLocalFSOb if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::DeleteLocal; } - else{ - return MSFSObject::ObjectState::NewRemote; - } + + return MSFSObject::ObjectState::NewRemote; } @@ -1329,12 +1309,7 @@ bool MSOneDrive::filelist_FSObjectHasParent(const MSFSObject &fsObject){ // return true; // } - if((fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/"))){ - return true; - } - else{ - return false; - } + return (fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/")); } @@ -1361,9 +1336,8 @@ MSFSObject MSOneDrive::filelist_getParentFSObject(const MSFSObject &fsObject){ if(parent != this->syncFileList.end()){ return parent.value(); } - else{ - return MSFSObject(); - } + + return MSFSObject(); } @@ -1381,14 +1355,7 @@ void MSOneDrive::filelist_populateChanges(const MSFSObject &changedFSObject){ bool MSOneDrive::testReplyBodyForError(const QString &body){ - if(body.contains(QStringLiteral("\"error\":"))){ - - return false; - - } - else{ - return true; - } + return !body.contains(QStringLiteral("\"error\":")); } @@ -1443,12 +1410,7 @@ bool MSOneDrive::readRemote(const QString &rootPath){ do{ - if(job[QStringLiteral("@odata.nextLink")].toString() != QStringLiteral("")){ - hasMore=true; - } - else{ - hasMore=false; - } + hasMore = job[QStringLiteral("@odata.nextLink")].toString() != QStringLiteral(""); int sz=items.size(); @@ -1807,11 +1769,7 @@ bool MSOneDrive::isFolder(const QJsonValue &remoteObject){ QJsonValue s=remoteObject.toObject()[QStringLiteral("folder")]; - if(s != QJsonValue()){ - return true; - } - - return false; + return s != QJsonValue(); } @@ -1820,11 +1778,7 @@ bool MSOneDrive::isFile(const QJsonValue &remoteObject){ QJsonValue s=remoteObject.toObject()[QStringLiteral("file")]; - if(s != QJsonValue()){ - return true; - } - - return false; + return s != QJsonValue(); } @@ -1847,7 +1801,7 @@ bool MSOneDrive::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -1880,7 +1834,7 @@ bool MSOneDrive::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -1938,7 +1892,7 @@ bool MSOneDrive::createSyncFileList(){ // make separately lists of objects QList keys = this->syncFileList.uniqueKeys(); - if((keys.size()>3) && (this->getFlag(QStringLiteral("singleThread")) == false)){// split list to few parts + if((keys.size()>3) && (!this->getFlag(QStringLiteral("singleThread")))){// split list to few parts this->threadsRunning = new QSemaphore(3); @@ -1967,8 +1921,8 @@ bool MSOneDrive::createSyncFileList(){ MSSyncThread* threads[3] = {thr1, thr2, thr3}; int j = 0; - for(int i = 0; ithreadSyncList.insert(keys[i],this->syncFileList.find(keys[i]).value()); + for(const auto& key : keys){ + threads[j++]->threadSyncList.insert(key,this->syncFileList.find(key).value()); if (j == 3) j = 0; } @@ -2123,11 +2077,10 @@ bool MSOneDrive::onAuthFinished(const QString &html, MSCloudProvider *provider){ emit providerAuthComplete(); return true; } - else{ - this->providerAuthStatus=false; - emit providerAuthComplete(); - return false; - } + + this->providerAuthStatus=false; + emit providerAuthComplete(); + return false; } diff --git a/ccross-app/src/YandexDisk/msyandexdisk.cpp b/ccross-app/src/YandexDisk/msyandexdisk.cpp index abfca9d..9476340 100644 --- a/ccross-app/src/YandexDisk/msyandexdisk.cpp +++ b/ccross-app/src/YandexDisk/msyandexdisk.cpp @@ -45,14 +45,12 @@ #define YADISK_MAX_FILESIZE 8000000 // 150000000 -MSYandexDisk::MSYandexDisk() : - MSCloudProvider() +MSYandexDisk::MSYandexDisk() { this->providerName= QStringLiteral("YandexDisk"); this->tokenFileName= QStringLiteral(".yadisk"); this->stateFileName= QStringLiteral(".yadisk_state"); this->trashFileName= QStringLiteral(".trash_yadisk"); - } @@ -135,11 +133,10 @@ Q_UNUSED(provider) emit providerAuthComplete(); return true; } - else{ - this->providerAuthStatus=false; - emit providerAuthComplete(); - return false; - } + + this->providerAuthStatus=false; + emit providerAuthComplete(); + return false; } //======================================================================================= @@ -210,7 +207,6 @@ void MSYandexDisk::loadStateFile(){ this->lastSyncTime=QJsonValue(job[QStringLiteral("last_sync")].toObject()[QStringLiteral("sec")]).toVariant().toULongLong(); key.close(); - return ; } //======================================================================================= @@ -473,19 +469,13 @@ bool MSYandexDisk::_readRemote(const QString &rootPath){ bool MSYandexDisk::isFile(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[QStringLiteral("type")].toString()==QStringLiteral("file")){ - return true; - } - return false; + return remoteObject.toObject()[QStringLiteral("type")].toString()==QStringLiteral("file"); } //======================================================================================= bool MSYandexDisk::isFolder(const QJsonValue &remoteObject){ - if(remoteObject.toObject()[QStringLiteral("type")].toString()==QStringLiteral("dir")){ - return true; - } - return false; + return remoteObject.toObject()[QStringLiteral("type")].toString()==QStringLiteral("dir"); } //======================================================================================= @@ -509,7 +499,7 @@ bool MSYandexDisk::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -542,7 +532,7 @@ bool MSYandexDisk::createSyncFileList(){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("wildcard")); continue; } - else if(instream.pos() == 7 && line == QStringLiteral("regexp")){ + if(instream.pos() == 7 && line == QStringLiteral("regexp")){ this->options.insert(QStringLiteral("filter-type"), QStringLiteral("regexp")); continue; } @@ -598,7 +588,7 @@ bool MSYandexDisk::createSyncFileList(){ // make separately lists of objects QList keys = this->syncFileList.uniqueKeys(); - if((keys.size()>3) && (this->getFlag(QStringLiteral("singleThread")) == false)){// split list to few parts + if((keys.size()>3) && (!this->getFlag(QStringLiteral("singleThread")))){// split list to few parts this->threadsRunning = new QSemaphore(3); @@ -631,8 +621,8 @@ bool MSYandexDisk::createSyncFileList(){ MSSyncThread* threads[3] = {thr1, thr2, thr3}; int j = 0; - for(int i = 0; ithreadSyncList.insert(keys[i],this->syncFileList.find(keys[i]).value()); + for(const auto& key : keys){ + threads[j++]->threadSyncList.insert(key,this->syncFileList.find(key).value()); if (j == 3) j = 0; } @@ -912,33 +902,26 @@ MSFSObject::ObjectState MSYandexDisk::filelist_defineObjectState(const MSLocalFS return MSFSObject::ObjectState::Sync; } - else{ - // compare last modified date for local and remote - if(local.modifiedDate==remote.modifiedDate){ - // return MSFSObject::ObjectState::Sync; + // compare last modified date for local and remote + if(local.modifiedDate==remote.modifiedDate){ - if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + // return MSFSObject::ObjectState::Sync; + if(this->strategy==MSCloudProvider::SyncStrategy::PreferLocal){ + return MSFSObject::ObjectState::ChangedLocal; } - else{ - if(local.modifiedDate > remote.modifiedDate){ - return MSFSObject::ObjectState::ChangedLocal; - } - else{ - return MSFSObject::ObjectState::ChangedRemote; - } + return MSFSObject::ObjectState::ChangedRemote; - } } + if(local.modifiedDate > remote.modifiedDate){ + return MSFSObject::ObjectState::ChangedLocal; + } + + return MSFSObject::ObjectState::ChangedRemote; } @@ -948,9 +931,8 @@ MSFSObject::ObjectState MSYandexDisk::filelist_defineObjectState(const MSLocalFS if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::NewLocal; } - else{ - return MSFSObject::ObjectState::DeleteRemote; - } + + return MSFSObject::ObjectState::DeleteRemote; } @@ -959,9 +941,8 @@ MSFSObject::ObjectState MSYandexDisk::filelist_defineObjectState(const MSLocalFS if(this->strategy == MSCloudProvider::SyncStrategy::PreferLocal){ return MSFSObject::ObjectState::DeleteLocal; } - else{ - return MSFSObject::ObjectState::NewRemote; - } + + return MSFSObject::ObjectState::NewRemote; } return MSFSObject::ObjectState::ErrorState; @@ -1422,12 +1403,7 @@ bool MSYandexDisk::filelist_FSObjectHasParent(const MSFSObject &fsObject){ // return true; // } - if((fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/"))){ - return true; - } - else{ - return false; - } + return (fsObject.path.count(QStringLiteral("/"))>=1)&&(fsObject.path!=QStringLiteral("/")); } @@ -1455,9 +1431,8 @@ MSFSObject MSYandexDisk::filelist_getParentFSObject(const MSFSObject &fsObject){ if(parent != this->syncFileList.end()){ return parent.value(); } - else{ - return MSFSObject(); - } + + return MSFSObject(); } @@ -1479,11 +1454,7 @@ bool MSYandexDisk::testReplyBodyForError(const QString &body) { QJsonObject job = json.object(); QJsonValue e=(job[QStringLiteral("error")]); - if(e.isNull()){ - return true; - } - - return false; + return e.isNull(); } @@ -1795,10 +1766,9 @@ bool MSYandexDisk::remote_file_makeFolder(MSFSObject *object){ //exit(1); return false; } - else{ - delete(req); - return true; - } + + delete(req); + return true; } @@ -1896,12 +1866,9 @@ bool MSYandexDisk::remote_file_trash(MSFSObject *object){ delete(req); return false; } - else{ - delete(req); - return true; - } - + delete(req); + return true; } diff --git a/ccross-app/src/common/mscloudprovider.cpp b/ccross-app/src/common/mscloudprovider.cpp index 77001c9..80a7c8b 100644 --- a/ccross-app/src/common/mscloudprovider.cpp +++ b/ccross-app/src/common/mscloudprovider.cpp @@ -93,10 +93,7 @@ bool MSCloudProvider::filterServiceFileNames(const QString &path){// return fals QRegExp regex(reg); int ind = regex.indexIn(path); - if(ind != -1){ - return false; - } - return true; + return ind == -1; } @@ -129,32 +126,25 @@ bool MSCloudProvider::filterIncludeFileNames(const QString &path){// return fals if(m != -1){ return false; } - else{ - if(isBegin){ - return false; - } - else{ - return true; - } - } + + return !isBegin; } - else{ - QStringList filters = this->includeList.split('|'); - //qDebug() << filters; - //qDebug() << path; - for(QString &filt : filters){ - QRegExp regex2(filt); - regex2.setPatternSyntax(QRegExp::Wildcard); - regex2.isValid(); - int m = regex2.indexIn(path); - - if(m != -1){ - //qDebug() << path << " match"; - return false; - } + + QStringList filters = this->includeList.split('|'); + //qDebug() << filters; + //qDebug() << path; + for(QString &filt : filters){ + QRegExp regex2(filt); + regex2.setPatternSyntax(QRegExp::Wildcard); + regex2.isValid(); + int m = regex2.indexIn(path); + + if(m != -1){ + //qDebug() << path << " match"; + return false; } - return true; } + return true; } //======================================================================================= @@ -187,35 +177,27 @@ bool MSCloudProvider::filterExcludeFileNames(const QString &path){// return fals if(m != -1){ return false; } - else{ - if(isBegin){ - return false; - } - else{ - return true; - } - } + + return !isBegin; } - else{ - QStringList filters = this->excludeList.split('|'); - for(QString &filt : filters){ - QRegExp regex2(filt); - regex2.setPatternSyntax(QRegExp::Wildcard); - regex2.isValid(); - int m = regex2.indexIn(path); - - if(m != -1){ - return false; - } + + QStringList filters = this->excludeList.split('|'); + for(QString &filt : filters){ + QRegExp regex2(filt); + regex2.setPatternSyntax(QRegExp::Wildcard); + regex2.isValid(); + int m = regex2.indexIn(path); + + if(m != -1){ + return false; } - return true; } + return true; } void MSCloudProvider::saveTokenFile(const QString &path){ // fix warning message Q_UNUSED(path); - return; } bool MSCloudProvider::loadTokenFile(const QString &path){ @@ -249,13 +231,7 @@ QString MSCloudProvider::fileChecksum(const QString &fileName, QCryptographicHas bool MSCloudProvider::createDirectoryPath(const QString &path){ int r= system(QString("mkdir -p \""+path+"\"").toStdString().c_str()); - if(r == 0){ - - return true; - } - else{ - return false; - } + return r == 0; } @@ -278,9 +254,8 @@ qint64 MSCloudProvider::toMilliseconds( QDateTime dateTime, bool isUTC){ return dateTime1.toMSecsSinceEpoch() - delta; } - else{ - return dateTime.toMSecsSinceEpoch(); - } + + return dateTime.toMSecsSinceEpoch(); } @@ -304,11 +279,9 @@ qint64 MSCloudProvider::toMilliseconds(const QString &dateTimeString, bool isUTC return d1.toMSecsSinceEpoch() - delta; } - else{ - QDateTime d=QDateTime::fromString(dateTimeString,Qt::DateFormat::ISODate); - return d.toMSecsSinceEpoch(); - } + QDateTime d=QDateTime::fromString(dateTimeString,Qt::DateFormat::ISODate); + return d.toMSecsSinceEpoch(); } @@ -340,33 +313,30 @@ QString MSCloudProvider::toRFC3339(qint64 timestamp){ if(d.timeSpec() == Qt::UTC){ return result+"Z"; } - else{ //if(d.timeSpec() == Qt::LocalTime){ //tz = d.timeZoneAbbreviation(); - int offset = d.offsetFromUtc(); + int offset = d.offsetFromUtc(); - if(offset < 0){ - offset = -offset; - sign="-"; + if(offset < 0){ + offset = -offset; + sign="-"; - } - else{ - sign="+"; - } - - offset /= 60; - offset /= 60; + } + else{ + sign="+"; + } - QString offDig=QString::number(offset); - if(offDig.length()<2){ - offDig="0"+offDig; - } + offset /= 60; + offset /= 60; - return result +sign +offDig; + QString offDig=QString::number(offset); + if(offDig.length()<2){ + offDig="0"+offDig; } + return result +sign +offDig; } @@ -384,9 +354,8 @@ bool MSCloudProvider::getFlag(const QString &flagName){ if(it != this->flags.end()){ return it.value(); } - else{ - return false; - } + + return false; } QString MSCloudProvider::getOption(const QString &optionName){ @@ -395,9 +364,8 @@ QString MSCloudProvider::getOption(const QString &optionName){ if(it != this->options.end()){ return it.value(); } - else{ - return QString(); - } + + return QString(); } @@ -474,9 +442,8 @@ QString MSCloudProvider::generateRandom(int count){ int Low=0x41; int High=0x5a; - QDateTime d; - qsrand(d.currentDateTime().toMSecsSinceEpoch()); + qsrand(QDateTime::currentDateTime().toMSecsSinceEpoch()); QString token=""; diff --git a/ccross-app/src/common/msfsobject.cpp b/ccross-app/src/common/msfsobject.cpp index 22c710b..93ca18e 100644 --- a/ccross-app/src/common/msfsobject.cpp +++ b/ccross-app/src/common/msfsobject.cpp @@ -60,7 +60,6 @@ QString MSFSObject::getObjectExtension(){ if(p >= 0){ return this->fileName.right(this->fileName.length() - p - 1); } - else{ - return QString(""); - } + + return QString(""); } diff --git a/ccross-app/src/common/msidslist.cpp b/ccross-app/src/common/msidslist.cpp index 14225d7..bd09da8 100644 --- a/ccross-app/src/common/msidslist.cpp +++ b/ccross-app/src/common/msidslist.cpp @@ -51,7 +51,6 @@ QString MSIDsList::getID(){ this->ids_iterator++; return id; } - else{ - return QString(); - } + + return QString(); } diff --git a/ccross-app/src/common/msoptparser.cpp b/ccross-app/src/common/msoptparser.cpp index adb04f5..27d8471 100644 --- a/ccross-app/src/common/msoptparser.cpp +++ b/ccross-app/src/common/msoptparser.cpp @@ -282,10 +282,9 @@ bool MSOptParser::getArg(){ if(QString(a.trimmed().at(0))==("-")){ return false; } - else{ - this->iit++; - return true; - } + + this->iit++; + return true; } @@ -302,9 +301,9 @@ QStringList MSOptParser::getParamByName(const QString ¶mName){ optItem opi; // find corresponding option at list - for(int opt=0;optopts.size();opt++){ + for(const auto& opt : opts){ - opi=this->opts.at(opt); + opi=opt; if((opi.longOpt == this->input.at(i)) || (opi.shortOpt == this->input.at(i)) ){ break; } diff --git a/ccross-app/src/common/msproviderspool.cpp b/ccross-app/src/common/msproviderspool.cpp index 6642140..a906420 100644 --- a/ccross-app/src/common/msproviderspool.cpp +++ b/ccross-app/src/common/msproviderspool.cpp @@ -120,13 +120,10 @@ void MSProvidersPool::setWorkPath(const QString &path){ } MSCloudProvider* MSProvidersPool::getProvider(const QString &providerName){ - for(int i=0; i< this->pool.size();i++){ - - if(this->pool[i]->providerName==providerName){ - return (MSCloudProvider*)this->pool[i]; - } - - } + auto iter = std::find_if(pool.begin(), pool.end(), + [&providerName](const MSCloudProvider* provider) { return provider->providerName==providerName; }); + if (iter != pool.end()) + return *iter; return NULL; } diff --git a/ccross-app/src/common/mssyncthread.cpp b/ccross-app/src/common/mssyncthread.cpp index 962ea0b..6bb505d 100644 --- a/ccross-app/src/common/mssyncthread.cpp +++ b/ccross-app/src/common/mssyncthread.cpp @@ -7,7 +7,7 @@ MSSyncThread::MSSyncThread(QObject *parent,MSCloudProvider* p) : QObject(parent) void MSSyncThread::run(){ - if(this->threadSyncList.size()>0){ + if(!this->threadSyncList.empty()){ this->provider->threadsRunning->acquire(1); this->provider->doSync(this->threadSyncList); this->provider->threadsRunning->release(1); @@ -16,5 +16,4 @@ void MSSyncThread::run(){ } emit finished(); this->thread()->quit(); - return; }