From 08ccdaf27d15efcaa53a5c27fd381fff32a4ed35 Mon Sep 17 00:00:00 2001 From: Las Zenow Date: Tue, 21 Apr 2015 21:32:01 -0400 Subject: [PATCH] Move to gitlab --- .gitignore | 2 +- README | 42 ++++++++++++------------------------------ admin.go | 2 +- cover.go | 4 ++-- language.go | 2 +- language_develop.go | 2 +- news.go | 2 +- reader.go | 4 ++-- search.go | 2 +- session.go | 2 +- stats.go | 4 ++-- tasker.go | 2 +- template.go | 2 +- templates/about.html | 2 +- templates/footer.html | 2 +- templates/help.html | 2 +- trantor.go | 4 ++-- upload.go | 6 +++--- 18 files changed, 35 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index c8fcca4..fd94c56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -trantor.git +trantor /store/ tools/adduser/adduser tools/update/update diff --git a/README b/README index a82b9a3..9e170e6 100644 --- a/README +++ b/README @@ -2,9 +2,9 @@ Imperial Library of Trantor The Imperial Library of Trantor (also known as Galactic Library) is a repository management system of ebooks on ePub format. -You can check out the main development branch from Gitorious at: +You can check out the main development branch from GitLab at: -https://gitorious.org/trantor/ +https://gitlab.com/trantor/ (We still in pre-beta fase) @@ -34,7 +34,7 @@ Yo also need to install go dependences: Now you can install Trantor itself: -# go get -tags prod git.gitorious.org/trantor/trantor.git +# go get -tags prod gitlab.com/trantor/trantor You can run trantor in /srv/www/trantor i.e. For this: @@ -42,51 +42,33 @@ You can run trantor in /srv/www/trantor i.e. For this: # cd /srv/www/trantor -# ln -s /usr/lib/go/src/pkg/git.gitorious.org/trantor/trantor.git/templates/ templates -# ln -s /usr/lib/go/src/pkg/git.gitorious.org/trantor/trantor.git/css/ css -# ln -s /usr/lib/go/src/pkg/git.gitorious.org/trantor/trantor.git/js/ js -# ln -s /usr/lib/go/src/pkg/git.gitorious.org/trantor/trantor.git/img/ img +# ln -s $GOPATH/src/pkg/gitlab.com/trantor/trantor/templates/ templates +# ln -s $GOPATH/src/pkg/gitlab.com/trantor/trantor/css/ css +# ln -s $GOPATH/src/pkg/gitlab.com/trantor/trantor/js/ js +# ln -s $GOPATH/src/pkg/gitlab.com/trantor/trantor/img/ img Now you can run it: -# /usr/lib/go/bin/trantor.git +# $GOPATH/bin/trantor Go to your browser to: http://localhost:8080 === For developers === -Login to gitorius: https://gitorious.org/login -and clone your own Trantor: https://gitorious.org/trantor/trantor/clone - -In your shell -$ git clone git://gitorious.org/~yourname/trantor/yournames-trantor.git -$ cd yournames-trantor - -You can edit config.go if you want to change the port and other configuration, by default is 8080 +Edit config.go if you want to change the port and other configuration, by default is 8080 Now you can compile Trantor: $ go build -tags prod (remove '-tags prod' for a faster compilation without language guessing) Now you can run it: -$ ./yourname-trantor +$ ./trantor Go to your browser to: http://localhost:8080 == Bugs == -Please, report bugs to zenow@tormail.org - -== Patches == -Make your enhacements and sent it by git: - -$ git commit -m "comment" -$ git remote set-url --push origin git@gitorious.org:~yournames/trantor/alfinals-trantor.git -$ git push origin master -$ git push - -Go to "merge-requests" - https://gitorious.org/trantor/yournames-trantor/merge_requests/new - +Please, report bugs in the gitlab issue tracker: +https://gitlab.com/trantor/trantor/issues == Rights == diff --git a/admin.go b/admin.go index 61b9c6e..1ca0a33 100644 --- a/admin.go +++ b/admin.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "git.gitorious.org/trantor/trantor.git/database" "github.com/gorilla/mux" + "gitlab.com/trantor/trantor/database" ) func deleteHandler(h handler) { diff --git a/cover.go b/cover.go index e2bb949..d5034e8 100644 --- a/cover.go +++ b/cover.go @@ -15,10 +15,10 @@ import ( "regexp" "strings" - "git.gitorious.org/go-pkg/epubgo.git" - "git.gitorious.org/trantor/trantor.git/storage" "github.com/gorilla/mux" + "github.com/meskio/epubgo" "github.com/nfnt/resize" + "gitlab.com/trantor/trantor/storage" ) func coverHandler(h handler) { diff --git a/language.go b/language.go index 8ecc155..87f48e9 100644 --- a/language.go +++ b/language.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "strings" - "git.gitorious.org/go-pkg/epubgo.git" + "github.com/meskio/epubgo" "github.com/rainycape/cld2" ) diff --git a/language_develop.go b/language_develop.go index 69ee859..1858bba 100644 --- a/language_develop.go +++ b/language_develop.go @@ -8,7 +8,7 @@ package main import ( - "git.gitorious.org/go-pkg/epubgo.git" + "github.com/meskio/epubgo" ) func GuessLang(epub *epubgo.Epub, orig_langs []string) []string { diff --git a/news.go b/news.go index 4db8f0d..773b43e 100644 --- a/news.go +++ b/news.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "git.gitorious.org/trantor/trantor.git/database" + "gitlab.com/trantor/trantor/database" ) type newsData struct { diff --git a/reader.go b/reader.go index 8254180..adddee5 100644 --- a/reader.go +++ b/reader.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "git.gitorious.org/go-pkg/epubgo.git" - "git.gitorious.org/trantor/trantor.git/database" "github.com/gorilla/mux" + "github.com/meskio/epubgo" + "gitlab.com/trantor/trantor/database" ) type chapter struct { diff --git a/search.go b/search.go index 68bcbcc..26a54bd 100644 --- a/search.go +++ b/search.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "git.gitorious.org/trantor/trantor.git/database" + "gitlab.com/trantor/trantor/database" ) type searchData struct { diff --git a/session.go b/session.go index 4d772b6..b33a28d 100644 --- a/session.go +++ b/session.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "net/http" - "git.gitorious.org/trantor/trantor.git/database" "github.com/gorilla/securecookie" "github.com/gorilla/sessions" + "gitlab.com/trantor/trantor/database" ) var sesStore = sessions.NewCookieStore(securecookie.GenerateRandomKey(64)) diff --git a/stats.go b/stats.go index 5df8fb9..cddf487 100644 --- a/stats.go +++ b/stats.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "git.gitorious.org/trantor/trantor.git/database" - "git.gitorious.org/trantor/trantor.git/storage" "github.com/gorilla/mux" + "gitlab.com/trantor/trantor/database" + "gitlab.com/trantor/trantor/storage" ) const ( diff --git a/tasker.go b/tasker.go index ddf74c4..c9735e8 100644 --- a/tasker.go +++ b/tasker.go @@ -5,7 +5,7 @@ import ( "time" - "git.gitorious.org/trantor/trantor.git/database" + "gitlab.com/trantor/trantor/database" ) func InitTasks(db *database.DB) { diff --git a/template.go b/template.go index 69a600f..5634e66 100644 --- a/template.go +++ b/template.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "git.gitorious.org/trantor/trantor.git/database" + "gitlab.com/trantor/trantor/database" ) type Status struct { diff --git a/templates/about.html b/templates/about.html index 8240419..bc4e413 100644 --- a/templates/about.html +++ b/templates/about.html @@ -8,7 +8,7 @@

