Compare commits
No commits in common. "1480efdd8216084b2fc9d3c08b388e61a7309983" and "7cc8155b5b8c3d927b4f2cd118c69f9b9a1d6d49" have entirely different histories.
1480efdd82
...
7cc8155b5b
26
.vscode/launch.json
vendored
26
.vscode/launch.json
vendored
@ -1,26 +0,0 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
// Use IntelliSense to find out which attributes exist for C# debugging
|
||||
// Use hover for the description of the existing attributes
|
||||
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
|
||||
"name": ".NET Core Launch (console)",
|
||||
"type": "coreclr",
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
// If you have changed target frameworks, make sure to update the program path.
|
||||
"program": "${workspaceFolder}/bin/Debug/net7.0/ttrss-co-client.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}",
|
||||
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
|
||||
"console": "internalConsole",
|
||||
"stopAtEntry": false
|
||||
},
|
||||
{
|
||||
"name": ".NET Core Attach",
|
||||
"type": "coreclr",
|
||||
"request": "attach"
|
||||
}
|
||||
]
|
||||
}
|
42
.vscode/tasks.json
vendored
42
.vscode/tasks.json
vendored
@ -1,42 +0,0 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "build",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/ttrss-co-client.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
},
|
||||
{
|
||||
"label": "publish",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"publish",
|
||||
"${workspaceFolder}/ttrss-co-client.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
},
|
||||
{
|
||||
"label": "watch",
|
||||
"command": "dotnet",
|
||||
"type": "process",
|
||||
"args": [
|
||||
"watch",
|
||||
"run",
|
||||
"${workspaceFolder}/ttrss-co-client.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
}
|
||||
]
|
||||
}
|
16
Program.cs
16
Program.cs
@ -9,21 +9,7 @@ namespace ttrss_co_client
|
||||
var conf = Configure();
|
||||
var ttrssClient = new ttrss.ApiClient(conf.BaseURI);
|
||||
await ttrssClient.Login(conf.Username, conf.Password);
|
||||
|
||||
var loggedin = await ttrssClient.IsLoggedIn();
|
||||
Console.WriteLine($"logged in: {loggedin}");
|
||||
|
||||
var apiLevel = await ttrssClient.GetApiLevel();
|
||||
Console.WriteLine($"api level: {apiLevel}");
|
||||
|
||||
var unread = await ttrssClient.GetUnread();
|
||||
Console.WriteLine($"{unread} unread article{(unread == 1 ? "" : "s")}");
|
||||
|
||||
var loggedout = await ttrssClient.Logout();
|
||||
Console.WriteLine($"logged out: {loggedout}");
|
||||
|
||||
loggedin = await ttrssClient.IsLoggedIn();
|
||||
Console.WriteLine($"logged in: {loggedin}");
|
||||
Console.WriteLine("Hello, World!");
|
||||
}
|
||||
static Configuration Configure(string configurationPath = "appsettings.json")
|
||||
{
|
||||
|
@ -1,5 +1,2 @@
|
||||
# ttrss-co-pilot
|
||||
|
||||
wait i wanted to call it ttrss-co-client, dammit
|
||||
|
||||
but that name isn't good anyway
|
@ -1,5 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using Newtonsoft.Json;
|
||||
using System.Net.Http.Json;
|
||||
|
||||
@ -12,7 +11,7 @@ namespace ttrss_co_client.ttrss
|
||||
public Uri BaseURI { get; private set; }
|
||||
private HttpClient httpClient { get; set; }
|
||||
private string SessionId { get; set; } = null;
|
||||
private int api_level { get; set; }
|
||||
private int api_level{get;set;}
|
||||
|
||||
public ApiClient(Uri baseUri)
|
||||
{
|
||||
@ -46,26 +45,30 @@ namespace ttrss_co_client.ttrss
|
||||
public async Task<int> GetApiLevel()
|
||||
{
|
||||
assertInitialized();
|
||||
return await oneValueGet<int>("getApiLevel", "level");
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public async Task<string> GetVersion()
|
||||
{
|
||||
assertInitialized();
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public async Task<bool> Logout()
|
||||
{
|
||||
assertInitialized();
|
||||
|
||||
return (await oneValueGet<string>("logout", "status"))?.ToLower() == "ok";
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
public async Task<bool> IsLoggedIn()
|
||||
{
|
||||
//assertInitialized();
|
||||
return (await oneValueGet<bool>("isLoggedIn", "status"));
|
||||
assertInitialized();
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
public async Task<int> GetUnread()
|
||||
{
|
||||
assertInitialized();
|
||||
return await oneValueGet<int>("getUnread", "unread");
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public async Task GetFeeds(int cat_id, bool unread_only, int limit, int offset, bool include_nested)
|
||||
{
|
||||
assertInitialized();
|
||||
@ -78,11 +81,11 @@ namespace ttrss_co_client.ttrss
|
||||
}
|
||||
public enum VIEWMODE { All, Unread, Adaptive, Marked, Updated }
|
||||
public enum SORTORDER { Default, OldestFirst, NewestFirst }
|
||||
public async Task GetHeadlines(int feed_id, int limit, int skip, /*string filter, */ bool is_cat, bool show_excerpt, bool show_content, VIEWMODE view_mode, bool include_attachments, int since_id, bool include_nested, SORTORDER order_by, bool sanitize, bool force_update = false, bool has_sandbox = false, bool include_header = false)
|
||||
public async Task GetHeadlines(int feed_id, int limit, int skip, /*string filter, */ bool is_cat, bool show_excerpt, bool show_content, VIEWMODE view_mode, bool include_attachments, int since_id, bool include_nested, SORTORDER order_by, bool sanitize, bool force_update = false, bool has_sandbox = false, bool include_header)
|
||||
{
|
||||
await getHeadlines(feed_id, null, limit, skip, /*filter, */ is_cat, show_excerpt, show_content, view_mode, include_attachments, since_id, include_nested, order_by, sanitize, force_update, has_sandbox, include_header);
|
||||
}
|
||||
public async Task GetHeadlines(string feed_id, int limit, int skip, /*string filter, */ bool is_cat, bool show_excerpt, bool show_content, VIEWMODE view_mode, bool include_attachments, int since_id, bool include_nested, SORTORDER order_by, bool sanitize, bool force_update = false, bool has_sandbox = false, bool include_header = false)
|
||||
public async Task GetHeadlines(string feed_id, int limit, int skip, /*string filter, */ bool is_cat, bool show_excerpt, bool show_content, VIEWMODE view_mode, bool include_attachments, int since_id, bool include_nested, SORTORDER order_by, bool sanitize, bool force_update = false, bool has_sandbox = false, bool include_header)
|
||||
{
|
||||
await getHeadlines(null, feed_id, limit, skip, /*filter, */ is_cat, show_excerpt, show_content, view_mode, include_attachments, since_id, include_nested, order_by, sanitize, force_update, has_sandbox, include_header);
|
||||
}
|
||||
@ -146,7 +149,7 @@ namespace ttrss_co_client.ttrss
|
||||
public async Task GetLabels(int? article_id)
|
||||
{
|
||||
assertInitialized();
|
||||
if (article_id != null)
|
||||
if(article_id != null)
|
||||
{
|
||||
assertApiLevel(5);
|
||||
}
|
||||
@ -162,7 +165,7 @@ namespace ttrss_co_client.ttrss
|
||||
{
|
||||
assertInitialized();
|
||||
assertApiLevel(4);
|
||||
if (!sanitize)
|
||||
if(!sanitize)
|
||||
assertApiLevel(20);
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
@ -197,37 +200,10 @@ namespace ttrss_co_client.ttrss
|
||||
}
|
||||
private void assertApiLevel(int ApiLevel)
|
||||
{
|
||||
if (ApiLevel > this.api_level)
|
||||
if(ApiLevel > this.api_level)
|
||||
{
|
||||
throw new NotSupportedException($"method requires api level {ApiLevel}, have {this.api_level}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private async Task<T> oneValueGet<T>(string op, string key)
|
||||
{
|
||||
//mostly you post {"op": "aThingToDo", "sid": "sessionId", "some other param": "some other value"}
|
||||
//and get back something like {"seq": 0, "status", "content": {"the value you asked for": 0}}
|
||||
var json = JsonContent.Create(new
|
||||
{
|
||||
op = op,
|
||||
sid = this.SessionId
|
||||
});
|
||||
var response = await (await httpClient.PostAsync(BaseURI, json)).Content.ReadAsStringAsync();
|
||||
var apiResult = JsonConvert.DeserializeObject<ttrss.messages.GenericApiResponse>(response);
|
||||
try
|
||||
{
|
||||
var converter = TypeDescriptor.GetConverter(typeof(T));
|
||||
if (converter != null)
|
||||
{
|
||||
return (T)converter.ConvertFromString(apiResult.Content[key]);
|
||||
}
|
||||
return default(T);
|
||||
}
|
||||
catch (NotSupportedException)
|
||||
{
|
||||
return default(T);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace ttrss_co_client.ttrss.messages
|
||||
{
|
||||
public abstract class ApiResponse
|
||||
{
|
||||
public int seq { get; set; }
|
||||
public int status { get; set; }
|
||||
}
|
||||
public class GenericApiResponse : ApiResponse
|
||||
{
|
||||
public Dictionary<string, string> Content{get; set;}
|
||||
}
|
||||
}
|
@ -1,7 +1,9 @@
|
||||
namespace ttrss_co_client.ttrss.messages
|
||||
{
|
||||
public class LoginResponse : ApiResponse
|
||||
public class LoginResponse
|
||||
{
|
||||
public int seq { get; set; }
|
||||
public int status { get; set; }
|
||||
public Content content { get; set; }
|
||||
|
||||
public class Content
|
||||
|
Loading…
Reference in New Issue
Block a user