#279: Changed codegen to be based on params

This commit is contained in:
frikky
2021-03-07 16:58:08 +01:00
parent 62ca9e9321
commit c7ba0a5a13
2 changed files with 14 additions and 10 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
NAME=shuffle-app_sdk NAME=shuffle-app_sdk
VERSION=0.8.60 VERSION=0.8.61
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
+13 -9
View File
@@ -260,9 +260,14 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
queryString += ", " queryString += ", "
} }
/*
queryData += fmt.Sprintf(`
if %s:
url += f"&%s={%s}"`, query, query, query)
*/
queryData += fmt.Sprintf(` queryData += fmt.Sprintf(`
if %s: if %s:
url += f"&%s={%s}"`, query, query, query) params["%s"] = %s`, query, query, query)
} }
} else { } else {
//log.Printf("No optional queries?") //log.Printf("No optional queries?")
@@ -384,6 +389,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
// Extra param for authentication scheme(s) // Extra param for authentication scheme(s)
// The last weird one is the body.. Tabs & spaces sucks. // The last weird one is the body.. Tabs & spaces sucks.
data := fmt.Sprintf(` async def %s(self%s%s%s%s%s%s%s): data := fmt.Sprintf(` async def %s(self%s%s%s%s%s%s%s):
params={}
%s %s
url=f"%s%s" url=f"%s%s"
%s %s
@@ -392,7 +398,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
%s %s
%s %s
%s %s
ret = requests.%s(url, headers=headers%s%s%s%s) ret = requests.%s(url, headers=headers, params=params%s%s%s%s)
try: try:
return ret.json() return ret.json()
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
@@ -423,13 +429,11 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
) )
// Use lowercase when checking // Use lowercase when checking
/* if strings.Contains(functionname, "login") {
if strings.Contains(functionname, "filter") { //log.Printf("FUNCTION: %s", data)
//log.Printf("FUNCTION: %s", data) log.Println(data)
log.Println(data) log.Printf("Queries: %s", queryString)
log.Printf("Queries: %s", queryString) }
}
*/
//log.Printf(data) //log.Printf(data)
return functionname, data return functionname, data