mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 23:17:13 +03:00
f6b35e5d58
The problem in this case is if we rename the file "xxx" to "invalid\file". The rename will fail because the new filename constains a slash, and it will be blacklisted. But then if the user re-rename the file to "valid_name", then we should invalidate the blacklist entry and retry to upload. But we did not do that because renaming don't change the mtime and we did not store the rename target in the database IL issue 558
108 lines
2.8 KiB
C++
108 lines
2.8 KiB
C++
/*
|
|
* Copyright (C) by Klaas Freitag <freitag@owncloud.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef SYNCJOURNALFILERECORD_H
|
|
#define SYNCJOURNALFILERECORD_H
|
|
|
|
#include <QString>
|
|
#include <QDateTime>
|
|
|
|
#include "owncloudlib.h"
|
|
|
|
namespace OCC {
|
|
|
|
class SyncFileItem;
|
|
|
|
/**
|
|
* @brief The SyncJournalFileRecord class
|
|
* @ingroup libsync
|
|
*/
|
|
class OWNCLOUDSYNC_EXPORT SyncJournalFileRecord
|
|
{
|
|
public:
|
|
SyncJournalFileRecord();
|
|
|
|
/// Creates a record from an existing item while updating the inode
|
|
SyncJournalFileRecord(const SyncFileItem&, const QString &localFileName);
|
|
|
|
/** Creates a basic SyncFileItem from the record
|
|
*
|
|
* This is intended in particular for read-update-write cycles that need
|
|
* to go through a a SyncFileItem, like PollJob.
|
|
*/
|
|
SyncFileItem toSyncFileItem();
|
|
|
|
bool isValid() {
|
|
return !_path.isEmpty();
|
|
}
|
|
|
|
QString _path;
|
|
quint64 _inode;
|
|
QDateTime _modtime;
|
|
int _type;
|
|
QByteArray _etag;
|
|
QByteArray _fileId;
|
|
qint64 _fileSize;
|
|
QByteArray _remotePerm;
|
|
bool _serverHasIgnoredFiles;
|
|
QByteArray _contentChecksum;
|
|
QByteArray _contentChecksumType;
|
|
};
|
|
|
|
bool OWNCLOUDSYNC_EXPORT
|
|
operator==(const SyncJournalFileRecord & lhs,
|
|
const SyncJournalFileRecord & rhs);
|
|
|
|
class SyncJournalErrorBlacklistRecord
|
|
{
|
|
public:
|
|
SyncJournalErrorBlacklistRecord()
|
|
: _retryCount(0)
|
|
, _lastTryModtime(0)
|
|
, _lastTryTime(0)
|
|
, _ignoreDuration(0)
|
|
{}
|
|
|
|
/// The number of times the operation was unsuccessful so far.
|
|
int _retryCount;
|
|
|
|
/// The last error string.
|
|
QString _errorString;
|
|
|
|
time_t _lastTryModtime;
|
|
QByteArray _lastTryEtag;
|
|
|
|
/// The last time the operation was attempted (in s since epoch).
|
|
time_t _lastTryTime;
|
|
|
|
/// The number of seconds the file shall be ignored.
|
|
time_t _ignoreDuration;
|
|
|
|
QString _file;
|
|
QString _renameTarget;
|
|
|
|
bool isValid() const;
|
|
|
|
/** Takes an old blacklist entry and updates it for a new sync result.
|
|
*
|
|
* The old entry may be invalid, then a fresh entry is created.
|
|
* If the returned record is invalid, the file shall not be
|
|
* blacklisted.
|
|
*/
|
|
static SyncJournalErrorBlacklistRecord update(
|
|
const SyncJournalErrorBlacklistRecord& old, const SyncFileItem& item);
|
|
};
|
|
|
|
}
|
|
|
|
#endif // SYNCJOURNALFILERECORD_H
|