One backup, fix waiting

This commit is contained in:
Egor Guslyancev 2024-05-01 06:37:45 -03:00
parent fba694ba83
commit 367f2b22b0
GPG Key ID: D7E709AA465A55F9
2 changed files with 16 additions and 13 deletions

View File

@ -17,7 +17,7 @@ import timeout as tmo
# Simple config
GET_ONLY_FOR_VIP = True
POST_ONLY_FOR_VIP = True
VERSION = "20240501.1"
VERSION = "20240501.2"
CHARSET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
@ -48,7 +48,8 @@ def resolve_logs(tries = 3, backup = True, backup_name = None):
print("Resolved")
return
if backup:
backup_name = f"backup{str(int(time()))}.db"
# backup_name = f"backup{str(int(time()))}.db"
backup_name = "backup.db"
db.save(backup_name)
try:
for test in pending:

24
user.js
View File

@ -2,7 +2,7 @@
// @name Sorryops
// @name:ru Сориупс
// @namespace https://git.disroot.org/electromagneticcyclone/sorryops
// @version 20240501.1
// @version 20240501.2
// @description Collect and reuse ORIOKS test answers
// @description:ru Скрипт для сбора и переиспользования ответов на тесты ОРИОКС
// @icon https://orioks.miet.ru/favicon.ico
@ -25,7 +25,7 @@
// ==/UserScript==
/* Version */
const VERSION = "20240501.1";
const VERSION = "20240501.2";
/* End Version */
/* Charset */
@ -518,7 +518,11 @@ function update_variant() {
status = "<span style='color: red;'>Скрипт устарел</span>";
GM_setValue('fetched_data', {});
} else if (version === undefined) {
status = "<span style='color: red;'>Нет соединения</span>";
if (config.get('wait_server_response')) {
status = "<span style='color: blue;'>Ожидание ответа</span>";
} else {
status = "<span style='color: red;'>Нет соединения</span>";
}
} else if (chosen_answer == correct) {
status = "<span style='color: green;'>Верно</span>";
new_answer_f = false;
@ -566,7 +570,7 @@ function auto_answer() {
case 'radio': {
for (answer in answers) {
if (answers[answer].sorry_value == correct) {
if (!answers[answer].sorry_colored) {
if (!answers[answer].sorry_colored && version !== undefined) {
correct_element = answers[answer].parentNode;
sorry_val = answers[answer].sorry_value;
correct_element.innerHTML = "<span style='color: green;'>" + correct_element.innerHTML + "</span>";
@ -581,7 +585,7 @@ function auto_answer() {
case 'checkbox': {
for (answer in answers) {
if (correct.includes(answers[answer].sorry_value)) {
if (!answers[answer].sorry_colored) {
if (!answers[answer].sorry_colored && version !== undefined) {
correct_element = answers[answer].parentNode;
sorry_val = answers[answer].sorry_value;
correct_element.innerHTML = "<span style='color: green;'>" + correct_element.innerHTML + "</span>";
@ -608,7 +612,7 @@ function auto_answer() {
if (incorrect.includes(answers[answer].sorry_value) == false) {
possible_answers.push(answer);
} else {
if (!answers[answer].sorry_colored) {
if (!answers[answer].sorry_colored && version !== undefined) {
incorrect_element = answers[answer].parentNode;
sorry_val = answers[answer].sorry_value;
incorrect_element.innerHTML = "<span style='color: red;'>" + incorrect_element.innerHTML + "</span>";
@ -679,7 +683,7 @@ function auto_continue() {
if (cur_time - old_time > 60 * 60 * 1000) {
config.set('auto_continue', false);
} else {
press_continue_btn();
press_continue_btn();
}
}
}
@ -863,21 +867,19 @@ function main() {
DB_cleaner();
parse_server_data(server_response);
test_form_handler();
if (config.get('wait_server_response')) {
if (config.get('wait_server_response') && version === undefined) {
window.setInterval(() => {fetch_from_server(testID, (server_response) => {
if (version === undefined) {
parse_server_data(server_response);
update_variant();
if (version === VERSION) {
press_continue_btn();
auto_continue();
}
}
})}, 3000, true);
})}, 1000, true);
} else {
auto_continue();
}
auto_continue();
});
} else if (variant.includes("Результат прохождения теста:")) {
result_page_handler();