Compare commits

..

3 Commits

Author SHA1 Message Date
Pin
63ece99593 Updated API for selected dog type
Signed-off-by: Pin <wf6DJd8a3xSSCZbn@protonmail.com>
2021-01-31 21:20:39 -05:00
Pin
0a84e1842e Updated Queryrow struct
Signed-off-by: Pin <wf6DJd8a3xSSCZbn@protonmail.com>
2021-01-31 20:12:36 -05:00
Pin
72e9830119 Added License
Signed-off-by: Pin <wf6DJd8a3xSSCZbn@protonmail.com>
2021-01-31 19:49:23 -05:00
10 changed files with 138 additions and 65 deletions

View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package db package db

View File

@@ -1,3 +1,21 @@
/*
Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero 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 Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package dbinit package dbinit
import ( import (

View File

@@ -1,18 +1,19 @@
-- --
-- This file is part of dogapi. -- Simple API the serves pictures of dogs
-- Copyright (C) 2021 Pin
-- --
-- dogapi is free software: you can redistribute it and/or modify -- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU Affero General Public License as published by -- it under the terms of the GNU Affero General Public License as
-- the Free Software Foundation, either version 3 of the License, or -- published by the Free Software Foundation, either version 3 of the
-- (at your option) any later version. -- License, or (at your option) any later version.
-- --
-- dogapi is distributed in the hope that it will be useful, -- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of -- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU Affero General Public License for more details. -- GNU Affero General Public License for more details.
-- --
-- You should have received a copy of the GNU Affero General Public License -- You should have received a copy of the GNU Affero General Public License
-- along with dogapi. If not, see <https://www.gnu.org/licenses/>. -- along with this program. If not, see <https://www.gnu.org/licenses/>.
-- --
create table breed_manifest if not exists ( create table breed_manifest if not exists (

View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package main package main

39
db/dogselect.go Normal file
View File

@@ -0,0 +1,39 @@
/*
Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero 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 Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package db
import (
"dogapi/structs"
"log"
)
func DogSelect(dog string) (structs.DogPicRow) {
q := `select * from dog_pictures where breed_id=(select breed_id from breed_manifest where breed=$1) offset floor(random()*(select count(*) from dog_pictures where breed_id=(select breed_id from breed_manifest where breed=$1))) limit 1;`
selstat, err := conn.Query(q, dog)
if err != nil {
log.Fatalln(err)
}
var rowsel structs.DogPicRow
for selstat.Next() {
if err := selstat.Scan(&rowsel.Dog_id, &rowsel.Breed_id, &rowsel.Author, &rowsel.Title, &rowsel.Format, &rowsel.Hash, &rowsel.Url); err != nil {
log.Fatal(err)
}
}
return rowsel
}

View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package db package db

View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package handlers package handlers
@@ -28,7 +29,15 @@ func APIHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method { switch r.Method {
case "GET": case "GET":
var dogquery structs.DogPicRow var dogquery structs.DogPicRow
keys := r.URL.Query().Get("dog")
if len(keys) == 0 {
dogquery = db.RandomSelect() dogquery = db.RandomSelect()
json.NewEncoder(w).Encode(dogquery) json.NewEncoder(w).Encode(dogquery)
return
} else {
dogquery = db.DogSelect(keys)
json.NewEncoder(w).Encode(dogquery)
return
}
} }
} }

15
init.go
View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package main package main

15
main.go
View File

@@ -1,18 +1,19 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package main package main

View File

@@ -1,28 +1,29 @@
/* /*
This file is part of dogapi. Simple API the serves pictures of dogs
Copyright (C) 2021 Pin
dogapi is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as
the Free Software Foundation, either version 3 of the License, or published by the Free Software Foundation, either version 3 of the
(at your option) any later version. License, or (at your option) any later version.
dogapi is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with dogapi. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package structs package structs
type DogPicRow struct { type DogPicRow struct {
Dog_id int Dog_id int `json:"id"`
Breed_id int Breed_id int `json:"bid"`
Author string Author string `json:"author"`
Title string Title string `json:"title"`
Format string Format string `json:"format"`
Hash string Hash string `json:"hash"`
Url string Url string `json:"url"`
} }