get nickname from seahub database

Makefile.am

@@ -14,9 +14,9 @@ endif
 
 MAKE_SERVER = server tools $(MAKE_CONTROLLER) $(MAKE_FUSE)
 
-SUBDIRS = include lib common python $(MAKE_SERVER) doc
+SUBDIRS = include lib common python $(MAKE_SERVER) doc scripts
 
-DIST_SUBDIRS = include lib common python server tools controller fuse doc
+DIST_SUBDIRS = include lib common python server tools controller fuse doc scripts
 
 INTLTOOL = \
 	intltool-extract.in \

common/merge-new.c

@@ -13,13 +13,41 @@ merge_trees_recursive (const char *store_id, int version,
                        const char *basedir,
                        MergeOptions *opt);
 
+static char *
+get_nickname_by_modifier (GHashTable *email_to_nickname, const char *modifier)
+{
+    const char *nickname;
+
+    if (!modifier) {
+        return NULL;
+    }
+
+    nickname = g_hash_table_lookup (email_to_nickname, modifier);
+    if (nickname) {
+        return g_strdup (nickname);
+    }
+
+    if (seaf->seahub_db) {
+        char *sql = "SELECT nickname from profile_profile WHERE user = ?";
+        nickname = seaf_db_statement_get_string(seaf->seahub_db, sql, 1, "string", modifier);
+    }
+
+    if (!nickname) {
+        nickname = modifier;
+    }
+    g_hash_table_insert (email_to_nickname, g_strdup(modifier), g_strdup(nickname));
+
+    return g_strdup (nickname);
+}
+
 static char *
 merge_conflict_filename (const char *store_id, int version,
                          MergeOptions *opt,
                          const char *basedir,
                          const char *filename)
 {
     char *path = NULL, *modifier = NULL, *conflict_name = NULL;
+    char *nickname = NULL;
     gint64 mtime;
     SeafCommit *commit;
 
@@ -46,11 +74,14 @@ merge_conflict_filename (const char *store_id, int version,
         seaf_commit_unref (commit);
     }
 
-    conflict_name = gen_conflict_path (filename, modifier, mtime);
+    nickname = get_nickname_by_modifier (opt->email_to_nickname, modifier);
+
+    conflict_name = gen_conflict_path (filename, nickname, mtime);
 
 out:
     g_free (path);
     g_free (modifier);
+    g_free (nickname);
     return conflict_name;
 }
 
