Compare commits
No commits in common. "31a0c6ffb2355b80a8d86ff11674660715761ff2" and "3938c6129745b36ab8bd61a7e42b99d4a90eaabe" have entirely different histories.
31a0c6ffb2
...
3938c61297
@ -62,7 +62,7 @@ public class MemoryLogger : LoggerBase
|
||||
ret.Add(_logMessages.GetValueAtIndex(_lastLogMessageIndex + retIndex).ToString());
|
||||
}
|
||||
}
|
||||
catch (NullReferenceException)//Called when LogMessage has not finished writing
|
||||
catch (NullReferenceException e)//Called when LogMessage has not finished writing
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
@ -225,7 +225,7 @@ public abstract class MangaConnector : GlobalBase
|
||||
}
|
||||
if (progressToken?.cancellationRequested ?? false)
|
||||
{
|
||||
progressToken.Complete();
|
||||
progressToken?.Complete();
|
||||
return HttpStatusCode.RequestTimeout;
|
||||
}
|
||||
progressToken?.Increment();
|
||||
|
@ -51,23 +51,16 @@ public class MangaDex : MangaConnector
|
||||
if (result is null)
|
||||
break;
|
||||
|
||||
if(result.ContainsKey("total"))
|
||||
total = result["total"]!.GetValue<int>(); //Update the total number of Publications
|
||||
else continue;
|
||||
total = result["total"]!.GetValue<int>(); //Update the total number of Publications
|
||||
|
||||
if (result.ContainsKey("data"))
|
||||
JsonArray mangaInResult = result["data"]!.AsArray(); //Manga-data-Array
|
||||
//Loop each Manga and extract information from JSON
|
||||
foreach (JsonNode? mangaNode in mangaInResult)
|
||||
{
|
||||
JsonArray mangaInResult = result["data"]!.AsArray(); //Manga-data-Array
|
||||
//Loop each Manga and extract information from JSON
|
||||
foreach (JsonNode? mangaNode in mangaInResult)
|
||||
{
|
||||
if(mangaNode is null)
|
||||
continue;
|
||||
Log($"Getting publication data. {++loadedPublicationData}/{total}");
|
||||
if(MangaFromJsonObject((JsonObject) mangaNode) is { } manga)
|
||||
retManga.Add(manga); //Add Publication (Manga) to result
|
||||
}
|
||||
}else continue;
|
||||
Log($"Getting publication data. {++loadedPublicationData}/{total}");
|
||||
Manga manga = MangaFromJsonObject((JsonObject)mangaNode);
|
||||
retManga.Add(manga); //Add Publication (Manga) to result
|
||||
}
|
||||
}
|
||||
Log($"Retrieved {retManga.Count} publications. Term=\"{publicationTitle}\"");
|
||||
return retManga.ToArray();
|
||||
@ -88,30 +81,20 @@ public class MangaDex : MangaConnector
|
||||
return null;
|
||||
}
|
||||
|
||||
private Manga? MangaFromJsonObject(JsonObject manga)
|
||||
private Manga MangaFromJsonObject(JsonObject manga)
|
||||
{
|
||||
if (!manga.ContainsKey("attributes"))
|
||||
return null;
|
||||
JsonObject attributes = manga["attributes"]!.AsObject();
|
||||
|
||||
if(!manga.ContainsKey("id"))
|
||||
return null;
|
||||
string publicationId = manga["id"]!.GetValue<string>();
|
||||
|
||||
if(!attributes.ContainsKey("title"))
|
||||
return null;
|
||||
string title = attributes["title"]!.AsObject().ContainsKey("en") && attributes["title"]!["en"] is not null
|
||||
? attributes["title"]!["en"]!.GetValue<string>()
|
||||
: attributes["title"]![((IDictionary<string, JsonNode?>)attributes["title"]!.AsObject()).Keys.First()]!.GetValue<string>();
|
||||
|
||||
if(!attributes.ContainsKey("description"))
|
||||
return null;
|
||||
string? description = attributes["description"]!.AsObject().ContainsKey("en") && attributes["description"]!["en"] is not null
|
||||
? attributes["description"]!["en"]!.GetValue<string?>()
|
||||
: null;
|
||||
|
||||
if(!attributes.ContainsKey("altTitles"))
|
||||
return null;
|
||||
JsonArray altTitlesObject = attributes["altTitles"]!.AsArray();
|
||||
Dictionary<string, string> altTitlesDict = new();
|
||||
foreach (JsonNode? altTitleNode in altTitlesObject)
|
||||
@ -121,8 +104,6 @@ public class MangaDex : MangaConnector
|
||||
altTitlesDict.TryAdd(key, altTitleObject[key]!.GetValue<string>());
|
||||
}
|
||||
|
||||
if(!attributes.ContainsKey("tags"))
|
||||
return null;
|
||||
JsonArray tagsObject = attributes["tags"]!.AsArray();
|
||||
HashSet<string> tags = new();
|
||||
foreach (JsonNode? tagNode in tagsObject)
|
||||
@ -168,8 +149,6 @@ public class MangaDex : MangaConnector
|
||||
? attributes["originalLanguage"]!.GetValue<string?>()
|
||||
: null;
|
||||
|
||||
if(!attributes.ContainsKey("status"))
|
||||
return null;
|
||||
string status = attributes["status"]!.GetValue<string>();
|
||||
|
||||
Manga pub = new(
|
||||
|
@ -52,7 +52,7 @@ public class Server : GlobalBase
|
||||
});
|
||||
t.Start();
|
||||
}
|
||||
catch (HttpListenerException)
|
||||
catch (HttpListenerException e)
|
||||
{
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user