WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-07 03:17:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not refresh explorer when restart

Browse Source
This commit is contained in:
caixiangyue 2020-01-21 09:59:42 +08:00
parent ac14eda9c1
commit 6249e4abe7
6 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/http-tx-mgr.c
View File

@ -3607,7 +3607,8 @@ set_path_status_syncing (gpointer key, gpointer value, gpointer user_data)
task->repo_id,
path,
mode,
SYNC_STATUS_SYNCING);
SYNC_STATUS_SYNCING,
TRUE);
}
static void
@ -3620,7 +3621,8 @@ set_path_status_synced (gpointer key, gpointer value, gpointer user_data)
task->repo_id,
path,
mode,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
TRUE);
}
static void *

78
daemon/repo-mgr.c
View File

@ -1243,7 +1243,8 @@ add_file (const char *repo_id,
repo_id,
path,
S_IFREG,
status);
status,
FALSE);
/* send an error notification for read-only repo when modifying a file. */
if (status == SYNC_STATUS_SYNCING && !is_writable)
send_file_sync_error_notification (repo_id, NULL, path,
@ -1281,7 +1282,8 @@ add_file (const char *repo_id,
repo_id,
path,
S_IFREG,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
FALSE);
} else {
if (total_size)
*total_size += (gint64)(st->st_size);
@ -1309,7 +1311,8 @@ add_file (const char *repo_id,
repo_id,
path,
S_IFREG,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
FALSE);
}
if (added && options && options->changeset) {
/* ce may be updated. */
@ -1332,7 +1335,8 @@ add_file (const char *repo_id,
repo_id,
path,
S_IFREG,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
send_file_sync_error_notification (repo_id, NULL, path,
SYNC_ERROR_ID_INDEX_ERROR);
}
@ -1376,7 +1380,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
return 0;
}
@ -1411,7 +1416,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
subpath,
S_IFREG,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
}
g_free (subpath);
g_free (full_subpath);
@ -1445,7 +1451,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
return 0;
}
@ -1469,7 +1476,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
status);
status,
FALSE);
}
if (n == 0 && path[0] != 0 && is_writable) {
@ -1528,7 +1536,8 @@ add_recursive (const char *repo_id,
repo_id,
path,
0,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
return 0;
}
@ -1639,7 +1648,8 @@ iter_dir_cb (wchar_t *full_parent_w,
params->repo_id,
path,
S_IFREG,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
}
goto out;
}
@ -1695,7 +1705,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
return 0;
}
@ -1704,7 +1715,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
return 0;
}
@ -1728,7 +1740,8 @@ add_dir_recursive (const char *path, const char *full_path, SeafStat *st,
params->repo_id,
path,
S_IFDIR,
status);
status,
FALSE);
}
if (data.n == 0 && path[0] != 0 && !params->ignore_empty_dir && is_writable) {
@ -1777,7 +1790,8 @@ add_recursive (const char *repo_id,
repo_id,
path,
0,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
/* Ignore error */
return 0;
}
@ -2225,14 +2239,16 @@ add_remain_files (SeafRepo *repo, struct index_state *istate,
repo->id,
path,
S_IFREG,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
TRUE);
}
if (ret < 0) {
seaf_sync_manager_update_active_path (seaf->sync_mgr,
repo->id,
path,
S_IFREG,
SYNC_STATUS_ERROR);
SYNC_STATUS_ERROR,
TRUE);
send_file_sync_error_notification (repo->id, NULL, path,
SYNC_ERROR_ID_INDEX_ERROR);
}
@ -2763,7 +2779,8 @@ update_active_file (SeafRepo *repo,
repo->id,
path,
S_IFREG,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
} else {
SyncStatus status;
gboolean is_writable;
@ -2785,7 +2802,8 @@ update_active_file (SeafRepo *repo,
repo->id,
path,
S_IFREG,
status);
status,
TRUE);
}
}
@ -2894,7 +2912,8 @@ update_active_path_recursive (SeafRepo *repo,
repo->id,
path,
S_IFDIR,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
} else {
/* There is no need to update an empty dir. */
SyncStatus status;
@ -2907,7 +2926,8 @@ update_active_path_recursive (SeafRepo *repo,
repo->id,
path,
S_IFDIR,
status);
status,
TRUE);
}
}
}
@ -2987,7 +3007,8 @@ update_active_path_recursive (SeafRepo *repo,
repo->id,
path,
S_IFDIR,
SYNC_STATUS_IGNORED);
SYNC_STATUS_IGNORED,
TRUE);
} else {
/* There is no need to update an empty dir. */
SyncStatus status;
@ -3000,7 +3021,8 @@ update_active_path_recursive (SeafRepo *repo,
repo->id,
path,
S_IFDIR,
status);
status,
TRUE);
}
}
}
@ -4325,7 +4347,8 @@ fetch_file_thread_func (gpointer data, gpointer user_data)
repo_id,
de->name,
de->mode,
SYNC_STATUS_SYNCING);
SYNC_STATUS_SYNCING,
TRUE);
rc = fetch_file_http (tx_data, task);
@ -4633,7 +4656,8 @@ handle_dir_added_de (const char *repo_id,
repo_id,
de->name,
de->mode,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
TRUE);
update_index:
if (add_ce) {
@ -4748,7 +4772,8 @@ download_files_http (const char *repo_id,
repo_id,
de->name,
de->mode,
status);
status,
TRUE);
}
if (task->new_ce) {
@ -5213,7 +5238,8 @@ update_sync_status (struct cache_entry *ce, void *user_data)
repo_id,
ce->name,
ce->ce_mode,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
TRUE);
}
#ifdef WIN32

