Skip to content

Commit

Permalink
Align sync status icons
Browse files Browse the repository at this point in the history 
Display info state if we have ignored issues

Fixes: #7715
Fixes: #7365
Fixes: #7200
Fixes: #5860
  • Loading branch information
@TheOneRing
TheOneRing committed Aug 4, 2021
1 parent 1a153ca commit d8dd1f3
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 157 deletions.
13 changes: 13 additions & 0 deletions changelog/unreleased/7715
View file
@@ -0,0 +1,13 @@
Enhancement: Display the information state in case we encountered ignored errors

If syncing a file fails multiple times we mark it as ignored to skip it for a certain amount of time.
If we have ignored files we are not in sync, we now don't display the green icon.

Additionally this change aligns the icon displayed in the system tray with the icon displayed in the app.

https://github.com/owncloud/client/issues/7715
https://github.com/owncloud/client/issues/7365
https://github.com/owncloud/client/issues/7200
https://github.com/owncloud/client/issues/5860

https://github.com/owncloud/client/pull/8858
156 changes: 74 additions & 82 deletions src/gui/folderman.cpp
View file
Expand Up @@ -40,9 +40,24 @@ static const char versionC[] = "version";
static const int maxFoldersVersion = 1;

namespace OCC {

Q_LOGGING_CATEGORY(lcFolderMan, "gui.folder.manager", QtInfoMsg)

void OCC::TrayOverallStatusResult::addResult(const SyncResult &result)
{
_overallStatus._numNewConflictItems += result._numNewConflictItems;
_overallStatus._numErrorItems += result._numErrorItems;
}

void TrayOverallStatusResult::setStatus(SyncResult::Status status)
{
_overallStatus.setStatus(status);
}

const SyncResult TrayOverallStatusResult::overallStatus() const
{
return _overallStatus;
}

FolderMan *FolderMan::_instance = nullptr;

FolderMan::FolderMan(QObject *parent)
Expand Down Expand Up @@ -1220,107 +1235,84 @@ TrayOverallStatusResult FolderMan::trayOverallStatus(const QList<Folder *> &fold
{
TrayOverallStatusResult result;

int cnt = folders.count();

// if one folder: show the state of the one folder.
// if more folders:
// if one of them has an error -> show error
// if one is paused, but others ok, show ok
// do not show "problem" in the tray
//
if (cnt == 1) {
Folder *folder = folders.at(0);
if (folder) {
auto syncResult = folder->syncResult();
if (folder->syncPaused()) {
result.overallStatus = SyncResult::Paused;
} else {
SyncResult::Status syncStatus = syncResult.status();
switch (syncStatus) {
case SyncResult::Undefined:
result.overallStatus = SyncResult::Error;
break;
case SyncResult::Problem: // don't show the problem icon in tray.
result.overallStatus = SyncResult::Success;
break;
default:
result.overallStatus = syncStatus;
break;
}
}

result.hasUnresolvedConflicts = syncResult.hasUnresolvedConflicts();

auto currentFolderLastSyncDone = QDateTime::currentDateTime().addMSecs(-1 * folder->msecSinceLastSync().count());
if (folders.count()) {
auto currentFolderLastSyncDone = QDateTime::currentDateTime().addMSecs(-1 * folders.first()->msecSinceLastSync().count());

if (result.lastSyncDone.isNull()) {
if (result.lastSyncDone.isNull()) {
result.lastSyncDone = currentFolderLastSyncDone;
} else {
if (currentFolderLastSyncDone > result.lastSyncDone) {
result.lastSyncDone = currentFolderLastSyncDone;
} else {
if (currentFolderLastSyncDone > result.lastSyncDone) {
result.lastSyncDone = currentFolderLastSyncDone;
}
}
}
} else {
int errorsSeen = 0;
int goodSeen = 0;
int abortOrPausedSeen = 0;
int runSeen = 0;
int various = 0;

for (auto *folder : folders) {
SyncResult folderResult = folder->syncResult();
if (folder->syncPaused()) {
}
int errorsSeen = 0;
int goodSeen = 0;
int abortOrPausedSeen = 0;
int runSeen = 0;
int problemSeen = 0;

for (auto *folder : folders) {
const SyncResult folderResult = folder->syncResult();
if (folder->syncPaused()) {
abortOrPausedSeen++;
} else {
switch (folderResult.status()) {
case SyncResult::NotYetStarted:
Q_FALLTHROUGH();
case SyncResult::SyncPrepare:
Q_FALLTHROUGH();
case SyncResult::SyncRunning:
runSeen++;
break;
case SyncResult::Success:
goodSeen++;
break;
case SyncResult::Undefined:
Q_FALLTHROUGH();
case SyncResult::Problem:
problemSeen++;
break;
case SyncResult::Error:
Q_FALLTHROUGH();
case SyncResult::SetupError:
errorsSeen++;
break;
case SyncResult::SyncAbortRequested:
case SyncResult::Paused:
abortOrPausedSeen++;
} else {
SyncResult::Status syncStatus = folderResult.status();

switch (syncStatus) {
case SyncResult::Undefined:
case SyncResult::NotYetStarted:
various++;
break;
case SyncResult::SyncPrepare:
case SyncResult::SyncRunning:
runSeen++;
break;
case SyncResult::Problem: // don't show the problem icon in tray.
case SyncResult::Success:
goodSeen++;
break;
case SyncResult::Error:
case SyncResult::SetupError:
errorsSeen++;
break;
case SyncResult::SyncAbortRequested:
case SyncResult::Paused:
abortOrPausedSeen++;
// no default case on purpose, check compiler warnings
}
// no default case on purpose, check compiler warnings
}
if (folderResult.hasUnresolvedConflicts())
result.hasUnresolvedConflicts = true;
}
if (errorsSeen > 0) {
result.overallStatus = SyncResult::Error;
} else if (abortOrPausedSeen > 0 && abortOrPausedSeen == cnt) {
// only if all folders are paused
result.overallStatus = SyncResult::Paused;
} else if (runSeen > 0) {
result.overallStatus = SyncResult::SyncRunning;
} else if (goodSeen > 0) {
result.overallStatus = SyncResult::Success;
}
result.addResult(folderResult);
}
if (errorsSeen > 0) {
result.setStatus(SyncResult::Error);
} else if (problemSeen > 0) {
result.setStatus(SyncResult::Problem);
} else if (abortOrPausedSeen > 0 && abortOrPausedSeen == folders.size()) {
// only if all folders are paused
result.setStatus(SyncResult::Paused);
} else if (runSeen > 0) {
result.setStatus(SyncResult::SyncRunning);
} else if (goodSeen > 0) {
result.setStatus(SyncResult::Success);
}

return result;
}

QString FolderMan::trayTooltipStatusString(
SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused)
const SyncResult &syncStatus, bool paused)
{
QString folderMessage;
switch (syncStatus) {
switch (syncStatus.status()) {
case SyncResult::Undefined:
folderMessage = tr("Undefined State.");
break;
Expand All @@ -1335,7 +1327,7 @@ QString FolderMan::trayTooltipStatusString(
break;
case SyncResult::Success:
case SyncResult::Problem:
if (hasUnresolvedConflicts) {
if (syncStatus.hasUnresolvedConflicts()) {
folderMessage = tr("Sync was successful, unresolved conflicts.");
} else {
folderMessage = tr("Last Sync was successful.");
Expand Down
11 changes: 8 additions & 3 deletions src/gui/folderman.h
View file
Expand Up @@ -43,9 +43,14 @@ class LockWatcher;
class TrayOverallStatusResult
{
public:
SyncResult::Status overallStatus;
bool hasUnresolvedConflicts;
QDateTime lastSyncDone;

void addResult(const SyncResult &result);
void setStatus(SyncResult::Status status);
const SyncResult overallStatus() const;

private:
SyncResult _overallStatus;
};

/**
Expand Down Expand Up @@ -145,7 +150,7 @@ class FolderMan : public QObject
bool startFromScratch(const QString &);

/// Produce text for use in the tray tooltip
static QString trayTooltipStatusString(SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused);
static QString trayTooltipStatusString(const SyncResult &syncStatus, bool paused);

/**
* Compute status summarizing multiple folders
Expand Down
20 changes: 1 addition & 19 deletions src/gui/folderstatusmodel.cpp
View file
Expand Up @@ -239,28 +239,10 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
case FolderStatusDelegate::FolderStatusIconRole:
if (accountConnected) {
auto theme = Theme::instance();
auto status = f->syncResult().status();
if (f->syncPaused()) {
return theme->folderDisabledIcon();
} else {
if (status == SyncResult::SyncPrepare) {
return theme->syncStateIcon(SyncResult::SyncRunning);
} else if (status == SyncResult::Undefined) {
return theme->syncStateIcon(SyncResult::SyncRunning);
} else {
// The "Problem" *result* just means some files weren't
// synced, so we show "Success" in these cases. But we
// do use the "Problem" *icon* for unresolved conflicts.
if (status == SyncResult::Success || status == SyncResult::Problem) {
if (f->syncResult().hasUnresolvedConflicts()) {
return theme->syncStateIcon(SyncResult::Problem);
} else {
return theme->syncStateIcon(SyncResult::Success);
}
} else {
return theme->syncStateIcon(status);
}
}
return theme->syncStateIcon(f->syncResult().status());
}
} else {
return Theme::instance()->folderOfflineIcon();
Expand Down
3 changes: 1 addition & 2 deletions src/gui/libcloudproviders/libcloudproviders.cpp
View file
Expand Up @@ -213,8 +213,7 @@ void LibCloudProvidersPrivate::updateFolderExport()
status = CLOUD_PROVIDERS_ACCOUNT_STATUS_ERROR;

auto message = FolderMan::trayTooltipStatusString(
syncResult.status(),
syncResult.hasUnresolvedConflicts(),
syncResult,
folder->syncPaused());

cloud_providers_account_exporter_set_status(folderExport._exporter, status);
Expand Down
29 changes: 9 additions & 20 deletions src/gui/owncloudgui.cpp
View file
Expand Up @@ -265,42 +265,31 @@ void ownCloudGui::slotComputeOverallSyncStatus()

auto trayOverallStatusResult = FolderMan::trayOverallStatus(map.values());

// If the sync succeeded but there are unresolved conflicts,
// show the problem icon!
auto iconStatus = trayOverallStatusResult.overallStatus;
if (iconStatus == SyncResult::Success && trayOverallStatusResult.hasUnresolvedConflicts) {
iconStatus = SyncResult::Problem;
}

// If we don't get a status for whatever reason, that's a Problem
if (iconStatus == SyncResult::Undefined) {
iconStatus = SyncResult::Problem;
}

QIcon statusIcon = Theme::instance()->syncStateIcon(iconStatus, true, contextMenuVisible());
const QIcon statusIcon = Theme::instance()->syncStateIcon(trayOverallStatusResult.overallStatus(), true, contextMenuVisible());
_tray->setIcon(statusIcon);

// create the tray blob message, check if we have an defined state
if (map.count() > 0) {
#ifdef Q_OS_WIN
// Windows has a 128-char tray tooltip length limit.
trayMessage = FolderMan::instance()->trayTooltipStatusString(trayOverallStatusResult.overallStatus, trayOverallStatusResult.hasUnresolvedConflicts, false);
trayMessage = FolderMan::instance()->trayTooltipStatusString(trayOverallStatusResult.overallStatus(), false);
#else
QStringList allStatusStrings;
for (auto *folder : map) {
QString folderMessage = FolderMan::trayTooltipStatusString(
folder->syncResult().status(),
folder->syncResult().hasUnresolvedConflicts(),
folder->syncResult(),
folder->syncPaused());
allStatusStrings += tr("Folder %1: %2").arg(folder->shortGuiLocalPath(), folderMessage);
}
trayMessage = allStatusStrings.join(QLatin1String("\n"));
#endif
_tray->setToolTip(trayMessage);

if (trayOverallStatusResult.overallStatus == SyncResult::Success || trayOverallStatusResult.overallStatus == SyncResult::Problem) {
if (trayOverallStatusResult.hasUnresolvedConflicts) {
setStatusText(tr("Unresolved conflicts"));
if (trayOverallStatusResult.overallStatus().status() == SyncResult::Success || trayOverallStatusResult.overallStatus().status() == SyncResult::Problem) {
if (trayOverallStatusResult.overallStatus().hasUnresolvedConflicts()) {
setStatusText(tr("Unresolved %1 conflicts").arg(QString::number(trayOverallStatusResult.overallStatus().numNewConflictItems())));
} else if (trayOverallStatusResult.overallStatus().numErrorItems() != 0) {
setStatusText(tr("Errors %1").arg(QString::number(trayOverallStatusResult.overallStatus().numErrorItems())));
} else {
QString lastSyncDoneString;

Expand All @@ -313,7 +302,7 @@ void ownCloudGui::slotComputeOverallSyncStatus()

setStatusText(tr("Up to date (%1)").arg(lastSyncDoneString));
}
} else if (trayOverallStatusResult.overallStatus == SyncResult::Paused) {
} else if (trayOverallStatusResult.overallStatus().status() == SyncResult::Paused) {
setStatusText(tr("Synchronization is paused"));
} else {
setStatusText(tr("Error during synchronization"));
Expand Down
16 changes: 4 additions & 12 deletions src/libsync/syncresult.cpp
View file
Expand Up @@ -14,24 +14,16 @@

#include "syncresult.h"
#include "progressdispatcher.h"
#include "theme.h"

namespace OCC {

SyncResult::SyncResult()
: _status(Undefined)
, _foundFilesNotSynced(false)
, _folderStructureWasChanged(false)
, _numNewItems(0)
, _numRemovedItems(0)
, _numUpdatedItems(0)
, _numRenamedItems(0)
, _numNewConflictItems(0)
, _numOldConflictItems(0)
, _numErrorItems(0)

SyncResult::SyncResult(Status status)
: _status(status)
{
}


SyncResult::Status SyncResult::status() const
{
return _status;
Expand Down

0 comments on commit d8dd1f3

Please sign in to comment.