44using System . Text ;
55using System . Threading . Tasks ;
66
7- using RestSharp ;
7+ using RestSharp . Portable ;
88using Newtonsoft . Json . Linq ;
9+ using RestSharp . Portable . HttpClient ;
910
1011namespace ComicStreamer
1112{
@@ -16,39 +17,36 @@ public ComicStreamerSharp(string asBaseUrl)
1617 msBaseUrl = asBaseUrl ;
1718 }
1819
19- private IRestResponse ExecuteCommand ( string Resource )
20+ private async Task < IRestResponse > ExecuteCommand ( string Resource )
2021 {
21- var client = new RestClient ( ) ;
22- client . BaseUrl = new Uri ( msBaseUrl ) ;
22+ var client = new RestClient ( msBaseUrl ) ;
2323
2424 var request = new RestRequest ( ) ;
2525 request . Resource = Resource ;
2626
27- IRestResponse response = client . Execute ( request ) ;
27+ IRestResponse response = await client . Execute ( request ) ;
2828
29- if ( response . ErrorException != null )
30- {
31- Console . WriteLine ( "Error retrieving response for " + Resource ) ;
32- }
29+ System . Diagnostics . Debug . Assert ( response . IsSuccess ,
30+ "Error retrieving response for " + Resource ) ;
3331
3432 return response ;
3533 }
36-
37- public string GetDBInfo ( )
34+
35+ public async Task < string > GetDBInfo ( )
3836 {
39- IRestResponse response = ExecuteCommand ( "dbinfo" ) ;
37+ IRestResponse response = await ExecuteCommand ( "dbinfo" ) ;
4038
4139 return response . Content ;
4240 }
4341
44- public string GetVersion ( )
42+ public async Task < string > GetVersion ( )
4543 {
46- IRestResponse response = ExecuteCommand ( "version" ) ;
44+ IRestResponse response = await ExecuteCommand ( "version" ) ;
4745
4846 return response . Content ;
4947 }
5048
51- public string GetDeletedComics ( string date )
49+ public async Task < string > GetDeletedComics ( string date )
5250 {
5351 /*
5452 * /deleted
@@ -57,66 +55,66 @@ public string GetDeletedComics(string date)
5755 since
5856 - date of the earliest returned value */
5957
60- IRestResponse response = ExecuteCommand ( "deleted?since=" + date ) ;
58+ IRestResponse response = await ExecuteCommand ( "deleted?since=" + date ) ;
6159
6260 return response . Content ;
6361 }
6462
6563
66- public JObject GetComicInfo ( string id )
64+ public async Task < JObject > GetComicInfo ( int id )
6765 {
6866 /* /comic/{id}
6967 - info about specific comic
7068 */
7169
72- IRestResponse response = ExecuteCommand ( "/comic/" + id ) ;
70+ IRestResponse response = await ExecuteCommand ( "/comic/" + id ) ;
7371
7472 JObject o = JObject . Parse ( response . Content ) ;
7573
7674 return o ;
7775 }
7876
79- public byte [ ] GetComicPage ( string id = "0" , int pagenum = 0 )
77+ public async Task < byte [ ] > GetComicPage ( int id , int pagenum = 0 )
8078 {
8179 //TODO: Add height arg.
8280 /*/comic/{id}/page/{pagenum}
8381 - return specific page image of specific comic
8482 args:
8583 max_height
8684 - will resize image*/
87- IRestResponse response = ExecuteCommand ( "/comic/" + id + "/page/" + pagenum ) ;
85+ IRestResponse response = await ExecuteCommand ( "/comic/" + id + "/page/" + pagenum ) ;
8886
8987 byte [ ] imageBytes = response . RawBytes ;
9088
9189 return imageBytes ;
9290 }
9391
94- public void SetBookmark ( string id , string pagenum = "clear" )
92+ public async void SetBookmark ( int id , string pagenum = "clear" )
9593 {
9694 /*/comic/{id}/page/{pagenum}/bookmark
9795 - sets the time of last access and last page read for the comic.
9896 client would fetch this for each page turn
9997 if {pagenum} is "clear" clears bookmark for the given book*/
100- IRestResponse response = ExecuteCommand ( "/comic/" + id + "/page/" + pagenum + "/bookmark" ) ;
98+ IRestResponse response = await ExecuteCommand ( "/comic/" + id + "/page/" + pagenum + "/bookmark" ) ;
10199
102100 }
103101
104- public byte [ ] GetThumbnail ( string id )
102+ public async Task < byte [ ] > GetThumbnail ( int id )
105103 {
106104 /* /comic/{id}/thumbnail
107105 - return specific small cover image of specific comic*/
108- IRestResponse response = ExecuteCommand ( "/comic/" + id + "/thumbnail" ) ;
106+ IRestResponse response = await ExecuteCommand ( "/comic/" + id + "/thumbnail" ) ;
109107
110108 byte [ ] imageBytes = response . RawBytes ;
111109
112110 return imageBytes ;
113111 }
114112
115- public byte [ ] GetComicFile ( string id )
113+ public async Task < byte [ ] > GetComicFile ( int id )
116114 {
117115 /* /comic/{id}/file
118116 - return entire specific comic file*/
119- IRestResponse response = ExecuteCommand ( "/comic/" + id + "/file" ) ;
117+ IRestResponse response = await ExecuteCommand ( "/comic/" + id + "/file" ) ;
120118
121119 byte [ ] imageBytes = response . RawBytes ;
122120
@@ -175,7 +173,7 @@ the starting offset of the query resultset
175173
176174 date format is "YYYY-MM-DD hh:mm:ss", where the right-most (most granular) portions may be omitted
177175/*/
178- public JObject GetComicList (
176+ public async Task < JObject > GetComicList (
179177 string series = "" ,
180178 string title = "" ,
181179 string path = "" ,
@@ -197,7 +195,7 @@ public JObject GetComicList(
197195 string order = "" )
198196 {
199197
200- IRestResponse response = ExecuteCommand ( "/comiclist?series=" + series +
198+ IRestResponse response = await ExecuteCommand ( "/comiclist?series=" + series +
201199 "&title=" + title +
202200 "&path=" + path +
203201 "&character=" + character +
@@ -222,13 +220,13 @@ public JObject GetComicList(
222220 return o ;
223221 }
224222
225- public JObject GetFolders ( string path = "" )
223+ public async Task < JObject > GetFolders ( string path = "" )
226224 {
227225 /*/folders/[path]
228226 - Return list of folders with names and access URLS), and list of comics in the specific folder
229227 Without a path, returns just the top level folders
230228 */
231- IRestResponse response = ExecuteCommand ( "/folders/" + path ) ;
229+ IRestResponse response = await ExecuteCommand ( "/folders/" + path ) ;
232230
233231 JObject o = JObject . Parse ( response . Content ) ;
234232
0 commit comments