From 1d3f72c1b48998b86fd1740e893559b6dcaf7663 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Sun, 13 Feb 2022 13:42:06 +0530 Subject: modularised the code for easy access of various functions in packages --- user/anime/animelist.go | 19 ++++++++-- user/anime/request_handler.go | 48 ++++++++++++++++++++++++ user/anime/util.go | 85 ------------------------------------------- 3 files changed, 64 insertions(+), 88 deletions(-) create mode 100644 user/anime/request_handler.go delete mode 100644 user/anime/util.go (limited to 'user') diff --git a/user/anime/animelist.go b/user/anime/animelist.go index b36b50d..e4cddc3 100644 --- a/user/anime/animelist.go +++ b/user/anime/animelist.go @@ -20,18 +20,31 @@ import ( "encoding/json" "fmt" "github.com/MikunoNaka/mal2go/anime" + e "github.com/MikunoNaka/mal2go/errhandlers" ) const BASE_URL string = "https://api.myanimelist.net/v2" // Get authenticated user's anime list -func (c AnimeListClient) GetAnimeList(user, status, sort string/*, limit, offset int*/) { +func (c AnimeListClient) GetAnimeList(user, status, sort string, limit, offset int, fields []string) (anime.AnimeList, error){ + var userAnimeList anime.AnimeList + // error handling for limit and offset + limitsErr := e.LimitsErrHandler(limit, offset) + if limitsErr != nil { + return userAnimeList, limitsErr + } + + // handle all the errors for the fields + fields, err := e.FieldsErrHandler(fields) + if err != nil { + return userAnimeList, err + } + // get own list if user not specified if user == "" { user = "@me" } - var userAnimeList anime.AnimeList endpoint := BASE_URL + "/users/0ZeroTsu/animelist?fields=list_status&limit=4" // get data from API @@ -54,6 +67,6 @@ func (c AnimeListClient) GetAnimeList(user, status, sort string/*, limit, offset Paging: animeListData.Paging, } - fmt.Println(userAnimeList) + return userAnimeList, nil } diff --git a/user/anime/request_handler.go b/user/anime/request_handler.go new file mode 100644 index 0000000..f424c29 --- /dev/null +++ b/user/anime/request_handler.go @@ -0,0 +1,48 @@ +/* mal2go - MyAnimeList V2 API wrapper for Go + * Copyright (C) 2022 Vidhu Kant Sharma + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +package anime + +import ( + "io/ioutil" + "log" + "net/http" +) + +// Handles HTTP request with your OAuth token as a Header +func (c AnimeListClient) requestHandler(endpoint, method string) string { + // generate request + req, err := http.NewRequest(method, endpoint, nil) + if err != nil { + log.Fatal(err) + } + req.Header.Add("Authorization", c.AuthToken) + + // do request + res, err := c.HttpClient.Do(req) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + + // read body + body, err := ioutil.ReadAll(res.Body) + if err != nil { + log.Fatal(err) + } + + return string(body) +} diff --git a/user/anime/util.go b/user/anime/util.go deleted file mode 100644 index d9a4a4c..0000000 --- a/user/anime/util.go +++ /dev/null @@ -1,85 +0,0 @@ -/* mal2go - MyAnimeList V2 API wrapper for Go - * Copyright (C) 2022 Vidhu Kant Sharma - - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . */ - -package anime - -import ( - "io/ioutil" - "log" - "net/http" -) - -// Handles HTTP request with your OAuth token as a Header -func (c AnimeListClient) requestHandler(endpoint, method string) string { - // generate request - req, err := http.NewRequest(method, endpoint, nil) - if err != nil { - log.Fatal(err) - } - req.Header.Add("Authorization", c.AuthToken) - - // do request - res, err := c.HttpClient.Do(req) - if err != nil { - log.Fatal(err) - } - defer res.Body.Close() - - // read body - body, err := ioutil.ReadAll(res.Body) - if err != nil { - log.Fatal(err) - } - - return string(body) -} - -// func urlGenerator(baseUrl string, names []string, values [][]string, isPrimary bool) (string, error) { -// // length of names and values should be same -// if cap(names) != cap(values) { -// return "", errors.New("urlGenerator: Error: Length of names and values don't match.") -// } -// -// var fields string -// -// for index, name := range(names) { -// var data string -// /* if the data is the first field in URL, -// * it goes like ?key=value -// * else it is &nextkey=value */ -// if isPrimary { -// data = "?" + name + "=" -// } else { -// data = "&" + name + "=" -// } -// -// // add values to data variable -// for i, j := range values[index] { -// if i > 0 { -// data = data + "," + j -// } else { -// data = data + j -// } -// } -// -// fields = fields + data -// -// // from now on all other fields will be secondary -// isPrimary = false -// } -// -// return baseUrl + fields, nil -// } -- cgit v1.2.3