experimenting with format
This commit is contained in:
@ -7,12 +7,12 @@ An easy-to-use library for the i2pcontrol rpc interface.
|
|||||||
Don't use it yet, it's not even a little done.
|
Don't use it yet, it's not even a little done.
|
||||||
-----BEGIN PGP SIGNATURE-----
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlrDIbYACgkQ11wDs5te
|
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlrDJTUACgkQ11wDs5te
|
||||||
FOESGgf9GR239i0Gf2nvhyzz9GUPj+YWFToMNvT/UipLE6XpmXHJHt7BRWsRyz+V
|
FOEI/ggArjLCkkUTVF2iRxsKPPOSxjGTX86PodKPmtUX7ZOGfxGm2eAeT0Dcrcoz
|
||||||
/IZzFpb1QIz4dJAUDXpFB52G2phMfSKUD0bWdGBhHv4ob7ne4FCQWjkhseQy7U7A
|
wQMoqL4EHZUb/ANckoZOaEm5/v1fpRaDdbOC7yY34lnL2zstnnQOePFtiRSZjMTZ
|
||||||
1GuuoNYD6kakl6gritL6H23r+/lePzoBnRC6w6/mD6nUbhhox/Tp5Vb9BF+WcLN9
|
o4hjRfDTdO2DLeiHzFiagsDvFfZDhShMAQzEUk9RHox8zcSwQcXC0od2DLu81U18
|
||||||
VF93a691GLK2m8Mbs3TSaDhUVBvDFRNI+hsTXGAUYX24tfbYV5iSwUbug8odReSk
|
xoVva7EgrD6zU2jr5I10yqRSrX+pIB5UhQzzDmqkHsgzJVfTkFT9XjP+gWmwcgFe
|
||||||
080VUqTdXVmP/MveZOVCuyQwrrNY6i/MbvQBsj7x7YJdVrg4s1bhunB6o8oLMRcj
|
eK+aa4I1gZgukpZ91mdh+RDMFSjivjfTeKi0QqrA4DqRvCzU+dU+zZ84AhC5KsLA
|
||||||
d7LK1Z/7si4KDR9vgPQP6olOSK3V4g==
|
M3YtqA1svGw6UFu54rOeXFziCbgIUA==
|
||||||
=zrBe
|
=m70N
|
||||||
-----END PGP SIGNATURE-----
|
-----END PGP SIGNATURE-----
|
||||||
|
10
auth.go
10
auth.go
@ -20,8 +20,14 @@ func (i *i2pControlStructure) i2pControlDo(s ...string) string{
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *i2pControlStructure) Echo(s ...string) (string, string) {
|
func (i *i2pControlStructure) Authenticate(s string) (string, string) {
|
||||||
query := i.jsonstructure.Echo(s...)
|
query := i.jsonstructure.Authenticate("API" , "1", "Password", s)
|
||||||
|
fmt.Println(query)
|
||||||
|
response := i.i2pControlDo(query)
|
||||||
|
return query, response
|
||||||
|
}
|
||||||
|
func (i *i2pControlStructure) Echo(s string) (string, string) {
|
||||||
|
query := i.jsonstructure.Echo("API" , "1", "Token", s)
|
||||||
fmt.Println(query)
|
fmt.Println(query)
|
||||||
response := i.i2pControlDo(query)
|
response := i.i2pControlDo(query)
|
||||||
return query, response
|
return query, response
|
||||||
|
13
json.go
13
json.go
@ -14,30 +14,29 @@ func (j *jsonStructure) Id() string {
|
|||||||
return rstring
|
return rstring
|
||||||
}
|
}
|
||||||
|
|
||||||
func (j *jsonStructure) Format(m, e string, s ...string) string {
|
func (j *jsonStructure) Format(m string, s ...string) string {
|
||||||
rstring := "{\n"
|
rstring := "{\n"
|
||||||
rstring += " method: \"" + m +"\"\n"
|
rstring += " method: \"" + m +"\"\n"
|
||||||
rstring += " jsonrpc: \"2.0\"\n"
|
rstring += " jsonrpc: \"2.0\"\n"
|
||||||
rstring += " id: \"" + j.Id() + "\"\n"
|
rstring += " id: \"" + j.Id() + "\"\n"
|
||||||
rstring += " params: \""
|
rstring += " params:"
|
||||||
var params string
|
var params string
|
||||||
for index, value := range s {
|
for index, value := range s {
|
||||||
if index != 0 && index%2 == 0 {
|
if index != 0 && index%2 == 0 {
|
||||||
params += " " + s[index-1] + ": \"" + value + "\""
|
params += strings.TrimRight(" " + s[index-1] + ": \"" + value + "\"", " ") + "\n"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
p := strings.TrimRight(params, " ")
|
rstring += params + "\n"
|
||||||
rstring += p + "\"\n"
|
|
||||||
rstring += "}\n"
|
rstring += "}\n"
|
||||||
return rstring
|
return rstring
|
||||||
}
|
}
|
||||||
|
|
||||||
func (j *jsonStructure) Authenticate(s ...string) string{
|
func (j *jsonStructure) Authenticate(s ...string) string{
|
||||||
return j.Format("echo", "Authenticate", s...)
|
return j.Format("echo", s...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (j *jsonStructure) Echo(s ...string) string{
|
func (j *jsonStructure) Echo(s ...string) string{
|
||||||
return j.Format("echo", "Echo", s...)
|
return j.Format("echo", s...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (j *jsonStructure) jsonStructure() jsonStructure {
|
func (j *jsonStructure) jsonStructure() jsonStructure {
|
||||||
|
Reference in New Issue
Block a user