JDM170/shikimori_list_viewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update .gitignore, error & warning fixes

Browse Source 
Signed-off-by: Lev Rusanov <30170278+JDM170@users.noreply.github.com>
This commit is contained in:
Lev Rusanov
2024-05-08 23:17:21 +07:00
parent 2dcbc44412
commit f8b2e11392
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
.idea
__pycache__ __pycache__
venv venv
main.py main.py

17
main_window.py
View File

@@ -5,11 +5,11 @@ from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
QMainWindow, QListWidgetItem, QFileDialog, QMessageBox QMainWindow, QListWidgetItem, QFileDialog, QMessageBox
) )
from jsonIO import jsonIO from jsonIO import jsonIO
from main import Ui_MainWindow from main import Ui_MainWindow
from search_dialog import SearchDialog from search_dialog import SearchDialog
statuses = { statuses = {
"none": "", "none": "",
"planned": "Запланировано", "planned": "Запланировано",
@@ -30,9 +30,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# self.file_list = jsonIO.load_json("JDM17_animes.json") # self.file_list = jsonIO.load_json("JDM17_animes.json")
# for data in self.file_list: # for data in self.file_list:
# item = QListWidgetItem(data["target_title_ru"]) # item = QListWidgetItem(data["target_title_ru"])
# item.setData(1, data["target_id"]) # item.setData(1, data["target_id"])
# self.ui.anime_list.addItem(item) # self.ui.anime_list.addItem(item)
self.file_path = "" self.file_path = ""
self.file_list = [] self.file_list = []
@@ -117,7 +117,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
item_id = item.data(1) item_id = item.data(1)
if not self.check_changes(item_id): if not self.check_changes(item_id):
return return
if (ask_save and self.show_question("Подтверждение", "Сохранить изменения?")) or ask_save == False: if (ask_save and self.show_question("Подтверждение", "Сохранить изменения?")) or ask_save is False:
self.save_changes(item_id) self.save_changes(item_id)
def show_title_info(self, current, previous): def show_title_info(self, current, previous):
@@ -217,10 +217,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.file_list.remove(data) self.file_list.remove(data)
QMessageBox.information(self, "Успешно", "Тайтл '{}' успешно удален из списка!".format(title_name)) QMessageBox.information(self, "Успешно", "Тайтл '{}' успешно удален из списка!".format(title_name))
def returnNewTitle(self, title_data): def return_new_title(self, title_data):
# print(title_data) # print(title_data)
# if self.find_title(title_data["target_id"]): # if self.find_title(title_data["target_id"]):
# QMessageBox.critical(self, "Ошибка", "Данный тайтл уже есть в списке!") # QMessageBox.critical(self, "Ошибка", "Данный тайтл уже есть в списке!")
# return # return
pass pass

16
search_dialog.py
View File

@@ -2,12 +2,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QDialog from PyQt5.QtWidgets import QDialog, QMessageBox, QListWidgetItem
from search import Ui_SearchDialog
from jsonIO import jsonIO
from requests import post, get from requests import post, get
from urllib.parse import urlencode
from jsonIO import jsonIO
from search import Ui_SearchDialog
header = { header = {
"User-Agent": "", "User-Agent": "",
@@ -18,7 +17,7 @@ tokens_filename = "tokens.json"
class SearchDialog(QDialog, Ui_SearchDialog): class SearchDialog(QDialog, Ui_SearchDialog):
def __init__(self, parent=None): def __init__(self, parent=None):
QDialog.__init__(self, parent, flags=Qt.Window) QDialog.__init__(self, parent, flags=(Qt.Window | Qt.WindowTitleHint | Qt.WindowCloseButtonHint))
Ui_SearchDialog.__init__(self) Ui_SearchDialog.__init__(self)
self.ui = Ui_SearchDialog() self.ui = Ui_SearchDialog()
self.ui.setupUi(self) self.ui.setupUi(self)
@@ -35,13 +34,15 @@ class SearchDialog(QDialog, Ui_SearchDialog):
"access_token": "", "access_token": "",
"refresh_token": "" "refresh_token": ""
}) })
QMessageBox.critical(self, "Ошибка", "Заполните 'tokens.json' своими данными чтобы поиск работал корректно!") QMessageBox.critical(self, "Ошибка", "Заполните 'tokens.json' своими данными чтобы поиск работал "
"корректно!")
self.close() self.close()
else: else:
self.tokens = jsonIO.load_json(tokens_filename) self.tokens = jsonIO.load_json(tokens_filename)
for key, value in self.tokens.items(): for key, value in self.tokens.items():
if (key != "access_token" or key != "refresh_token") and value == "": if (key != "access_token" or key != "refresh_token") and value == "":
QMessageBox.critical(self, "Ошибка", "Заполните 'tokens.json' своими данными чтобы поиск работал корректно!") QMessageBox.critical(self, "Ошибка", "Заполните 'tokens.json' своими данными чтобы поиск работал "
"корректно!")
self.close() self.close()
if self.tokens["access_token"] == "": if self.tokens["access_token"] == "":
self.get_new_access_token() self.get_new_access_token()
@@ -109,4 +110,3 @@ class SearchDialog(QDialog, Ui_SearchDialog):
item.setText(data["name"]) item.setText(data["name"])
item.setData(1, data["id"]) item.setData(1, data["id"])
self.ui.search_list.addItem(item) self.ui.search_list.addItem(item)