Browse Source

Variable rename: capitalisation and stuttering

Renamed DOI configuration variables and structs to avoid stuttering:
Doi.DoiUrl -> DOI.URL
Doi.DoiKey -> DOI.Key
etc
Achilleas Koutsou 6 years ago
parent
commit
01e444b22c
4 changed files with 7 additions and 10 deletions
  1. 0 1
      conf/app.ini
  2. 3 4
      pkg/setting/setting.go
  3. 3 4
      routes/doi.go
  4. 1 1
      routes/repo/repo_gin.go

+ 0 - 1
conf/app.ini

@@ -531,7 +531,6 @@ INDEX_URL = localhost/index
 SEACH_URL = localhost/search
 
 [doi]
-DO = false
 DOI_URL = https://doi.gin.g-node.org/
 ; AES key (eg. openssl enc -aes-128-cbc -k secret -P -md sha1)
 DOI_KEY = WONTWORK

+ 3 - 4
pkg/setting/setting.go

@@ -337,10 +337,9 @@ var (
 	}
 
 	DOI struct {
-		Do      bool
-		DOIURL  string
-		DOIKey  string
-		DOIBase string
+		URL  string `ini:"DOI_URL"`
+		Key  string `ini:"DOI_KEY"`
+		Base string `ini:"DOI_BASE"`
 	}
 
 	CLIConfig struct {

+ 3 - 4
routes/doi.go

@@ -20,14 +20,13 @@ func RequestDOI(c *context.Context) {
 		return
 	}
 	token := c.GetCookie(setting.SessionConfig.CookieName)
-	token, err := encrypt([]byte(setting.DOI.DOIKey), token)
+	token, err := encrypt([]byte(setting.DOI.Key), token)
 	if err != nil {
-		log.Error(0, "Could not encrypt Secret key:%s", err)
+		log.Error(2, "Could not encrypt Secret key: %s", err)
 		c.Status(http.StatusInternalServerError)
 		return
 	}
-	url := fmt.Sprintf("%s/register?repo=%s&user=%s&token=%s", setting.DOI.DOIURL, c.Repo.Repository.FullName(),
-		c.User.Name, token)
+	url := fmt.Sprintf("%s/register?repo=%s&user=%s&token=%s", setting.DOI.URL, c.Repo.Repository.FullName(), c.User.Name, token)
 	c.Redirect(url)
 }
 

+ 1 - 1
routes/repo/repo_gin.go

@@ -69,7 +69,7 @@ func readDataciteFile(entry *git.TreeEntry, c *context.Context) {
 	}
 	c.Data["DOIInfo"] = &doiInfo
 
-	doi := calcRepoDOI(c, setting.DOI.DOIBase)
+	doi := calcRepoDOI(c, setting.DOI.Base)
 	//ddata, err := ginDoi.GDoiMData(doi, "https://api.datacite.org/works/") //todo configure URL?
 
 	c.Data["DOIReg"] = libgin.IsRegisteredDOI(doi)