зеркало из https://github.com/nextcloud/desktop.git
Merge remote-tracking branch 'origin/2.3'
This commit is contained in:
Christian Kamm
Коммит
5eaae83a01
|
|
@ -439,7 +439,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
|
|||
* In other words, anything that is between path+'/' and path+'0',
|
||||
* (because '0' follows '/' in ascii)
|
||||
*/
|
||||
const char *below_path_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE path > (?||'/') AND path < (?||'0')";
|
||||
const char *below_path_query = "SELECT " METADATA_COLUMNS " FROM metadata WHERE path > (?||'/') AND path < (?||'0') ORDER BY path||'/' ASC";
|
||||
SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, below_path_query, -1, &stmt, NULL));
|
||||
ctx->statedb.lastReturnValue = rc;
|
||||
if( rc != SQLITE_OK ) {
|
||||
|
|
@ -462,6 +462,36 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
|
|||
|
||||
rc = _csync_file_stat_from_metadata_table( &st, stmt);
|
||||
if( st ) {
|
||||
/* When selective sync is used, the database may have subtrees with a parent
|
||||
* whose etag (md5) is _invalid_. These are ignored and shall not appear in the
|
||||
* remote tree.
|
||||
* Sometimes folders that are not ignored by selective sync get marked as
|
||||
* _invalid_, but that is not a problem as the next discovery will retrieve
|
||||
* their correct etags again and we don't run into this case.
|
||||
*/
|
||||
if( c_streq(st->etag, "_invalid_") ) {
|
||||
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s selective sync excluded", st->path);
|
||||
char *skipbase = c_strdup(st->path);
|
||||
skipbase[st->pathlen] = '/';
|
||||
int skiplen = st->pathlen + 1;
|
||||
|
||||
/* Skip over all entries with the same base path. Note that this depends
|
||||
* strongly on the ordering of the retrieved items. */
|
||||
do {
|
||||
csync_file_stat_free(st);
|
||||
rc = _csync_file_stat_from_metadata_table( &st, stmt);
|
||||
if( st && strncmp(st->path, skipbase, skiplen) != 0 ) {
|
||||
break;
|
||||
}
|
||||
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s selective sync excluded because the parent is", st->path);
|
||||
} while( rc == SQLITE_ROW );
|
||||
|
||||
/* End of data? */
|
||||
if( rc != SQLITE_ROW || !st ) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check for exclusion from the tree.
|
||||
* Note that this is only a safety net in case the ignore list changes
|
||||
* without a full remote discovery being triggered. */
|
||||
|
|
|
|||
|
|
@ -51,4 +51,3 @@ This option provides the ability to either: keep the existing data (synced by th
|
|||
|
||||
Make your choice and click "**Connect...**".
|
||||
This will then step you through the Connection Wizard, just as you did when you setup the previous sync connection, but giving you the opportunity to choose a new sync directory.
|
||||
|
||||
|
|
|
|||
|
|
@ -961,6 +961,21 @@ X-GNOME-Autostart-Delay=3
|
|||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
|
||||
|
||||
# Translations
|
||||
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
|
||||
GenericName[oc]=Dorsièr de Sincronizacion
|
||||
|
|
|
|||
|
|
@ -150,6 +150,14 @@ public:
|
|||
/**
|
||||
* Make sure that on the next sync, fileName is not read from the DB but uses the PROPFIND to
|
||||
* get the info from the server
|
||||
*
|
||||
* Specifically, this sets the md5 field of fileName and all its parents to _invalid_.
|
||||
* That causes a metadata difference and a resulting discovery from the remote for the
|
||||
* affected folders.
|
||||
*
|
||||
* Since folders in the selective sync list will not be rediscovered (csync_ftw,
|
||||
* _csync_detect_update skip them), the _invalid_ marker will stay and it. And any
|
||||
* child items in the db will be ignored when reading a remote tree from the database.
|
||||
*/
|
||||
void avoidReadFromDbOnNextSync(const QString &fileName);
|
||||
|
||||
|
|
|
|||
|
|
@ -213,6 +213,49 @@ private slots:
|
|||
}
|
||||
}
|
||||
|
||||
void testSelectiveSyncBug() {
|
||||
// issue owncloud/enterprise#1965: files from selective-sync ignored
|
||||
// folders are uploaded anyway is some circumstances.
|
||||
FakeFolder fakeFolder{FileInfo{ QString(), {
|
||||
FileInfo { QStringLiteral("parentFolder"), {
|
||||
FileInfo{ QStringLiteral("subFolder"), {
|
||||
{ QStringLiteral("fileA.txt"), 400 },
|
||||
{ QStringLiteral("fileB.txt"), 400, 'o' }
|
||||
}}
|
||||
}}
|
||||
}}};
|
||||
|
||||
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
|
||||
auto expectedServerState = fakeFolder.currentRemoteState();
|
||||
|
||||
// Remove subFolder with selectiveSync:
|
||||
fakeFolder.syncEngine().journal()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList,
|
||||
{"parentFolder/subFolder/"});
|
||||
fakeFolder.syncEngine().journal()->avoidReadFromDbOnNextSync("parentFolder/subFolder/");
|
||||
|
||||
// But touch a local file before the next sync, such that the local folder
|
||||
// can't be removed
|
||||
fakeFolder.localModifier().setContents("parentFolder/subFolder/fileB.txt", 'n');
|
||||
|
||||
// Several follow-up syncs don't change the state at all,
|
||||
// in particular the remote state doesn't change and fileB.txt
|
||||
// isn't uploaded.
|
||||
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
fakeFolder.syncOnce();
|
||||
|
||||
{
|
||||
// Nothing changed on the server
|
||||
QCOMPARE(fakeFolder.currentRemoteState(), expectedServerState);
|
||||
// The local state should still have subFolderA
|
||||
auto local = fakeFolder.currentLocalState();
|
||||
QVERIFY(local.find("parentFolder/subFolder"));
|
||||
QVERIFY(local.find("parentFolder/subFolder/fileA.txt"));
|
||||
QVERIFY(local.find("parentFolder/subFolder/fileB.txt"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void abortAfterFailedMkdir() {
|
||||
FakeFolder fakeFolder{FileInfo{}};
|
||||
QSignalSpy finishedSpy(&fakeFolder.syncEngine(), SIGNAL(finished(bool)));
|
||||
|
|
|
|||
|
|
@ -1216,7 +1216,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
|
|||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="85"/>
|
||||
<source>Ask for confirmation before synchronizing folders larger than</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Chiedi conferma prima di scaricare cartelle più grandi di</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="105"/>
|
||||
|
|
@ -1227,7 +1227,7 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
|
|||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="127"/>
|
||||
<source>Ask for confirmation before synchronizing external storages</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>Chiedi conferma prima di sincronizzare storage esterni</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/generalsettings.ui" line="26"/>
|
||||
|
|
|
|||
|
|
@ -713,7 +713,7 @@
|
|||
<message numerus="yes">
|
||||
<location filename="../src/gui/folder.cpp" line="409"/>
|
||||
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
|
||||
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não puderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
|
||||
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivo(s) não puderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/folder.cpp" line="411"/>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
<message>
|
||||
<location filename="../src/gui/accountsettings.ui" line="198"/>
|
||||
<source>Synchronize all</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>同步全部</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/accountsettings.ui" line="205"/>
|
||||
|
|
@ -1830,7 +1830,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="225"/>
|
||||
<source>Invalid URL</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>无效URL</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/gui/owncloudsetupwizard.cpp" line="388"/>
|
||||
|
|
@ -3838,7 +3838,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
|
||||
<source>Updated local metadata</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>已更新本地元数据</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
|
||||
|
|
@ -3880,7 +3880,7 @@ It is not advisable to use it.</source>
|
|||
<message>
|
||||
<location filename="../src/libsync/progressdispatcher.cpp" line="83"/>
|
||||
<source>updating local metadata</source>
|
||||
<translation type="unfinished"/>
|
||||
<translation>正在更新本地元数据</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче