Skip to content

Commit 8a0125c

Browse files
immisterioimmisterio
committed
fix
1 parent aa5b8f6 commit 8a0125c

13 files changed

+145
-93
lines changed

‎AppInit.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ public static AppInit conf
4747

4848
public bool opensync = false;
4949

50+
public bool log = false;
51+
5052
public string syncapi = null;
5153

5254
public string[] synctrackers = null;
@@ -78,7 +80,7 @@ public static AppInit conf
7880

7981
public TrackerSettings Rutracker = new TrackerSettings("https://rutracker.net");
8082

81-
public TrackerSettings Selezen = new TrackerSettings("https://selezen.org");
83+
public TrackerSettings Selezen = new TrackerSettings("https://open.selezen.org");
8284

8385
public TrackerSettings Anilibria = new TrackerSettings("https://api.anilibria.tv");
8486

‎Controllers/CRON/BitruController.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,16 @@ async public Task<string> UpdateTasksParse()
6363
// Загружаем список страниц в список задач
6464
for (int page = 1; page <= maxpages; page++)
6565
{
66-
if (!taskParse.ContainsKey(cat))
67-
taskParse.Add(cat, new List<TaskParse>());
66+
try
67+
{
68+
if (!taskParse.ContainsKey(cat))
69+
taskParse.Add(cat, new List<TaskParse>());
6870

69-
var val = taskParse[cat];
70-
if (val.Find(i => i.page == page) == null)
71-
val.Add(new TaskParse(page));
71+
var val = taskParse[cat];
72+
if (val.Find(i => i.page == page) == null)
73+
val.Add(new TaskParse(page));
74+
}
75+
catch { }
7276
}
7377
}
7478
}
@@ -90,9 +94,9 @@ async public Task<string> ParseAllTask()
9094

