Move libgin to external repository

docker/build.sh

@@ -11,6 +11,7 @@ go get golang.org/x/crypto/bcrypt
 go get github.com/jteeuwen/go-bindata
 go get github.com/G-Node/gig
 go get github.com/G-Node/git-module
+go get github.com/G-Node/libgin/libgin
 go get github.com/G-Node/go-annex
 go get github.com/Sirupsen/logrus
 go get gopkg.in/yaml.v2

pkg/libgin/dex.go

@@ -1,62 +0,0 @@
-package libgin
-
-import (
-	"time"
-
-	"github.com/G-Node/gig"
-)
-
-// NOTE: TEMPORARY COPY FROM gin-dex
-
-type SearchRequest struct {
-	Token  string
-	CsrfT  string
-	UserID int64
-	Querry string
-	SType  int64
-}
-
-const (
-	SEARCH_MATCH = iota
-	SEARCH_FUZZY
-	SEARCH_WILDCARD
-	SEARCH_QUERRY
-	SEARCH_SUGGEST
-)
-
-type BlobSResult struct {
-	Source    *IndexBlob  `json:"_source"`
-	Score     float64     `json:"_score"`
-	Highlight interface{} `json:"highlight"`
-}
-
-type CommitSResult struct {
-	Source    *IndexCommit `json:"_source"`
-	Score     float64      `json:"_score"`
-	Highlight interface{}  `json:"highlight"`
-}
-
-type SearchResults struct {
-	Blobs   []BlobSResult
-	Commits []CommitSResult
-}
-
-type IndexBlob struct {
-	*gig.Blob
-	GinRepoName  string
-	GinRepoId    string
-	FirstCommit  string
-	Id           int64
-	Oid          gig.SHA1
-	IndexingTime time.Time
-	Content      string
-	Path         string
-}
-
-type IndexCommit struct {
-	*gig.Commit
-	GinRepoId    string
-	Oid          gig.SHA1
-	GinRepoName  string
-	IndexingTime time.Time
-}

pkg/libgin/doi.go

@@ -1,78 +0,0 @@
-package libgin
-
-import (
-	"crypto/md5"
-	"encoding/hex"
-	"fmt"
-	"net/http"
-
-	log "gopkg.in/clog.v1"
-)
-
-// NOTE: TEMPORARY COPIES FROM gin-doi
-
-// uuidMap is a map between registered repositories and their UUIDs for datasets registered before the new UUID generation method was implemented.
-// This map is required because the current method of computing UUIDs differs from the older method and this lookup is used to handle the old-method UUIDs.
-var uuidMap = map[string]string{
-	"INT/multielectrode_grasp":                   "f83565d148510fede8a277f660e1a419",
-	"ajkumaraswamy/HB-PAC_disinhibitory_network": "1090f803258557299d287c4d44a541b2",
-	"steffi/Kleineidam_et_al_2017":               "f53069de4c4921a3cfa8f17d55ef98bb",
-	"Churan/Morris_et_al_Frontiers_2016":         "97bc1456d3f4bca2d945357b3ec92029",
-	"fabee/efish_locking":                        "6953bbf0087ba444b2d549b759de4a06",
-}
-
-// RepoPathToUUID computes a UUID from a repository path.
-func RepoPathToUUID(URI string) string {
-	if doi, ok := uuidMap[URI]; ok {
-		return doi
-	}
-	currMd5 := md5.Sum([]byte(URI))
-	return hex.EncodeToString(currMd5[:])
-}
-
-// DOIRegInfo holds all the metadata and information necessary for a DOI registration request.
-type DOIRegInfo struct {
-	Missing     []string
-	DOI         string
-	UUID        string
-	FileSize    int64
-	Title       string
-	Authors     []Author
-	Description string
-	Keywords    []string
-	References  []Reference
-	Funding     []string
-	License     *License
-	DType       string
-}
-
-type Author struct {
-	FirstName   string
-	LastName    string
-	Affiliation string
-	ID          string
-}
-
-type Reference struct {
-	Reftype string
-	Name    string
-	DOI     string
-}
-
-type License struct {
-	Name string
-	URL  string
-}
-
-func IsRegisteredDOI(doi string) bool {
-	url := fmt.Sprintf("https://doi.org/%s", doi)
-	resp, err := http.Get(url)
-	if err != nil {
-		log.Trace("Could not query for doi: %s at %s", doi, url)
-		return false
-	}
-	if resp.StatusCode != http.StatusNotFound {
-		return true
-	}
-	return false
-}

pkg/libgin/libgin.go

@@ -1,5 +0,0 @@
-/*
-Package libgin provides functionality for features added for the G-Node GIN service.
-This is a temporary package. Functions and types have been copied from gin-doi and gin-dex services. The plan is for G-Node/GOGS (GIN) to not depend on any code from the added services. Instead, common functionality will be imported from a separate lib package. This subpackage is the first version of that.
-*/
-package libgin

routes/api/v1/search/general.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	"github.com/G-Node/gogs/pkg/context"
-	"github.com/G-Node/gogs/pkg/libgin"
 	"github.com/G-Node/gogs/pkg/setting"
+	"github.com/G-Node/libgin/libgin"
 )
 
 func Search(c *context.APIContext) {

routes/api/v1/search/suggest.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	"github.com/G-Node/gogs/pkg/context"
-	"github.com/G-Node/gogs/pkg/libgin"
 	"github.com/G-Node/gogs/pkg/setting"
+	"github.com/G-Node/libgin/libgin"
 )
 
 func Suggest(c *context.APIContext) {

routes/repo/view.go

@@ -22,12 +22,12 @@ import (
 	"github.com/G-Node/godML/odml"
 	"github.com/G-Node/gogs/models"
 	"github.com/G-Node/gogs/pkg/context"
-	"github.com/G-Node/gogs/pkg/libgin"
 	"github.com/G-Node/gogs/pkg/markup"
 	"github.com/G-Node/gogs/pkg/setting"
 	"github.com/G-Node/gogs/pkg/template"
 	"github.com/G-Node/gogs/pkg/template/highlight"
 	"github.com/G-Node/gogs/pkg/tool"
+	"github.com/G-Node/libgin/libgin"
 	"github.com/Unknwon/paginater"
 	"github.com/go-macaron/captcha"
 	"golang.org/x/net/html/charset"

routes/search.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 
 	"github.com/G-Node/gogs/pkg/context"
-	"github.com/G-Node/gogs/pkg/libgin"
 	"github.com/G-Node/gogs/pkg/setting"
+	"github.com/G-Node/libgin/libgin"
 	"github.com/Sirupsen/logrus"
 )