haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-15 22:59:43 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
Jonathan Xu
2019-07-25 17:55:37 +08:00
parent b9877a78ca 75eeadbfaf
commit f9686872d7
16 changed files with 663 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
server/repo-mgr.c
View File

@@ -4028,17 +4028,26 @@ seaf_repo_manager_add_upload_tmp_file (SeafRepoManager *mgr,
const char *tmp_file,
GError **error)
{
char *file_path_with_slash = NULL;
if (file_path[0] == '/') {
file_path_with_slash = g_strdup(file_path);
} else {
file_path_with_slash = g_strconcat("/", file_path, NULL);
}
int ret = seaf_db_statement_query (mgr->seaf->db,
"INSERT INTO WebUploadTempFiles "
"(repo_id, file_path, tmp_file_path) "
"VALUES (?, ?, ?)", 3, "string", repo_id,
"string", file_path, "string", tmp_file);
"string", file_path_with_slash, "string", tmp_file);
if (ret < 0) {
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_GENERAL,
"Failed to add upload tmp file record to db.");
}
g_free (file_path_with_slash);
return ret;
}
@@ -4048,15 +4057,33 @@ seaf_repo_manager_del_upload_tmp_file (SeafRepoManager *mgr,
const char *file_path,
GError **error)
{
char *file_path_with_slash = NULL, *file_path_no_slash = NULL;
/* Due to a bug in early versions of 7.0, some file_path may be stored in the db without
* a leading slash. To be compatible with those records, we need to check the path
* with and without leading slash.
*/
if (file_path[0] == '/') {
file_path_with_slash = g_strdup(file_path);
file_path_no_slash = g_strdup(file_path+1);
} else {
file_path_with_slash = g_strconcat("/", file_path, NULL);
file_path_no_slash = g_strdup(file_path);
}
int ret = seaf_db_statement_query (mgr->seaf->db,
"DELETE FROM WebUploadTempFiles WHERE "
"repo_id = ? AND file_path = ?",
2, "string", repo_id, "string", file_path);
"repo_id = ? AND file_path IN (?, ?)",
3, "string", repo_id,
"string", file_path_with_slash,
"string", file_path_no_slash);
if (ret < 0) {
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_GENERAL,
"Failed to delete upload tmp file record from db.");
}
g_free (file_path_with_slash);
g_free (file_path_no_slash);
return ret;
}
@@ -4077,18 +4104,51 @@ seaf_repo_manager_get_upload_tmp_file (SeafRepoManager *mgr,
GError **error)
{
char *tmp_file_path = NULL;
char *file_path_with_slash = NULL, *file_path_no_slash = NULL;
/* Due to a bug in early versions of 7.0, some file_path may be stored in the db without
* a leading slash. To be compatible with those records, we need to check the path
* with and without leading slash.
* The correct file_path in db should be with a leading slash.
*/
if (file_path[0] == '/') {
file_path_with_slash = g_strdup(file_path);
file_path_no_slash = g_strdup(file_path+1);
} else {
file_path_with_slash = g_strconcat("/", file_path, NULL);
file_path_no_slash = g_strdup(file_path);
}
int ret = seaf_db_statement_foreach_row (mgr->seaf->db,
"SELECT tmp_file_path FROM WebUploadTempFiles "
"WHERE repo_id = ? AND file_path = ?",
get_tmp_file_path, &tmp_file_path,
2, "string", repo_id, "string", file_path);
2, "string", repo_id,
"string", file_path_with_slash);
if (ret < 0) {
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_GENERAL,
"Failed to get upload temp file path from db.");
return NULL;
goto out;
}
if (!tmp_file_path) {
/* Try file_path without slash. */
int ret = seaf_db_statement_foreach_row (mgr->seaf->db,
"SELECT tmp_file_path FROM WebUploadTempFiles "
"WHERE repo_id = ? AND file_path = ?",
get_tmp_file_path, &tmp_file_path,
2, "string", repo_id,
"string", file_path_no_slash);
if (ret < 0) {
g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_GENERAL,
"Failed to get upload temp file path from db.");
goto out;
}
}
out:
g_free (file_path_with_slash);
g_free (file_path_no_slash);
return tmp_file_path;
}