Author: Adam <git@apiote.tk>
move TMDB API key to config
config/config.go | 3 +++ tmdb/common.go | 4 ---- tmdb/film.go | 5 +++-- tmdb/genres.go | 3 ++- tmdb/person.go | 3 ++- tmdb/random.go | 3 ++- tmdb/search.go | 3 ++- tmdb/serie.go | 5 +++--
diff --git a/config/config.go b/config/config.go index 37411a498d1b7df12b9e3bda870dbd76e674d015..211b7ffd335038aa394eb27b30521a83368ba8cd 100644 --- a/config/config.go +++ b/config/config.go @@ -12,6 +12,7 @@ OpenRegistration = false DataHome = "/usr/local/amuse" Port uint = 5008 Address = "127.0.0.1" + TmdbApiKey = "" ) func ReadConfig(path string) error { @@ -39,6 +40,8 @@ case "DataHome": DataHome = value case "Address": Address = value + case "TmdbApiKey": + TmdbApiKey = value case "Port": fmt.Sscanf(value, "%d", &Port) } diff --git a/tmdb/common.go b/tmdb/common.go index c5e93bd97d8732f3a31f8a42a0b77056b27f52d3..c1e98639be1bf7f4a76f19a80f0a0143bea3f771 100644 --- a/tmdb/common.go +++ b/tmdb/common.go @@ -8,10 +8,6 @@ "notabug.org/apiote/gott" ) -const ( - API_KEY = "38209d39b738776e07346a91d16a25e4" -) - type Show interface { AddBasedOn(book datastructure.Book) } diff --git a/tmdb/film.go b/tmdb/film.go index 762e2fa06a078f509e1087068fdf45c3f4f05ec3..65869e35811dba20b809f3934ffc9c5165e7c6e3 100644 --- a/tmdb/film.go +++ b/tmdb/film.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/i18n" "notabug.org/apiote/amuse/network" "notabug.org/apiote/amuse/datastructure" @@ -105,7 +106,7 @@ func createFilmRequest(args ...interface{}) (interface{}, error) { request := args[0].(*network.Request) result := args[1].(*network.Result) result.Client = &http.Client{} - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/movie/"+request.Id+"?api_key="+API_KEY+"&language="+request.Language+"&append_to_response=credits", nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/movie/"+request.Id+"?api_key="+config.TmdbApiKey+"&language="+request.Language+"&append_to_response=credits", nil) result.Request = httpRequest return gott.Tuple(args), err } @@ -137,7 +138,7 @@ func createCollectionRequest(args ...interface{}) (interface{}, error) { request := args[0].(*network.Request) result := args[1].(*network.Result) result.Client = &http.Client{} - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/collection/"+request.Id+"?api_key="+API_KEY+"&language="+request.Language, nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/collection/"+request.Id+"?api_key="+config.TmdbApiKey+"&language="+request.Language, nil) result.Request = httpRequest return gott.Tuple(args), err } diff --git a/tmdb/genres.go b/tmdb/genres.go index 5de0e5f0f20b1f481a36b90c6871b1f59e1c2961..2704646ac4e911244f540a160ac80601135bf086 100644 --- a/tmdb/genres.go +++ b/tmdb/genres.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/datastructure" "notabug.org/apiote/amuse/network" @@ -32,7 +33,7 @@ } else { return gott.Tuple(args), errors.New("Wrong itemType: " + request.Id) } - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/genre/"+itemType+"/list?api_key="+API_KEY+"&language="+request.Language, nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/genre/"+itemType+"/list?api_key="+config.TmdbApiKey+"&language="+request.Language, nil) result.Request = httpRequest return gott.Tuple(args), err } diff --git a/tmdb/person.go b/tmdb/person.go index b231a05f79b352fb776864d5ae86e3f43d163935..4a744520f8a088622b6aad6f751ac3505e99cf6e 100644 --- a/tmdb/person.go +++ b/tmdb/person.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/network" "encoding/json" @@ -57,7 +58,7 @@ func createPersonRequest(args ...interface{}) (interface{}, error) { request := args[0].(*network.Request) result := args[1].(*network.Result) client := &http.Client{} - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/person/"+request.Id+"?api_key="+API_KEY+"&language="+request.Language+"&append_to_response=combined_credits", nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/person/"+request.Id+"?api_key="+config.TmdbApiKey+"&language="+request.Language+"&append_to_response=combined_credits", nil) result.Client = client result.Request = httpRequest return gott.Tuple(args), err diff --git a/tmdb/random.go b/tmdb/random.go index 09fefcbbb3f95c28856819a0ee7e36ded1b9d855..4af169192123e96e4709ab85ef0a39ad94d9a08b 100644 --- a/tmdb/random.go +++ b/tmdb/random.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/network" "encoding/json" @@ -22,7 +23,7 @@ request := args[0].(*network.Request) result := args[1].(*network.Result) client := &http.Client{} page := strconv.FormatInt(rand.Int63n(100), 10) - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/discover/movie?api_key="+API_KEY+"&language="+request.Language+"&sort_by=popularity.desc&include_adult=false&include_video=false&page="+page+"&with_genres=35", nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/discover/movie?api_key="+config.TmdbApiKey+"&language="+request.Language+"&sort_by=popularity.desc&include_adult=false&include_video=false&page="+page+"&with_genres=35", nil) result.Client = client result.Request = httpRequest return gott.Tuple(args), err diff --git a/tmdb/search.go b/tmdb/search.go index 08a3c0492c8c4f5a6fa93dae04cebecfc3da5767..bf84867202c2047c3720d7edd38b44327d597131 100644 --- a/tmdb/search.go +++ b/tmdb/search.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/network" "encoding/json" @@ -46,7 +47,7 @@ func createSearchQuery(args ...interface{}) (interface{}, error) { query := args[0].(*Query) result := args[1].(*network.Result) client := &http.Client{} - url :="https://api.themoviedb.org/3/search/multi?api_key="+API_KEY+"&language="+query.language+"&query="+url.QueryEscape(query.query)+"&page="+query.page+"&include_adult=false" + url :="https://api.themoviedb.org/3/search/multi?api_key="+config.TmdbApiKey+"&language="+query.language+"&query="+url.QueryEscape(query.query)+"&page="+query.page+"&include_adult=false" request, err := http.NewRequest("GET", url, nil) result.Client = client result.Request = request diff --git a/tmdb/serie.go b/tmdb/serie.go index f04669030f7daff9dc3090ded6367a368ecdc3cd..b2c7b8a4d525254861a205874ef49f555b9e50bb 100644 --- a/tmdb/serie.go +++ b/tmdb/serie.go @@ -1,6 +1,7 @@ package tmdb import ( + "notabug.org/apiote/amuse/config" "notabug.org/apiote/amuse/datastructure" "notabug.org/apiote/amuse/i18n" "notabug.org/apiote/amuse/network" @@ -146,7 +147,7 @@ func createSerieRequest(args ...interface{}) (interface{}, error) { request := args[0].(*network.Request) result := args[1].(*network.Result) client := &http.Client{} - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/tv/"+request.Id+"?api_key="+API_KEY+"&language="+request.Language+"&append_to_response=credits", nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/tv/"+request.Id+"?api_key="+config.TmdbApiKey+"&language="+request.Language+"&append_to_response=credits", nil) result.Client = client result.Request = httpRequest return gott.Tuple(args), err @@ -206,7 +207,7 @@ func createSeasonRequest(args ...interface{}) (interface{}, error) { request := args[0].(*network.Request) result := args[1].(*network.Result) client := &http.Client{} - httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/tv/"+request.Id+"/season/"+request.Subid+"?api_key="+API_KEY+"&language="+request.Language+"&append_to_response=credits", nil) + httpRequest, err := http.NewRequest("GET", "https://api.themoviedb.org/3/tv/"+request.Id+"/season/"+request.Subid+"?api_key="+config.TmdbApiKey+"&language="+request.Language+"&append_to_response=credits", nil) result.Client = client result.Request = httpRequest return gott.Tuple(args), err