diff --git a/__pycache__/mainwindow.cpython-36.pyc b/__pycache__/mainwindow.cpython-36.pyc
new file mode 100644
index 0000000..b21f7d7
Binary files /dev/null and b/__pycache__/mainwindow.cpython-36.pyc differ
diff --git a/__pycache__/source_rc.cpython-36.pyc b/__pycache__/source_rc.cpython-36.pyc
new file mode 100644
index 0000000..cd6cb45
Binary files /dev/null and b/__pycache__/source_rc.cpython-36.pyc differ
diff --git a/app.py b/app.py
index 28d8552..d8bffdf 100644
--- a/app.py
+++ b/app.py
@@ -9,6 +9,12 @@ import json, requests, os, random, pyperclip, traceback, vk_api
history_requests = list()
request_status = list()
+history_responses = list()
+
+try:
+ os.mkdir('saves');
+except Exception as exc:
+ pass
def genToken(lenght=32, dictonary='0123456789abcdef'):
@@ -43,7 +49,12 @@ class callback_server(Thread):
}
request_status.append(0)
history_requests.append(r_body)
+ history_responses.append('Ждём ответа от сервера...
')
r = requests.post(server_url, json=r_body)
+ try:
+ history_responses[history_requests.index(r_body)] = r.text
+ except:
+ history_responses[history_requests.index(r_body)] = f"Ошибка сервера: {r.statusCode}
"
if r.text != ret_str:
request_status[history_requests.index(r_body)] = -1
exc = callback_clientException('Invalid response code')
@@ -83,8 +94,14 @@ class callback_server(Thread):
}
request_status.append(0)
history_requests.append(r_body)
+ history_responses.append('Ждём ответа от сервера...
')
try:
r = requests.post(self.server_url, json=r_body)
+ try:
+ history_responses[history_requests.index(r_body)] = r.text
+ except:
+ history_responses[history_requests.index(r_body)] = f"Ошибка сервера: {r.statusCode}
"
+
if r.text != 'ok':
request_status[history_requests.index(r_body)] = -1
else:
@@ -113,6 +130,18 @@ class app_win(QMainWindow):
self.ui.setupUi(self)
self.setMouseTracking(True)
self.callback_server = callback_server()
+
+ self.saves = list()
+
+ for root, dirs, files in os.walk('saves'):
+ for _dir in dirs:
+ files_in_dir = list()
+ for _root, _dirs, _files in os.walk(f"saves/{_dir}"):
+ for file in _files:
+ files_in_dir.append(file)
+ if ('group_id.txt' in files_in_dir) and ('ret_str.txt' in files_in_dir) and ('secret_key.txt' in files_in_dir) and ('server_url.txt' in files_in_dir) and ('token.txt' in files_in_dir):
+ self.saves.append(_dir)
+ self.ui.saveList.addItem(_dir)
# Other
retStr_file = open('ret_str.txt', 'r', encoding='utf-8')
@@ -154,6 +183,85 @@ class app_win(QMainWindow):
self.ui.copy_ret_str.clicked.connect(lambda: pyperclip.copy(self.ret_str))
self.ui.gen_ret_str.clicked.connect(self.generate_returnString)
self.ui.start.clicked.connect(self.connect_callback)
+ self.ui.new_saveButton.clicked.connect(self.new_saveSession)
+ self.ui.loadButton.clicked.connect(self.loadSession)
+ self.ui.saveButton.clicked.connect(self.saveSession)
+
+ def loadSession(self):
+ text = self.ui.saveList.currentText()
+ with open('group_id.txt', 'wb') as f:
+ with open(f"saves/{text}/group_id.txt", 'rb') as fs:
+ content = fs.read()
+ f.write(content)
+ self.ui.group_idInput.setText(content.decode("utf-8"))
+ with open('ret_str.txt', 'wb') as f:
+ with open(f"saves/{text}/ret_str.txt", 'rb') as fs:
+ content = fs.read()
+ f.write(content)
+ self.ui.ret_str.setText(f"Строка, которую должен вернуть сервер: {content.decode('utf-8')}")
+ with open('secret_key.txt', 'wb') as f:
+ with open(f"saves/{text}/secret_key.txt", 'rb') as fs:
+ content = fs.read()
+ f.write(content)
+ self.ui.secret_key.setText(content.decode('utf-8'))
+ with open('server_url.txt', 'wb') as f:
+ with open(f"saves/{text}/server_url.txt", 'rb') as fs:
+ content = fs.read()
+ f.write(content)
+ self.ui.server_url.setText(content.decode('utf-8'))
+ with open('token.txt', 'wb') as f:
+ with open(f"saves/{text}/token.txt", 'rb') as fs:
+ content = fs.read()
+ f.write(content)
+ self.ui.group_token.setText(content.decode('utf-8'))
+
+ def saveSession(self):
+ text = self.ui.saveList.currentText()
+ if True:
+ try:
+ with open('group_id.txt', 'rb') as f:
+ with open(f"saves/{text}/group_id.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('ret_str.txt', 'rb') as f:
+ with open(f"saves/{text}/ret_str.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('secret_key.txt', 'rb') as f:
+ with open(f"saves/{text}/secret_key.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('server_url.txt', 'rb') as f:
+ with open(f"saves/{text}/server_url.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('token.txt', 'rb') as f:
+ with open(f"saves/{text}/token.txt", 'wb') as fs:
+ fs.write(f.read())
+ except Exception as exc:
+ pass
+
+ def new_saveSession(self):
+ text, ok = QInputDialog.getText(self, 'Сохранить сессию', 'Введите имя сессии:')
+ if ok and not(text in self.saves):
+ try:
+ os.mkdir(f"saves/{text}")
+ with open('group_id.txt', 'rb') as f:
+ with open(f"saves/{text}/group_id.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('ret_str.txt', 'rb') as f:
+ with open(f"saves/{text}/ret_str.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('secret_key.txt', 'rb') as f:
+ with open(f"saves/{text}/secret_key.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('server_url.txt', 'rb') as f:
+ with open(f"saves/{text}/server_url.txt", 'wb') as fs:
+ fs.write(f.read())
+ with open('token.txt', 'rb') as f:
+ with open(f"saves/{text}/token.txt", 'wb') as fs:
+ fs.write(f.read())
+
+ self.saves.append(text)
+ self.ui.saveList.addItem(text)
+ except Exception as exc:
+ pass
def update_info_requests(self):
global history_requests, request_status
@@ -173,6 +281,8 @@ class app_win(QMainWindow):
def qTimer_void(self):
global history_requests, request_status
+ self.ui.loadButton.setEnabled(len(self.saves) > 0)
+ self.ui.saveButton.setEnabled(len(self.saves) > 0)
self.ui.start.setEnabled(bool(self.ui.server_url.text()) and bool(self.ui.group_idInput.text()) and bool(self.ui.group_token.text()) and not(self.connected))
if self.parsed_requests != history_requests or self.parsed_responses != request_status:
self.update_info_requests()
@@ -184,6 +294,7 @@ class app_win(QMainWindow):
if self.json_code_view != JSON_CONTENT:
self.json_code_view = JSON_CONTENT
self.ui.requestBody.setText(self.json_code_view)
+ self.ui.responseBody.setText(history_responses[self.ui.requestsWidget.currentRow()])
if self.ui.group_idInput.text() != filtrating_integer(self.ui.group_idInput.text()):
self.ui.group_idInput.setText(filtrating_integer(self.ui.group_idInput.text()))
diff --git a/main.ui b/main.ui
index ea4a56f..a37c17e 100644
--- a/main.ui
+++ b/main.ui
@@ -1,244 +1,341 @@
-
-
- Form
-
-
-
- 0
- 0
- 631
- 557
-
-
-
-
- 631
- 557
-
-
-
-
- 631
- 557
-
-
-
- Генератор callback запросов
-
-
-
-
- 10
- 10
- 601
- 151
-
-
-
- Информация о сервере
-
-
-
-
- 20
- 30
- 261
- 20
-
-
-
- url сервера
-
-
-
-
-
- 20
- 50
- 251
- 16
-
-
-
- Секретный ключ
-
-
-
-
-
- 20
- 70
- 261
- 20
-
-
-
- aaQ13axAPQEcczQa
-
-
-
-
-
- 290
- 30
- 301
- 41
-
-
-
- Строка, которую должен вернуть сервер: XXXXXXX
-
-
-
-
-
- 504
- 80
- 91
- 23
-
-
-
- PointingHandCursor
-
-
- Скопировать
-
-
-
-
-
- 410
- 80
- 91
- 23
-
-
-
- PointingHandCursor
-
-
- Сгенерировать
-
-
-
-
-
- 20
- 120
- 261
- 20
-
-
-
- QLineEdit::Password
-
-
- токен группы
-
-
-
-
-
- 20
- 100
- 261
- 20
-
-
-
- id группы
-
-
-
-
-
-
- 530
- 520
- 75
- 23
-
-
-
- PointingHandCursor
-
-
- Запуск
-
-
-
-
-
- 10
- 160
- 311
- 21
-
-
-
- <html><head/><body><p align="center">Запросы</p></body></html>
-
-
-
-
-
- 10
- 180
- 311
- 331
-
-
-
-
-
-
- 320
- 180
- 291
- 331
-
-
-
- IBeamCursor
-
-
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html>
-
-
-
-
-
- 320
- 160
- 291
- 21
-
-
-
- <html><head/><body><p align="center">Тело запроса</p></body></html>
-
-
-
-
-
- 406
- 520
- 121
- 21
-
-
-
- <html><head/><body><p><img src=":/response_codes/Sending.png"/> Сервер не запущен</p></body></html>
-
-
-
-
-
-
-
-
+
+
+ Form
+
+
+
+ 0
+ 0
+ 631
+ 557
+
+
+
+
+ 631
+ 557
+
+
+
+
+ 631
+ 557
+
+
+
+ Генератор callback запросов
+
+
+
+
+ 10
+ 10
+ 601
+ 151
+
+
+
+ Информация о сервере
+
+
+
+
+ 20
+ 30
+ 261
+ 20
+
+
+
+ url сервера
+
+
+
+
+
+ 20
+ 50
+ 251
+ 16
+
+
+
+ Секретный ключ
+
+
+
+
+
+ 20
+ 70
+ 261
+ 20
+
+
+
+ aaQ13axAPQEcczQa
+
+
+
+
+
+ 290
+ 30
+ 301
+ 21
+
+
+
+ Строка, которую должен вернуть сервер: XXXXXXX
+
+
+
+
+
+ 500
+ 60
+ 91
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Скопировать
+
+
+
+
+
+ 410
+ 60
+ 91
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Сгенерировать
+
+
+
+
+
+ 20
+ 120
+ 261
+ 20
+
+
+
+ QLineEdit::Password
+
+
+ токен группы
+
+
+
+
+
+ 20
+ 100
+ 261
+ 20
+
+
+
+ id группы
+
+
+
+
+
+ 290
+ 120
+ 131
+ 22
+
+
+
+
+
+ false
+
+
+
+ 520
+ 120
+ 71
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Загрузить
+
+
+
+
+
+ 420
+ 120
+ 101
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Сохранить как
+
+
+
+
+ false
+
+
+
+ 520
+ 100
+ 71
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Сохранить
+
+
+
+
+
+
+ 530
+ 520
+ 75
+ 23
+
+
+
+ PointingHandCursor
+
+
+ Запуск
+
+
+
+
+
+ 10
+ 160
+ 311
+ 21
+
+
+
+ <html><head/><body><p align="center">Запросы</p></body></html>
+
+
+
+
+
+ 10
+ 180
+ 311
+ 331
+
+
+
+
+
+
+ 320
+ 180
+ 291
+ 191
+
+
+
+ IBeamCursor
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html>
+
+
+
+
+
+ 320
+ 160
+ 291
+ 21
+
+
+
+ <html><head/><body><p align="center">Тело запроса</p></body></html>
+
+
+
+
+
+ 406
+ 520
+ 121
+ 21
+
+
+
+ <html><head/><body><p><img src=":/response_codes/Sending.png"/> Сервер не запущен</p></body></html>
+
+
+
+
+
+ 320
+ 370
+ 291
+ 21
+
+
+
+ <html><head/><body><p align="center">Ответ</p></body></html>
+
+
+
+
+
+ 320
+ 390
+ 291
+ 121
+
+
+
+ IBeamCursor
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html>
+
+
+
+
+
+
+
+
diff --git a/mainwindow.py b/mainwindow.py
index a805b8c..ff7bdc9 100644
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -1,95 +1,128 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'main.ui'
-#
-# Created by: PyQt5 UI code generator 5.15.2
-#
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
-# run again. Do not edit this file unless you know what you are doing.
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_Form(object):
- def setupUi(self, Form):
- Form.setObjectName("Form")
- Form.resize(631, 557)
- Form.setMinimumSize(QtCore.QSize(631, 557))
- Form.setMaximumSize(QtCore.QSize(631, 557))
- self.groupBox = QtWidgets.QGroupBox(Form)
- self.groupBox.setGeometry(QtCore.QRect(10, 10, 601, 151))
- self.groupBox.setObjectName("groupBox")
- self.server_url = QtWidgets.QLineEdit(self.groupBox)
- self.server_url.setGeometry(QtCore.QRect(20, 30, 261, 20))
- self.server_url.setObjectName("server_url")
- self.label = QtWidgets.QLabel(self.groupBox)
- self.label.setGeometry(QtCore.QRect(20, 50, 251, 16))
- self.label.setObjectName("label")
- self.secret_key = QtWidgets.QLineEdit(self.groupBox)
- self.secret_key.setGeometry(QtCore.QRect(20, 70, 261, 20))
- self.secret_key.setObjectName("secret_key")
- self.ret_str = QtWidgets.QLabel(self.groupBox)
- self.ret_str.setGeometry(QtCore.QRect(290, 30, 301, 41))
- self.ret_str.setObjectName("ret_str")
- self.copy_ret_str = QtWidgets.QPushButton(self.groupBox)
- self.copy_ret_str.setGeometry(QtCore.QRect(504, 80, 91, 23))
- self.copy_ret_str.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
- self.copy_ret_str.setObjectName("copy_ret_str")
- self.gen_ret_str = QtWidgets.QPushButton(self.groupBox)
- self.gen_ret_str.setGeometry(QtCore.QRect(410, 80, 91, 23))
- self.gen_ret_str.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
- self.gen_ret_str.setObjectName("gen_ret_str")
- self.group_token = QtWidgets.QLineEdit(self.groupBox)
- self.group_token.setGeometry(QtCore.QRect(20, 120, 261, 20))
- self.group_token.setEchoMode(QtWidgets.QLineEdit.Password)
- self.group_token.setObjectName("group_token")
- self.group_idInput = QtWidgets.QLineEdit(self.groupBox)
- self.group_idInput.setGeometry(QtCore.QRect(20, 100, 261, 20))
- self.group_idInput.setObjectName("group_idInput")
- self.start = QtWidgets.QPushButton(Form)
- self.start.setGeometry(QtCore.QRect(530, 520, 75, 23))
- self.start.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
- self.start.setObjectName("start")
- self.label_2 = QtWidgets.QLabel(Form)
- self.label_2.setGeometry(QtCore.QRect(10, 160, 311, 21))
- self.label_2.setObjectName("label_2")
- self.requestsWidget = QtWidgets.QListWidget(Form)
- self.requestsWidget.setGeometry(QtCore.QRect(10, 180, 311, 331))
- self.requestsWidget.setObjectName("requestsWidget")
- self.requestBody = QtWidgets.QTextBrowser(Form)
- self.requestBody.setGeometry(QtCore.QRect(320, 180, 291, 331))
- self.requestBody.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.IBeamCursor))
- self.requestBody.setObjectName("requestBody")
- self.label_3 = QtWidgets.QLabel(Form)
- self.label_3.setGeometry(QtCore.QRect(320, 160, 291, 21))
- self.label_3.setObjectName("label_3")
- self.work_status = QtWidgets.QLabel(Form)
- self.work_status.setGeometry(QtCore.QRect(406, 520, 121, 21))
- self.work_status.setObjectName("work_status")
-
- self.retranslateUi(Form)
- QtCore.QMetaObject.connectSlotsByName(Form)
-
- def retranslateUi(self, Form):
- _translate = QtCore.QCoreApplication.translate
- Form.setWindowTitle(_translate("Form", "Генератор callback запросов"))
- self.groupBox.setTitle(_translate("Form", "Информация о сервере"))
- self.server_url.setPlaceholderText(_translate("Form", "url сервера"))
- self.label.setText(_translate("Form", "Секретный ключ"))
- self.secret_key.setPlaceholderText(_translate("Form", "aaQ13axAPQEcczQa"))
- self.ret_str.setText(_translate("Form", "Строка, которую должен вернуть сервер: XXXXXXX"))
- self.copy_ret_str.setText(_translate("Form", "Скопировать"))
- self.gen_ret_str.setText(_translate("Form", "Сгенерировать"))
- self.group_token.setPlaceholderText(_translate("Form", "токен группы"))
- self.group_idInput.setPlaceholderText(_translate("Form", "id группы"))
- self.start.setText(_translate("Form", "Запуск"))
- self.label_2.setText(_translate("Form", "