14
daemon/sync-mgr.c
View File

@ -1517,7 +1517,8 @@ handle_locked_file_update (SeafRepo *repo, struct index_state *istate,
repo->id,
path,
S_IFREG,
SYNC_STATUS_SYNCED);
SYNC_STATUS_SYNCED,
TRUE);
/* In checkout, the file was overwritten by rename, so the file attributes
are gone. We have to set read-only state again.
@ -2225,7 +2226,8 @@ seaf_sync_manager_update_active_path (SeafSyncManager *mgr,
const char *repo_id,
const char *path,
int mode,
SyncStatus status)
SyncStatus status,
gboolean refresh)
{
ActivePathsInfo *info;
SeafRepo *repo;
@ -2257,9 +2259,9 @@ seaf_sync_manager_update_active_path (SeafSyncManager *mgr,
if (!existing) {
g_hash_table_insert (info->paths, g_strdup(path), (void*)status);
if (status == SYNC_STATUS_SYNCING)
sync_status_tree_add (info->syncing_tree, path, mode);
sync_status_tree_add (info->syncing_tree, path, mode, refresh);
else if (status == SYNC_STATUS_SYNCED)
sync_status_tree_add (info->synced_tree, path, mode);
sync_status_tree_add (info->synced_tree, path, mode, refresh);
else {
#ifdef WIN32
seaf_sync_manager_add_refresh_path (mgr, path);
@ -2274,9 +2276,9 @@ seaf_sync_manager_update_active_path (SeafSyncManager *mgr,
sync_status_tree_del (info->synced_tree, path);
if (status == SYNC_STATUS_SYNCING)
sync_status_tree_add (info->syncing_tree, path, mode);
sync_status_tree_add (info->syncing_tree, path, mode, refresh);
else if (status == SYNC_STATUS_SYNCED)
sync_status_tree_add (info->synced_tree, path, mode);
sync_status_tree_add (info->synced_tree, path, mode, refresh);
#ifdef WIN32
seaf_sync_manager_add_refresh_path (mgr, path);

3
daemon/sync-mgr.h
View File

@ -146,7 +146,8 @@ seaf_sync_manager_update_active_path (SeafSyncManager *mgr,
const char *repo_id,
const char *path,
int mode,
SyncStatus status);
SyncStatus status,
gboolean refresh);
void
seaf_sync_manager_delete_active_path (SeafSyncManager *mgr,

6
daemon/sync-status-tree.c
View File

@ -125,7 +125,8 @@ sync_status_tree_free (struct SyncStatusTree *tree)
void
sync_status_tree_add (SyncStatusTree *tree,
const char *path,
int mode)
int mode,
gboolean refresh)
{
char **dnames = NULL;
guint n, i;
@ -167,7 +168,8 @@ sync_status_tree_add (SyncStatusTree *tree,
dir = dirent->subdir;
}
#ifdef WIN32
seaf_sync_manager_add_refresh_path (seaf->sync_mgr, buf->str);
if (refresh)
seaf_sync_manager_add_refresh_path (seaf->sync_mgr, buf->str);
#endif
}
}

3
daemon/sync-status-tree.h
View File

@ -16,7 +16,8 @@ sync_status_tree_free (struct SyncStatusTree *tree);
void
sync_status_tree_add (struct SyncStatusTree *tree,
const char *path,
int mode);
int mode,
gboolean refresh);
/*
* Delete a path from the tree. If directory becomes empty after the deletion,