Move ingestion + Telegram/Bale/Divar config to DB-backed admin settings
- AppSetting gains source config: AutoIngestEnabled, IngestIntervalMinutes, Telegram/Bale/Divar enabled+channels/token/queries - IListingSource.FetchAsync(AppSetting) — sources read config from DB, not IOptions/appsettings; sample source dev-only - IngestionWorker reads AutoIngest+interval from DB each cycle (toggle at runtime, no redeploy) - /Admin/Settings gets a 'منابع جمعآوری' section; removed Ingestion env/appsettings + compose env vars - ENV_FILE shrinks to HOST_PORT + POSTGRES_* + ADMIN_PHONE (AI + sources are all in-admin); migration Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -1,55 +1,44 @@
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
using Microsoft.Extensions.Options;
|
||||
using JobsMedical.Web.Models;
|
||||
|
||||
namespace JobsMedical.Web.Services.Scraping;
|
||||
|
||||
public class DivarOptions
|
||||
{
|
||||
public bool Enabled { get; set; }
|
||||
public string City { get; set; } = "tehran";
|
||||
public string Category { get; set; } = "jobs";
|
||||
public List<string> Queries { get; set; } = new(); // e.g. "پرستار", "پزشک عمومی", "درمانگاه"
|
||||
public string BaseUrl { get; set; } = "https://api.divar.ir/v8/web-search";
|
||||
public int PerQuery { get; set; } = 25;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Best-effort Divar fetch: queries Divar's web-search JSON for each term and harvests post
|
||||
/// titles + descriptions. Divar's private API shifts shape over time, so we walk the JSON
|
||||
/// tolerantly for any object carrying a "title" plus a nearby description field, and fail soft.
|
||||
/// titles + descriptions. Enabled + city + queries come from admin settings (DB). Divar's
|
||||
/// private API shifts shape, so we walk JSON tolerantly and fail soft.
|
||||
/// </summary>
|
||||
public class DivarListingSource : IListingSource
|
||||
{
|
||||
private readonly DivarOptions _opts;
|
||||
private const string BaseUrl = "https://api.divar.ir/v8/web-search";
|
||||
private readonly IHttpClientFactory _http;
|
||||
private readonly ILogger<DivarListingSource> _log;
|
||||
|
||||
public DivarListingSource(IOptions<DivarOptions> opts, IHttpClientFactory http,
|
||||
ILogger<DivarListingSource> log)
|
||||
public DivarListingSource(IHttpClientFactory http, ILogger<DivarListingSource> log)
|
||||
{
|
||||
_opts = opts.Value;
|
||||
_http = http;
|
||||
_log = log;
|
||||
}
|
||||
|
||||
public string Name => "دیوار";
|
||||
public bool Enabled => _opts.Enabled && _opts.Queries.Count > 0;
|
||||
|
||||
public async Task<IReadOnlyList<ScrapedItem>> FetchAsync(CancellationToken ct = default)
|
||||
public async Task<IReadOnlyList<ScrapedItem>> FetchAsync(AppSetting s, CancellationToken ct = default)
|
||||
{
|
||||
if (!Enabled) { _log.LogInformation("Divar source disabled/unconfigured."); return Array.Empty<ScrapedItem>(); }
|
||||
var queries = AppSetting.SplitList(s.DivarQueries);
|
||||
if (!s.DivarEnabled || queries.Count == 0) return Array.Empty<ScrapedItem>();
|
||||
var city = string.IsNullOrWhiteSpace(s.DivarCity) ? "tehran" : s.DivarCity.Trim();
|
||||
|
||||
var client = _http.CreateClient("scrape");
|
||||
var items = new List<ScrapedItem>();
|
||||
foreach (var q in _opts.Queries.Where(q => q.Trim().Length > 0))
|
||||
foreach (var q in queries)
|
||||
{
|
||||
try
|
||||
{
|
||||
var url = $"{_opts.BaseUrl.TrimEnd('/')}/{_opts.City}/{_opts.Category}?q={Uri.EscapeDataString(q)}";
|
||||
var url = $"{BaseUrl}/{city}/jobs?q={Uri.EscapeDataString(q)}";
|
||||
var body = await client.GetStringAsync(url, ct);
|
||||
using var doc = JsonDocument.Parse(body);
|
||||
foreach (var text in Harvest(doc.RootElement).Take(_opts.PerQuery))
|
||||
foreach (var text in Harvest(doc.RootElement).Take(25))
|
||||
items.Add(new ScrapedItem("دیوار", text, "https://divar.ir"));
|
||||
}
|
||||
catch (Exception ex) { _log.LogWarning(ex, "Divar fetch failed for query {Query}", q); }
|
||||
@@ -60,7 +49,6 @@ public class DivarListingSource : IListingSource
|
||||
private static readonly string[] DescKeys =
|
||||
{ "description", "middle_description_text", "subtitle", "bottom_description_text", "normal_text" };
|
||||
|
||||
/// <summary>Walk the JSON; for each object with a string "title", emit title + first description.</summary>
|
||||
private static IEnumerable<string> Harvest(JsonElement el)
|
||||
{
|
||||
if (el.ValueKind == JsonValueKind.Object)
|
||||
@@ -75,12 +63,12 @@ public class DivarListingSource : IListingSource
|
||||
if (text.Length >= 15) yield return text;
|
||||
}
|
||||
foreach (var p in el.EnumerateObject())
|
||||
foreach (var s in Harvest(p.Value)) yield return s;
|
||||
foreach (var x in Harvest(p.Value)) yield return x;
|
||||
}
|
||||
else if (el.ValueKind == JsonValueKind.Array)
|
||||
{
|
||||
foreach (var item in el.EnumerateArray())
|
||||
foreach (var s in Harvest(item)) yield return s;
|
||||
foreach (var x in Harvest(item)) yield return x;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user