Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update server profile
boojackc3c2882dc588
diff --git a/api/system.go b/api/system.goindex 71aa7806c..66756a4d1 100644--- a/api/system.go+++ b/api/system.go@@ -1,8 +1,8 @@package api-import "memos/common"+import "memos/server/profile"type SystemStatus struct {- Owner *User `json:"owner"`- Profile *common.Profile `json:"profile"`+ Owner *User `json:"owner"`+ Profile *profile.Profile `json:"profile"`}diff --git a/bin/server/cmd/root.go b/bin/server/cmd/root.goindex 8573e22d4..9ff059de2 100644--- a/bin/server/cmd/root.go+++ b/bin/server/cmd/root.go@@ -4,8 +4,8 @@ import ("fmt""os"- "memos/common""memos/server"+ "memos/server/profile""memos/store"DB "memos/store/db")@@ -22,7 +22,7 @@ const ()type Main struct {- profile *common.Profile+ profile *profile.Profile}func (m *Main) Run() error {@@ -44,7 +44,7 @@ func (m *Main) Run() error {}func Execute() {- profile := common.GetProfile()+ profile := profile.GetProfile()m := Main{profile: profile,}diff --git a/common/profile.go b/server/profile/profile.gosimilarity index 92%rename from common/profile.gorename to server/profile/profile.goindex 845bc1f20..8c4f6f576 100644--- a/common/profile.go+++ b/server/profile/profile.go@@ -1,13 +1,15 @@-package common+package profileimport ("fmt"+ "memos/common""os""path/filepath""strconv""strings")+// Profile is the configuration to start main server.type Profile struct {// Mode can be "prod" or "dev"Mode string `json:"mode"`@@ -69,6 +71,6 @@ func GetProfile() *Profile {Mode: mode,Port: port,DSN: dsn,- Version: Version,+ Version: common.Version,}}diff --git a/server/server.go b/server/server.goindex 81357d04c..c5c3c676e 100644--- a/server/server.go+++ b/server/server.go@@ -2,7 +2,7 @@ package serverimport ("fmt"- "memos/common"+ "memos/server/profile""memos/store""time"@@ -16,12 +16,12 @@ import (type Server struct {e *echo.Echo- Profile *common.Profile+ Profile *profile.ProfileStore *store.Store}-func NewServer(profile *common.Profile) *Server {+func NewServer(profile *profile.Profile) *Server {e := echo.New()e.Debug = truee.HideBanner = truediff --git a/store/db/db.go b/store/db/db.goindex 155e0f6d2..5eb432cc0 100644--- a/store/db/db.go+++ b/store/db/db.go@@ -7,6 +7,7 @@ import ("fmt""io/fs""memos/common"+ "memos/server/profile""os""sort"@@ -20,6 +21,7 @@ var migrationFS embed.FSvar seedFS embed.FStype DB struct {+ // sqlite db connection instanceDb *sql.DB// datasource nameDSN string@@ -28,7 +30,7 @@ type DB struct {}// NewDB returns a new instance of DB associated with the given datasource name.-func NewDB(profile *common.Profile) *DB {+func NewDB(profile *profile.Profile) *DB {db := &DB{DSN: profile.DSN,mode: profile.Mode,@@ -76,31 +78,9 @@ func (db *DB) Open() (err error) {}func (db *DB) migrate() error {- table, err := findTable(db, "migration_history")+ err := db.compareMigrationHistory()if err != nil {- return err- }- if table == nil {- createTable(db, `- CREATE TABLE migration_history (- version TEXT NOT NULL PRIMARY KEY,- created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now'))- );- `)- }-- migrationHistoryList, err := findMigrationHistoyList(db)- if err != nil {- return err- }-- if len(migrationHistoryList) == 0 {- createMigrationHistoy(db, common.Version)- } else {- migrationHistory := migrationHistoryList[0]- if migrationHistory.Version != common.Version {- createMigrationHistoy(db, common.Version)- }+ return fmt.Errorf("failed to compare migration history, err=%w", err)}filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/*.sql", "migration"))@@ -154,15 +134,34 @@ func (db *DB) executeFile(FS embed.FS, name string) error {return tx.Commit()}-func FormatError(err error) error {- if err == nil {- return nil+// compareMigrationHistory compares migration history data+func (db *DB) compareMigrationHistory() error {+ table, err := findTable(db, "migration_history")+ if err != nil {+ return err+ }+ if table == nil {+ createTable(db, `+ CREATE TABLE migration_history (+ version TEXT NOT NULL PRIMARY KEY,+ created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now'))+ );+ `)}- switch err {- case sql.ErrNoRows:- return errors.New("data not found")- default:+ migrationHistoryList, err := findMigrationHistoryList(db)+ if err != nil {return err}++ if len(migrationHistoryList) == 0 {+ createMigrationHistory(db, common.Version)+ } else {+ migrationHistory := migrationHistoryList[0]+ if migrationHistory.Version != common.Version {+ createMigrationHistory(db, common.Version)+ }+ }++ return nil}diff --git a/store/db/migration_history.go b/store/db/migration_history.goindex 382f1ee99..b2c875fe9 100644--- a/store/db/migration_history.go+++ b/store/db/migration_history.go@@ -2,7 +2,6 @@ package dbimport ("fmt"- "time")type MigrationHistory struct {@@ -10,7 +9,7 @@ type MigrationHistory struct {Version string}-func findMigrationHistoyList(db *DB) ([]*MigrationHistory, error) {+func findMigrationHistoryList(db *DB) ([]*MigrationHistory, error) {rows, err := db.Db.Query(`SELECTversion,@@ -40,16 +39,14 @@ func findMigrationHistoyList(db *DB) ([]*MigrationHistory, error) {return migrationHistoryList, nil}-func createMigrationHistoy(db *DB, version string) error {+func createMigrationHistory(db *DB, version string) error {result, err := db.Db.Exec(`INSERT INTO migration_history (- version,- created_ts+ version)- VALUES (?, ?)+ VALUES (?)`,version,- time.Now().Unix(),)if err != nil {return errdiff --git a/store/db/table.go b/store/db/table.goindex fe36f4a6a..ba70eb6cf 100644--- a/store/db/table.go+++ b/store/db/table.go@@ -25,7 +25,7 @@ func findTable(db *DB, tableName string) (*Table, error) {args...,)if err != nil {- return nil, FormatError(err)+ return nil, err}defer rows.Close()@@ -36,14 +36,14 @@ func findTable(db *DB, tableName string) (*Table, error) {&table.Name,&table.SQL,); err != nil {- return nil, FormatError(err)+ return nil, err}tableList = append(tableList, &table)}if err := rows.Err(); err != nil {- return nil, FormatError(err)+ return nil, err}if len(tableList) == 0 {diff --git a/store/store.go b/store/store.goindex 34528b826..442eadef4 100644--- a/store/store.go+++ b/store/store.go@@ -2,17 +2,17 @@ package storeimport ("database/sql"- "memos/common"+ "memos/server/profile")// Store provides database access to all raw objectstype Store struct {db *sql.DB- profile *common.Profile+ profile *profile.Profile}// New creates a new instance of Store-func New(db *sql.DB, profile *common.Profile) *Store {+func New(db *sql.DB, profile *profile.Profile) *Store {return &Store{db: db,profile: profile,