From 7be294fa299da7c9aa3ba17d7ffba03e1a68e8aa Mon Sep 17 00:00:00 2001 From: Andinus Date: Sat, 14 Mar 2020 00:28:03 +0530 Subject: Narrow scope of the project Dropped support for Astronomy Picture of the Day & Bing Photo of the Day. I wrote this to get a new wallpaper at every startup or whenever I wish, in my opinion Unsplash Source is a better option & there is no point in keeping unused code. --- README.org | 77 ++--------------------------------- main.go | 135 ------------------------------------------------------------- 2 files changed, 4 insertions(+), 208 deletions(-) diff --git a/README.org b/README.org index 2020912..5808835 100644 --- a/README.org +++ b/README.org @@ -1,7 +1,9 @@ #+TITLE: Cetus -Cetus is a wallpaper tool written in Go. It can set wallpapers from various -sources. Default behaviour is to set a random wallpaper. +Cetus is a wallpaper manager written in Go. It uses [[https://source.unsplash.com/][Unsplash Source]] to get +wallpapers. + +*Note*: Cetus is a work in-progress & many features are yet to be implemented. * Uses - on system startup for new wallpaper at every startup @@ -13,76 +15,5 @@ demo videos someday. | Version | Video | |---------+----------------------------------------------------------------------| | v0.2.0 | https://diode.zone/videos/watch/12db31e1-3517-4888-ad06-55f3859447a1 | -* Features -- Set Daily, Weekly or Random wallpaper -- Supports multiple sources * Dependency - [[https://feh.finalrewind.org/][feh]] -* Examples -** Daily wallpaper -*** from Astronomy Picture of the Day -#+BEGIN_SRC sh -cetus -src=apod -wall=daily -#+END_SRC -*** from Bing Photo of the Day -#+BEGIN_SRC sh -cetus -src=bpod -wall=daily -#+END_SRC -*** from Unsplash Source -#+BEGIN_SRC sh -cetus -src=unsplash -wall=daily -#+END_SRC -*** from any service (choosen randomly) -#+BEGIN_SRC sh -cetus -src=random -wall=daily - -cetus -wall=daily # This is same as above -#+END_SRC -** Weekly wallpaper -*** from Unsplash Source -#+BEGIN_SRC shp -cetus -src=unsplash -wall=weekly -#+END_SRC -** Random wallpaper -*** from Bing Photo of the Day -#+BEGIN_SRC sh -cetus -src=bpod -bpod-num 16 -wall=random # select from last 16 images - -cetus -src=bpod # This is same as above -#+END_SRC -*** from Unsplash Source -#+BEGIN_SRC sh -cetus -src=unsplash -wall=random -width 1920 -height 1080 - -cetus -src=unsplash # This is same as above -#+END_SRC -*** from any service (choosen randomly) -#+BEGIN_SRC sh -cetus -src=random -wall=random - -cetus # This is same as above -#+END_SRC -* Defaults -| flag | var | default | -|------+------+-------------------------------------------| -| wall | wall | random (daily when random is unavailable) | -| src | src | random | - -Currently only Unsplash Source random is supported for width, height -| width | width | 1920 | -| height | height | 1080 | -** Astronomy Picture of the Day -| flag | var | default | -|--------------+------------+-------------------------------------| -| apod-api | apodAPI | https://api.nasa.gov/planetary/apod | -| apod-api-key | apodAPIKey | DEMO_KEY | -| wall | wall | daily | -** Bing Photo of the Day -| flag | var | default | -|----------+---------+------------------------------------------| -| bpod-api | bpodAPI | https://www.bing.com/HPImageArchive.aspx | -| bpod-num | bpodNum | 7 (max 7) | -** Unsplash Source -| flag | var | default | -|--------------+-------------+-----------------------------| -| unsplash-api | unsplashAPI | https://source.unsplash.com | diff --git a/main.go b/main.go index c226610..731a4ae 100644 --- a/main.go +++ b/main.go @@ -15,10 +15,8 @@ package main import ( - "encoding/json" "flag" "fmt" - "io/ioutil" "log" "math/rand" "net/http" @@ -30,10 +28,6 @@ import ( var ( timeout time.Duration - apodAPI string - apodAPIKey string - bpodAPI string - bpodNum int unsplashAPI string width int @@ -50,8 +44,6 @@ func main() { wall string src string srcArr []string = []string{ - "apod", - "bpod", "unsplash", } ) @@ -63,10 +55,6 @@ func main() { flag.IntVar(&width, "width", 1920, "Width of the image") flag.IntVar(&height, "height", 1080, "Height of the image") - flag.StringVar(&apodAPI, "apod-api", "https://api.nasa.gov/planetary/apod", "APOD API URL") - flag.StringVar(&apodAPIKey, "apod-api-key", "DEMO_KEY", "APOD API Key") - flag.StringVar(&bpodAPI, "bpod-api", "https://www.bing.com/HPImageArchive.aspx", "BPOD API URL") - flag.IntVar(&bpodNum, "bpod-num", 7, "BPOD Number of images to fetch (max 7)") flag.StringVar(&unsplashAPI, "unsplash-api", "https://source.unsplash.com", "Unsplash Source API URL") flag.DurationVar(&timeout, "timeout", 16, "Timeout for http client") flag.Parse() @@ -102,12 +90,6 @@ func parseSrcAndGetPath(src string, wall string) (string, error) { var imgPath string switch src { - case "apod": - fmt.Println("Astronomy Picture of the Day") - imgPath, err = getPathAPOD(wall) - case "bpod": - fmt.Println("Bing Photo of the Day") - imgPath, err = getPathBPOD(wall) case "unsplash": fmt.Println("Unsplash Source") imgPath, err = getPathUnsplash(wall) @@ -116,123 +98,6 @@ func parseSrcAndGetPath(src string, wall string) (string, error) { return imgPath, err } -func getPathAPOD(wall string) (string, error) { - var err error - var imgPath string - - switch wall { - case "daily", "random": - break - default: - return "", fmt.Errorf("Error: Unknown wall") - } - - type apodRes struct { - Copyright string `json:"copyright"` - Date string `json:"string"` - Explanation string `json:"explanation"` - HDURL string `json:"hdurl"` - MediaType string `json:"media_type"` - ServiceVersion string `json:"service_version"` - Title string `json:"title"` - URL string `json:"url"` - } - - apodNow := apodRes{} - - req, err := http.NewRequest(http.MethodGet, apodAPI, nil) - if err != nil { - return "", err - } - q := req.URL.Query() - q.Add("api_key", apodAPIKey) - req.URL.RawQuery = q.Encode() - - res, err := getRes(req) - if err != nil { - fmt.Printf("Error: GET %s\n", apodAPI) - return "", err - } - defer res.Body.Close() - - apiBody, err := ioutil.ReadAll(res.Body) - if err != nil { - return "", err - } - - err = json.Unmarshal([]byte(apiBody), &apodNow) - if err != nil { - return "", err - } - - imgPath = apodNow.HDURL - return imgPath, err -} - -func getPathBPOD(wall string) (string, error) { - var err error - var imgPath string - - type Images struct { - StartDate string `json:"startdate"` - FullStartDate string `json:"fullstartdate"` - EndDate string `json:"enddate"` - URL string `json:"url"` - URLBase string `json:"urlbase"` - Copyright string `json:"copyright"` - CopyrightLink string `json:"copyrightlink"` - Title string `json:"title"` - Hsh string `json:"hsh"` - } - - type bpodRes struct { - Image []Images `json:"images"` - } - - bpodNow := bpodRes{} - - req, err := http.NewRequest(http.MethodGet, bpodAPI, nil) - if err != nil { - return "", err - } - q := req.URL.Query() - q.Add("format", "js") - - switch wall { - case "daily": - q.Add("n", "1") - case "random": - // Fetches image (only info) & chooses a random image - q.Add("n", strconv.Itoa(bpodNum)) - default: - return "", fmt.Errorf("Error: Unknown wall") - } - - req.URL.RawQuery = q.Encode() - - res, err := getRes(req) - if err != nil { - return "", err - } - defer res.Body.Close() - - apiBody, err := ioutil.ReadAll(res.Body) - if err != nil { - return "", err - } - - err = json.Unmarshal([]byte(apiBody), &bpodNow) - if err != nil { - return "", err - } - - // Choose a random image - var i int = rand.Intn(len(bpodNow.Image)) - imgPath = fmt.Sprintf("%s%s", "https://www.bing.com", bpodNow.Image[i].URL) - - return imgPath, err -} - func getPathUnsplash(wall string) (string, error) { var err error var imgPath string -- cgit 1.4.1-2-gfad0