The Imperial Library of Trantor it's in beta-status. We are working to provide a good user experience, but it's still in early development.

-

Any help is welcome. You can write us comments to our email address (zenow@riseup.net), upload your epubs, download our source code hack it and send us patches, ...

+

Any help is welcome. You can write us comments to our email address (zenow@riseup.net), upload your epubs, download our source code hack it and send us patches, ...

Copyright

diff --git a/templates/footer.html b/templates/footer.html index f766423..e37dc3a 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -2,7 +2,7 @@ diff --git a/templates/help.html b/templates/help.html index a80b67c..4cfa8d7 100644 --- a/templates/help.html +++ b/templates/help.html @@ -29,7 +29,7 @@

With RSS you can use your feed reader to see the lattest updates on a certain search or the news of the library. To get the RSS url of some search just click on the .

hummin
-

For the command line geeks there is a cli client: hummin

+

For the command line geeks there is a cli client: hummin

To install it in a debian based system (like ubuntu) just do: 

diff --git a/trantor.go b/trantor.go
index 36b9fce..97215fb 100644
--- a/trantor.go
+++ b/trantor.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"git.gitorious.org/trantor/trantor.git/database"
-	"git.gitorious.org/trantor/trantor.git/storage"
 	"github.com/gorilla/mux"
+	"gitlab.com/trantor/trantor/database"
+	"gitlab.com/trantor/trantor/storage"
 )
 
 type statusData struct {
diff --git a/upload.go b/upload.go
index 9a61d30..fe1305a 100644
--- a/upload.go
+++ b/upload.go
@@ -11,9 +11,9 @@ import (
 	"regexp"
 	"strings"
 
-	"git.gitorious.org/go-pkg/epubgo.git"
-	"git.gitorious.org/trantor/trantor.git/database"
-	"git.gitorious.org/trantor/trantor.git/storage"
+	"github.com/meskio/epubgo"
+	"gitlab.com/trantor/trantor/database"
+	"gitlab.com/trantor/trantor/storage"
 )
 
 func InitUpload(database *database.DB, store *storage.Store) {