@@ -61,6 +92,7 @@ merge_conflict_dirname (const char *store_id, int version,
                         const char *dirname)
 {
     char *modifier = NULL, *conflict_name = NULL;
+    char *nickname = NULL;
     SeafCommit *commit;
 
     commit = seaf_commit_manager_get_commit (seaf->commit_mgr,
@@ -74,10 +106,13 @@ merge_conflict_dirname (const char *store_id, int version,
     modifier = g_strdup(commit->creator_name);
     seaf_commit_unref (commit);
 
-    conflict_name = gen_conflict_path (dirname, modifier, (gint64)time(NULL));
+    nickname = get_nickname_by_modifier (opt->email_to_nickname, modifier);
+
+    conflict_name = gen_conflict_path (dirname, nickname, (gint64)time(NULL));
 
 out:
     g_free (modifier);
+    g_free (nickname);
     return conflict_name;
 }
 

common/merge-new.h

@@ -25,6 +25,8 @@ typedef struct MergeOptions {
     char                merged_tree_root[41]; /* merge result */
     int                 visit_dirs;
     gboolean            conflict;
+
+    GHashTable          *email_to_nickname;
 } MergeOptions;
 
 int

common/seaf-utils.c

@@ -379,3 +379,103 @@ load_ccnet_database_config (SeafileSession *session)
     g_free (engine);
     return ret;
 }
+
+static int
+parse_seahub_db_config ()
+{
+    char buf[1024];
+    GError *error = NULL;
+    int retcode = 0;
+    char *child_stdout = NULL;
+    char *child_stderr = NULL;
+
+    char *binary_path = g_find_program_in_path ("parse_seahub_db.py");
+
+    snprintf (buf,
+          sizeof(buf),
+          "python3 %s",
+          binary_path);
+    g_spawn_command_line_sync (buf,
+                               &child_stdout,
+                               &child_stderr,
+                               &retcode,
+                               &error);
+
+    if (error != NULL) {
+        seaf_warning ("Failed to run python parse_seahub_db.py : %s\n", error->message);
+        return -1;
+    }
+    if (retcode != 0) {
+        seaf_warning ("Failed to run python parse_seahub_db.py [%d]: %s\n", retcode, strerror(errno));
+        return -1;
+    }
+
+    return 0;
+}
+
+int
+load_seahub_database_config (SeafileSession *session)
+{
+    int ret = 0;
+    json_t *object = NULL;
+    const char *engine = NULL, *name = NULL, *user = NULL, *password = NULL, *host = NULL, *charset = NULL;
+    int port;
+
+
+    char *json_file = g_build_filename ("/tmp", "seahub_db.json", NULL);
+
+    if (parse_seahub_db_config () < 0) {
+        seaf_warning ("Failed to parse seahub database config.\n");
+        ret = -1;
+        goto out;
+    }
+
+    object = json_load_file (json_file, 0, NULL);
+    if (!object) {
+        seaf_warning ("Failed to load seahub db json file: %s\n", json_file);
+        ret = -1;
+        goto out;
+    }
+
+    engine = json_object_get_string_member (object, "ENGINE");
+    name = json_object_get_string_member (object, "NAME");
+    user = json_object_get_string_member (object, "USER");
+    password = json_object_get_string_member (object, "PASSWORD");
+    host = json_object_get_string_member (object, "HOST");
+    charset = json_object_get_string_member (object, "CHARSET");
+    port = json_object_get_int_member (object, "PORT");
+    if (port <= 0) {
+        port = MYSQL_DEFAULT_PORT;
+    }
+
+    if (!engine || strstr (engine, "sqlite") != NULL) {
+        seaf_message ("Use database sqlite\n");
+        session->seahub_db = seaf_db_new_sqlite (name, DEFAULT_MAX_CONNECTIONS);
+        if (!session->seahub_db) {
+            seaf_warning ("Failed to open seahub database.\n");
+            ret = -1;
+            goto out;
+        }
+    }
+#ifdef HAVE_MYSQL
+    else if (strstr (engine, "mysql") != NULL) {
+        seaf_message("Use database Mysql\n");
+        session->seahub_db = seaf_db_new_mysql (host, port, user, password, name, NULL, FALSE, FALSE, NULL, charset, DEFAULT_MAX_CONNECTIONS);
+        if (!session->seahub_db) {
+            seaf_warning ("Failed to open seahub database.\n");
+            ret = -1;
+            goto out;
+        }
+    }
+#endif
+    else {
+        seaf_warning ("Unknown database type: %s.\n", engine);
+        ret = -1;
+    }
+
+out:
+    if (object)
+        json_decref (object);
+    g_free (json_file);
+    return ret;
+}

common/seaf-utils.h

@@ -16,4 +16,7 @@ load_database_config (struct _SeafileSession *session);
 int
 load_ccnet_database_config (struct _SeafileSession *session);
 
+int
+load_seahub_database_config (SeafileSession *session);
+
 #endif

configure.ac

@@ -317,6 +317,7 @@ AC_CONFIG_FILES(
     controller/Makefile
     tools/Makefile
     doc/Makefile
+    scripts/Makefile
 )
 
 AC_OUTPUT

fileserver/fileop.go

@@ -1770,6 +1770,7 @@ func genCommitNeedRetry(repo *repomgr.Repo, base *commitmgr.Commit, commit *comm
 		opt := new(mergeOptions)
 		opt.remoteRepoID = repoID
 		opt.remoteHead = commit.CommitID
+		opt.emailToNickname = make(map[string]string)
 
 		err := mergeTrees(repo.StoreID, roots, opt)
 		if err != nil {

fileserver/fileserver.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"database/sql"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"io"
@@ -14,6 +15,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"runtime/debug"
+	"strconv"
 	"strings"
 	"syscall"
 
@@ -41,7 +43,7 @@ var pidFilePath string
 var logFp *os.File
 
 var dbType string
-var seafileDB, ccnetDB *sql.DB
+var seafileDB, ccnetDB, seahubDB *sql.DB
 
 // when SQLite is used, user and group db are separated.
 var userDB, groupDB *sql.DB
@@ -58,6 +60,7 @@ func init() {
 
 const (
 	timestampFormat = "[2006-01-02 15:04:05] "
+	seahubDBPath    = "/tmp/seahub_db.json"
 )
 
 type LogFormatter struct{}
@@ -269,6 +272,49 @@ func loadSeafileDB() {
 	dbType = dbEngine
 }
 
+func loadSeahubDB() {
+	dbData, err := ioutil.ReadFile(seahubDBPath)
+	if err != nil {
+		log.Warnf("Failed to read seahub database json file: %v", err)
+		return
+	}
+
+	dbConfig := make(map[string]string)
+
+	err = json.Unmarshal(dbData, &dbConfig)
+	if err != nil {
+		log.Warnf("Failed to decode seahub database json file: %v", err)
+		return
+	}
+
+	dbEngine := dbConfig["ENGINE"]
+	dbName := dbConfig["NAME"]
+	user := dbConfig["USER"]
+	password := dbConfig["PASSWORD"]
+	host := dbConfig["HOST"]
+	portStr := dbConfig["PORT"]
+
+	if strings.Index(dbEngine, "mysql") >= 0 {
+		port, err := strconv.ParseInt(portStr, 10, 64)
+		if err != nil || port <= 0 {
+			port = 3306
+		}
+		dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?tls=%t", user, password, host, port, dbName, false)
+
+		seahubDB, err = sql.Open("mysql", dsn)
+		if err != nil {
+			log.Warnf("Failed to open database: %v", err)
+		}
+	} else if strings.Index(dbEngine, "sqlite") >= 0 {
+		seahubDB, err = sql.Open("sqlite3", dbName)
+		if err != nil {
+			log.Warnf("Failed to open database %s: %v", dbName, err)
+		}
+	} else {
+		log.Warnf("Unsupported database %s.", dbEngine)
+	}
+}
+
 func writePidFile(pid_file_path string) error {
 	file, err := os.OpenFile(pid_file_path, os.O_CREATE|os.O_WRONLY, 0664)
 	if err != nil {
@@ -367,6 +413,8 @@ func main() {
 		fp.Close()
 	}
 
+	loadSeahubDB()
+
 	repomgr.Init(seafileDB)
 
 	fsmgr.Init(centralDir, dataDir, option.FsCacheLimit)

fileserver/merge.go

@@ -12,10 +12,11 @@ import (
 )
 
 type mergeOptions struct {
-	remoteRepoID string
-	remoteHead   string
-	mergedRoot   string
-	conflict     bool
+	remoteRepoID    string
+	remoteHead      string
+	mergedRoot      string
+	conflict        bool
+	emailToNickname map[string]string
 }
 
 func mergeTrees(storeID string, roots []string, opt *mergeOptions) error {
@@ -335,7 +336,9 @@ func mergeConflictFileName(storeID string, opt *mergeOptions, baseDir, fileName
 		mtime = time.Now().Unix()
 	}
 
-	conflictName := genConflictPath(fileName, modifier, mtime)
+	nickname := getNickNameByModifier(opt.emailToNickname, modifier)
+
+	conflictName := genConflictPath(fileName, nickname, mtime)
 
 	return conflictName, nil
 }
@@ -366,6 +369,29 @@ func genConflictPath(originPath, modifier string, mtime int64) string {
 	return conflictPath
 }
 
+func getNickNameByModifier(emailToNickname map[string]string, modifier string) string {
+	if modifier == "" {
+		return ""
+	}
+	nickname, ok := emailToNickname[modifier]
+	if ok {
+		return nickname
+	}
+	if seahubDB != nil {
+		sqlStr := "SELECT nickname from profile_profile WHERE user = ?"
+		row := seahubDB.QueryRow(sqlStr, modifier)
+		row.Scan(&nickname)
+	}
+
+	if nickname == "" {
+		nickname = modifier
+	}
+
+	emailToNickname[modifier] = nickname
+
+	return nickname
+}
+
 func getFileModifierMtime(repoID, storeID, head, filePath string) (string, int64, error) {
 	commit, err := commitmgr.Load(repoID, head)
 	if err != nil {