xfox111/GUTSchedule
1
0
Fork 0
mirror of https://github.com/XFox111/GUTSchedule.git synced 2026-04-22 06:58:01 +03:00
Code Activity

Parser improvements and fixes, Tests (#23)

Browse Source 
* Added unit tests, fixed and improved parser

* Updated translation files

* Updated unit tests to work with credentials

* Updated validation CI config

* Updated changelogs, improved CI/CD processes
This commit is contained in:
Michael Gordeev
2020-04-20 17:51:42 +03:00
committed by GitHub
parent 8579f9bbc6
commit a07cb6fd3e
20 changed files with 267 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUT.Schedule/GUTSchedule/Parser.cs
+20 -12
View File
@@ -25,7 +25,7 @@ namespace GUTSchedule
await client.GetAsync("https://cabs.itut.ru/cabinet/");
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, "https://cabs.itut.ru/cabinet/lib/autentificationok.php");
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, "https://lk.sut.ru/cabinet/lib/autentificationok.php");
request.SetContent(
("users", email),
("parole", password));
@@ -39,8 +39,9 @@ namespace GUTSchedule
if (!responseContent.StartsWith("1", StringComparison.OrdinalIgnoreCase))
{
Dictionary<string, string> responseQuery = new Dictionary<string, string>();
foreach (string i in responseContent.Split('&'))
responseQuery.Add(i.Split('=')[0], i.Split('=')[1]);
if (responseContent.Length > 1)
foreach (string i in responseContent.Split('&'))
responseQuery.Add(i.Split('=')[0], i.Split('=')[1]);
throw new System.Security.VerificationException(responseQuery["error"].Replace("|", "; "));
}
@@ -85,7 +86,7 @@ namespace GUTSchedule
schedule[k - 1].Name == schedule[k].Name &&
schedule[k - 1].Type == schedule[k].Type)
{
schedule[k - 1].Opponent += $" ({schedule[k-1].Cabinet}) \n {schedule[k].Opponent} ({schedule[k].Cabinet})";
schedule[k - 1].Opponent += $" ({schedule[k-1].Cabinet}) \n{schedule[k].Opponent} ({schedule[k].Cabinet})";
schedule[k - 1].Cabinet += "; " + schedule[k].Cabinet;
schedule.RemoveAt(k--);
}
@@ -229,11 +230,11 @@ namespace GUTSchedule
int order = int.Parse(item.GetAttribute("pair")) - 1;
Occupation occupation = new Occupation
{
Name = item.QuerySelector(".subect").TextContent,
Name = item.QuerySelector(".subect").TextContent.Replace(" (1)", "").Replace(" (2)", ""),
Type = item.QuerySelector(".type").TextContent.Replace("(", "").Replace(")", ""),
Group = groupName,
Opponent = item.QuerySelector(".teacher")?.GetAttribute("title").Replace("; ", "\n") ?? "",
Cabinet = item.QuerySelector(".aud")?.TextContent.Replace("ауд.: ", "").Replace("; Б22", "") ?? "СПбГУТ",
Opponent = item.QuerySelector(".teacher")?.GetAttribute("title").Replace("; ", "") ?? "",
Cabinet = item.QuerySelector(".aud")?.TextContent.Replace("ауд.: ", "").Replace("; Б22", "").Replace(" ", "") ?? "СПбГУТ",
Order = order > 50 ? $"Ф{order - 81}" : order.ToString()
};
@@ -309,10 +310,17 @@ namespace GUTSchedule
DateTime date = DateTime.Parse(item.FirstChild.FirstChild.TextContent, new CultureInfo("ru-RU"));
string rawTime = item.ChildNodes[2].TextContent;
rawTime = rawTime.Substring(rawTime.IndexOf('(')).Replace(")", "").Replace('.', ':');
occupation.StartTime = date.Add(TimeSpan.Parse(rawTime.Split('-')[0]));
occupation.EndTime = date.Add(TimeSpan.Parse(rawTime.Split('-')[1]));
try
{
rawTime = rawTime.Substring(rawTime.IndexOf('(')).Replace(")", "").Replace('.', ':');
occupation.StartTime = date.Add(TimeSpan.Parse(rawTime.Split('-')[0]));
occupation.EndTime = date.Add(TimeSpan.Parse(rawTime.Split('-')[1]));
}
catch
{
occupation.StartTime = date;
occupation.EndTime = date;
}
schedule.Add(occupation);
}
@@ -355,7 +363,7 @@ namespace GUTSchedule
item.Opponent = i.QuerySelectorAll("i")[k].NextSibling.NextSibling.NextSibling?.NodeType == NodeType.Text ?
i.QuerySelectorAll("i")[k].NextSibling.NextSibling.NextSibling.TextContent : "";
try { item.Cabinet = i.QuerySelectorAll("small")[k].NextSibling.TextContent.Replace("; Б22", ""); }
try { item.Cabinet = i.QuerySelectorAll("small")[k].NextSibling.TextContent.Replace(" ", "").Replace(";Б22", ""); }
catch { item.Cabinet = "СПбГУТ"; }
string rawTime = i.QuerySelectorAll("b")[k * 2 + 2].TextContent;