9195
try
9296
{
93-
foreach (var task in taskParse)
97+
foreach (var task in taskParse.ToArray())
9498
{
95-
foreach (var val in task.Value)
99+
foreach (var val in task.Value.ToArray())
96100
{
97101
if (DateTime.Today == val.updateTime)
98102
continue;
@@ -148,7 +152,7 @@ string Match(string pattern, int index = 1)
148152
}
149153
else if (row.Contains("<span>Вчера"))
150154
{
151-
createTime = DateTime.Today.AddDays(-1);
155+
createTime = DateTime.UtcNow.AddDays(-1);
152156
}
153157
else
154158
{

‎Controllers/CRON/KinozalController.cs‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -173,17 +173,21 @@ async public Task<string> UpdateTasksParse()
173173
// Загружаем список страниц в список задач
174174
for (int page = 0; page <= maxpages; page++)
175175
{
176-
if (!taskParse.ContainsKey(cat))
177-
taskParse.Add(cat, new Dictionary<string, List<TaskParse>>());
176+
try
177+
{
178+
if (!taskParse.ContainsKey(cat))
179+
taskParse.Add(cat, new Dictionary<string, List<TaskParse>>());
178180

179-
string arg = $"&d={year}&t=1";
180-
var catVal = taskParse[cat];
181-
if (!catVal.ContainsKey(arg))
182-
catVal.Add(arg, new List<TaskParse>());
181+
string arg = $"&d={year}&t=1";
182+
var catVal = taskParse[cat];
183+
if (!catVal.ContainsKey(arg))
184+
catVal.Add(arg, new List<TaskParse>());
183185

184-
var val = catVal[arg];
185-
if (val.Find(i => i.page == page) == null)
186-
val.Add(new TaskParse(page));
186+
var val = catVal[arg];
187+
if (val.Find(i => i.page == page) == null)
188+
val.Add(new TaskParse(page));
189+
}
190+
catch { }
187191
}
188192
}
189193
}
@@ -206,11 +210,11 @@ async public Task<string> ParseAllTask()
206210

207211
try
208212
{
209-
foreach (var cat in taskParse)
213+
foreach (var cat in taskParse.ToArray())
210214
{
211-
foreach (var arg in cat.Value)
215+
foreach (var arg in cat.Value.ToArray())
212216
{
213-
foreach (var val in arg.Value)
217+
foreach (var val in arg.Value.ToArray())
214218
{
215219
if (DateTime.Today == val.updateTime)
216220
continue;
@@ -267,7 +271,7 @@ string Match(string pattern, int index = 1)
267271
}
268272
else if (row.Contains("<td class='s'>вчера"))
269273
{
270-
createTime = DateTime.Today.AddDays(-1);
274+
createTime = DateTime.UtcNow.AddDays(-1);
271275
}
272276
else
273277
{

‎Controllers/CRON/MegapeerController.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,16 @@ async public Task<string> UpdateTasksParse()
7777
// Загружаем список страниц в список задач
7878
for (int page = 0; page < maxpages; page++)
7979
{
80-
if (!taskParse.ContainsKey(cat))
81-
taskParse.Add(cat, new List<TaskParse>());
80+
try
81+
{
82+
if (!taskParse.ContainsKey(cat))
83+
taskParse.Add(cat, new List<TaskParse>());
8284

83-
var val = taskParse[cat];
84-
if (val.Find(i => i.page == page) == null)
85-
val.Add(new TaskParse(page));
85+
var val = taskParse[cat];
86+
if (val.Find(i => i.page == page) == null)
87+
val.Add(new TaskParse(page));
88+
}
89+
catch { }
8690
}
8791
}
8892
}
@@ -104,9 +108,9 @@ async public Task<string> ParseAllTask()
104108

105109
try
106110
{
107-
foreach (var task in taskParse)
111+
foreach (var task in taskParse.ToArray())
108112
{
109-
foreach (var val in task.Value)
113+
foreach (var val in task.Value.ToArray())
110114
{
111115
if (DateTime.Today == val.updateTime)
112116
continue;

‎Controllers/CRON/NNMClubController.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using IO = System.IO;
1212
using JacRed.Engine;
1313
using JacRed.Models.Details;
14+
using System.Linq;
1415

1516
namespace JacRed.Controllers.CRON
1617
{
@@ -78,12 +79,16 @@ async public Task<string> UpdateTasksParse()
7879
// Загружаем список страниц в список задач
7980
for (int page = 0; page < maxpages; page++)
8081
{
81-
if (!taskParse.ContainsKey(cat))
82-
taskParse.Add(cat, new List<TaskParse>());
82+
try
83+
{
84+
if (!taskParse.ContainsKey(cat))
85+
taskParse.Add(cat, new List<TaskParse>());
8386

84-
var val = taskParse[cat];
85-
if (val.Find(i => i.page == page) == null)
86-
val.Add(new TaskParse(page));
87+
var val = taskParse[cat];
88+
if (val.Find(i => i.page == page) == null)
89+
val.Add(new TaskParse(page));
90+
}
91+
catch { }
8792
}
8893
}
8994
}
@@ -105,9 +110,9 @@ async public Task<string> ParseAllTask()
105110

106111
try
107112
{
108-
foreach (var task in taskParse)
113+
foreach (var task in taskParse.ToArray())
109114
{
110-
foreach (var val in task.Value)
115+
foreach (var val in task.Value.ToArray())
111116
{
112117
if (DateTime.Today == val.updateTime)
113118
continue;

‎Controllers/CRON/RutorController.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,16 @@ async public Task<string> UpdateTasksParse()
7979
// Загружаем список страниц в список задач
8080
for (int page = 0; page < maxpages; page++)
8181
{
82-
if (!taskParse.ContainsKey(cat))
83-
taskParse.Add(cat, new List<TaskParse>());
82+
try
83+
{
84+
if (!taskParse.ContainsKey(cat))
85+
taskParse.Add(cat, new List<TaskParse>());
8486

85-
var val = taskParse[cat];
86-
if (val.Find(i => i.page == page) == null)
87-
val.Add(new TaskParse(page));
87+
var val = taskParse[cat];
88+
if (val.Find(i => i.page == page) == null)
89+
val.Add(new TaskParse(page));
90+
}
91+
catch { }
8892
}
8993
}
9094
}
@@ -106,9 +110,9 @@ async public Task<string> ParseAllTask()
106110

107111
try
108112
{
109-
foreach (var task in taskParse)
113+
foreach (var task in taskParse.ToArray())
110114
{
111-
foreach (var val in task.Value)
115+
foreach (var val in task.Value.ToArray())
112116
{
113117
if (DateTime.Today == val.updateTime)
114118
continue;

‎Controllers/CRON/RutrackerController.cs‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -173,36 +173,40 @@ async public Task<string> UpdateTasksParse()
173173
"1675", "257", "875", "263", "2073", "550", "2124", "1470", "528", "486", "854", "2079", "1336", "2171", "1339", "2455", "1434", "2350", "1472", "2068", "2016"
174174
})
175175
{
176-
// Получаем html
177-
string html = await HttpClient.Get($"{AppInit.conf.Rutracker.rqHost()}/forum/viewforum.php?f={cat}", useproxy: AppInit.conf.Rutracker.useproxy);
178-
if (html == null)
179-
continue;
176+
try
177+
{
178+
// Получаем html
179+
string html = await HttpClient.Get($"{AppInit.conf.Rutracker.rqHost()}/forum/viewforum.php?f={cat}", useproxy: AppInit.conf.Rutracker.useproxy);
180+
if (html == null)
181+
continue;
180182

181-
// Максимальное количиство страниц
182-
int.TryParse(Regex.Match(html, "Страница <b>1</b> из <b>([0-9]+)</b>").Groups[1].Value, out int maxpages);
183+
// Максимальное количиство страниц
184+
int.TryParse(Regex.Match(html, "Страница <b>1</b> из <b>([0-9]+)</b>").Groups[1].Value, out int maxpages);
183185

184-
if (maxpages > 0)
185-
{
186-
// Загружаем список страниц в список задач
187-
for (int page = 0; page <= maxpages; page++)
186+
if (maxpages > 0)
187+
{
188+
// Загружаем список страниц в список задач
189+
for (int page = 0; page <= maxpages; page++)
190+
{
191+
if (!taskParse.ContainsKey(cat))
192+
taskParse.Add(cat, new List<TaskParse>());
193+
194+
var val = taskParse[cat];
195+
if (val.Find(i => i.page == page) == null)
196+
val.Add(new TaskParse(page));
197+
}
198+
}
199+
else
188200
{
189201
if (!taskParse.ContainsKey(cat))
190202
taskParse.Add(cat, new List<TaskParse>());
191203

192204
var val = taskParse[cat];
193-
if (val.Find(i => i.page == page) == null)
194-
val.Add(new TaskParse(page));
205+
if (val.Find(i => i.page == 1) == null)
206+
val.Add(new TaskParse(1));
195207
}
196208
}
197-
else
198-
{
199-
if (!taskParse.ContainsKey(cat))
200-
taskParse.Add(cat, new List<TaskParse>());
201-
202-
var val = taskParse[cat];
203-
if (val.Find(i => i.page == 1) == null)
204-
val.Add(new TaskParse(1));
205-
}
209+
catch { }
206210
}
207211

208212
IO.File.WriteAllText("Data/temp/rutracker_taskParse.json", JsonConvert.SerializeObject(taskParse));
@@ -222,9 +226,9 @@ async public Task<string> ParseAllTask()
222226

223227
try
224228
{
225-
foreach (var task in taskParse)
229+
foreach (var task in taskParse.ToArray())
226230
{
227-
foreach (var val in task.Value)
231+
foreach (var val in task.Value.ToArray())
228232
{
229233
if (DateTime.Today == val.updateTime)
230234
continue;

‎Controllers/CRON/SelezenController.cs‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,12 @@ async public Task<string> UpdateTasksParse()
117117
// Загружаем список страниц в список задач
118118
for (int page = 1; page <= maxpages; page++)
119119
{
120-
if (taskParse.Find(i => i.page == page) == null)
121-
taskParse.Add(new TaskParse(page));
120+
try
121+
{
122+
if (taskParse.Find(i => i.page == page) == null)
123+
taskParse.Add(new TaskParse(page));
124+
}
125+
catch { }
122126
}
123127
}
124128

@@ -139,7 +143,7 @@ async public Task<string> ParseAllTask()
139143

140144
try
141145
{
142-
foreach (var val in taskParse)
146+
foreach (var val in taskParse.ToArray())
143147
{
144148
if (DateTime.Today == val.updateTime)
145149
continue;
@@ -163,20 +167,23 @@ async public Task<string> ParseAllTask()
163167
async Task<bool> parsePage(int page)
164168
{
165169
#region Авторизация
166-
if (Cookie == null)
170+
if (Cookie == null && AppInit.conf.Selezen.cookie == null)
167171
{
168172
if (await TakeLogin() == false)
169173
return false;
170174
}
171175
#endregion
172176

173-
string html = await HttpClient.Get(page == 1 ? $"{AppInit.conf.Selezen.host}/relizy-ot-selezen/" : $"{AppInit.conf.Selezen.host}/relizy-ot-selezen/page/{page}/", cookie: Cookie, useproxy: AppInit.conf.Selezen.useproxy);
177+
string cookie = AppInit.conf.Selezen.cookie ?? Cookie;
178+
string html = await HttpClient.Get(page == 1 ? $"{AppInit.conf.Selezen.host}/relizy-ot-selezen/" : $"{AppInit.conf.Selezen.host}/relizy-ot-selezen/page/{page}/", cookie: cookie, useproxy: AppInit.conf.Selezen.useproxy);
174179
if (html == null || !html.Contains("dle_root"))
175180
return false;
176181

177182
if (!html.Contains($">{AppInit.conf.Selezen.login.u}<"))
178183
{
179-
await TakeLogin();
184+
if (string.IsNullOrEmpty(AppInit.conf.Selezen.cookie))
185+
await TakeLogin();
186+
180187
return false;
181188
}
182189

@@ -281,7 +288,7 @@ await FileDB.AddOrUpdate(torrents, async (t, db) =>
281288
if (db.TryGetValue(t.url, out TorrentDetails _tcache) && _tcache.title == t.title)
282289
return true;
283290

284-
string fullnews = await HttpClient.Get(t.url, cookie: Cookie, useproxy: AppInit.conf.Selezen.useproxy);
291+
string fullnews = await HttpClient.Get(t.url, cookie: cookie, useproxy: AppInit.conf.Selezen.useproxy);
285292
if (fullnews != null)
286293
{
287294
string _mg = Regex.Match(fullnews, "href=\"(magnet:\\?xt=urn:btih:[^\"]+)\"").Groups[1].Value;

0 commit comments

Comments
 (0)