Merge branch 'main' of https://github.com/MarkusJoe/QWeatherReporter

QWeather.py

@@ -6,39 +6,9 @@
 # @File Name: QWeather.py
 
 
-import threading
+import sys
 from core import qweather
-from tkinter import messagebox
-from lib.buildGUIClass import tk
-from lib.buildGUIClass import root
-from lib.buildGUIClass import Features
-
-
-def on_closing():
-    if messagebox.askokcancel('Exit', 'Confirm exit?'):
-        Features().quit_()
 
 
 if __name__ == '__main__':
-    b1 = tk.Button(root,
-                   text='Click to run QWeather',
-                   command=threading.Thread(target=qweather.main, name='main').start)
-    b1.place(x=45, y=300)
-    b2 = tk.Button(root,
-                   text='Exit the main program',
-                   command=on_closing)
-    b2.place(x=275, y=300)
-    l1 = tk.Label(root,
-                  text='更多功能敬请期待\nEnjoy this ~',)
-    l1.place(x=530, y=70)
-    information = """
-    已知问题:
-    1.开启QWeather主程序后退出只会退出界面主程序并不会退出
-    2.webservice.py 的输出并不会被插入到GUI界面里
-    * 更多问题待发现...
-    """
-    l2 = tk.Label(root,
-                  text=information)
-    l2.place(x=140, y=350)
-    root.protocol('WM_DELETE_WINDOW', on_closing)
-    root.mainloop()
+    sys.exit(qweather.main())

README.md

@@ -1,7 +1,7 @@
 <p align="center">
     <a href="https://github.com/MarkusJoe/QWeather">
         <img src="https://img.shields.io/badge/Python-3.10.x-blue.svg" alt="PythonVersion">
-        <img src="https://img.shields.io/badge/release-4.0.0-green.svg" alt="QWeatherVersion">
+        <img src="https://img.shields.io/badge/release-3.2.3-green.svg" alt="QWeatherVersion">
         <img src="https://img.shields.io/badge/LINCESE-Apache2.0-orange.svg" alt="LICENSE">
     </a>
 </p>
@@ -13,17 +13,8 @@
 <i style="text-align: center;"><a href="https://www.qweather.com/">QWeather Official Website</a></i>\
 <i style="text-align: center;"><a href="https://dev.qweather.com/">QWeather Development Platform</a></i>
 
-> GUI问题: 无法填写城市位置, 清手动打开./res/china_city_list.xlsx 进行手动查询  
-> 并填写至`requests-settings` > `location`  
-> `only-view-settings` > `city-name` 也需手动填写 
-
 </div>
 
-<div align="center">
-<b><i>当前分支: GUI, 为界面分支, 仍存在bug以及一些问题<br></i></b>
-<b><i>当前分支版本为重构后的版本重构前版本请在before分支中查看<br>(重构前版本不再更新,最新版本为v2.9.0)</i></b><br>
-<b><i><a href="https://markusjoe.github.io/" target="_blank">点击跳转到帮助文档</a></i></b>
-</div>
 
 ## 声明
 - > 程序作者: **RTAkland (markushammered@gmail.com)**
@@ -42,7 +33,6 @@
 - [x] 在网页上快速查看天气
 - [x] 在邮件html内附带一句一言 
 - [ ] ~~推送到QQ(咕咕咕)~~
-- [x] GUI界面 (无法填写城市位置, 清手动打开./res/china_city_list.xlsx 进行手动查询)
 
 ### 问题汇总
 #### Python 版本:

config.yml

@@ -110,9 +110,6 @@ client-settings:
  # 可选: "True" "False"
   SSL: True
 
-# [必填/只能一个] enable GUI or disable GUI
-  enable-GUI: True
-
 
 # [标识/不填] 仅作用户读取标识
 only-view-settings:

core/qweather.py

@@ -6,7 +6,6 @@
 # @File Name: qweather.py
 
 
-import os
 import sys
 import time
 import argparse
@@ -17,12 +16,10 @@ from core.settings import change_settings
 from core.read_config import read_config
 from core.sendmail import Mail
 from lib.webservice import accept_requests
-from lib.buildGUIClass import InsertLog
 
 language = Language()
 settings = read_config()
 processes = ProcessPoolExecutor(max_workers=3)
-gui_log = InsertLog()
 
 
 def check_time():
@@ -41,10 +38,7 @@ def check_time():
                 if local_time in time_list:
                     Mail().dev_version()
                     Logger.info(f'{language["mail_succeed"]}')
-                    gui_log.insert(f'{language["wait_seconds"]}')
                     Logger.info(f'{language["wait_seconds"]}')
-                    gui_log.insert(f'{language["mail_succeed"]}')
-
                     time.sleep(60)
         case 'free':
             while True:
@@ -53,9 +47,7 @@ def check_time():
                 if local_time in time_list:
                     Mail().free_version()
                     Logger.info(f'{language["mail_succeed"]}')
-                    gui_log.insert(f'{language["wait_seconds"]}')
                     Logger.info(f'{language["wait_seconds"]}')
-                    gui_log.insert(f'{language["mail_succeed"]}')
                     time.sleep(60)
 
 
@@ -97,13 +89,9 @@ def main():
     """
 
     Logger.info(f'{language["statement_1"]}')
-    gui_log.insert(f'{language["statement_1"]}')
     Logger.info(f'{language["statement_2"]}')
-    gui_log.insert(f'{language["statement_2"]}')
     Logger.info(f'{language["statement_3"]}')
-    gui_log.insert(f'{language["statement_3"]}')
     Logger.info(f'{language["statement_4"]}')
-    gui_log.insert(f'{language["statement_4"]}')
 
     parser = argparse.ArgumentParser()
     arg_keywords = ['free', 'dev', 'warning', 'setting']
@@ -117,22 +105,18 @@ def main():
         case 'free':
             Mail().free_version()
             Logger.debug(f'{language["debug_done"]}')
-            gui_log.insert(f'{language["debug_done"]}')
             sys.exit(0)
         case 'dev':
             Mail().dev_version()
             Logger.debug(f'{language["debug_done"]}')
-            gui_log.insert(f'{language["debug_done"]}')
             sys.exit(0)
         case 'warning':
             Mail().warning_()
             Logger.debug(f'{language["debug_done"]}')
-            gui_log.insert(f'{language["debug_done"]}')
             sys.exit(0)
         case 'setting':
             change_settings()
             Logger.debug(f'{language["debug_done"]}')
-            gui_log.insert(f'{language["debug_done"]}')
         case _:
             if check_config():
                 setting()
@@ -142,8 +126,7 @@ def main():
     processes.submit(check_time)
     if settings[2]['webservice']:
         Logger.info(f'{language["webservice_ip"]}:127.0.0.1:7898')
-        gui_log.insert(f'{language["webservice_ip"]}:127.0.0.1:7898')
-        processes.submit(accept_requests)
+        processes.submit(accept_requests())
 
     time_count = 0
     while True:

core/read_config.py

@@ -14,7 +14,7 @@ def read_config():
     :return: mail-settings, request-settings, client-settings, only-view-settings --> 0, 1, 2, 3
     """
     config_file = 'config.yml'
-    with open(f'./{config_file}', 'r') as conf:
+    with open(f'./{config_file}', 'r', encoding='utf-8') as conf:
         config = YAML().load(conf.read())
         mail_settings = config['mail-settings']
         request_settings = config['request-settings']

core/read_excel.py

@@ -8,9 +8,6 @@
 import pandas
 from core.logger import Logger
 from core.language import Language
-from lib.buildGUIClass import InsertLog
-
-gui_log = InsertLog()
 
 
 def read_excel(kw: str):
@@ -24,14 +21,12 @@ def read_excel(kw: str):
     index_count = 0
     city_list = []
     Logger.info(f'[Search]{language["reading_the_file"]}')
-    gui_log.insert(f'[Search]{language["reading_the_file"]}')
     df = pandas.read_excel(f'./res/china_city_list.xlsx')
     pandas.set_option('max_rows', None)  # 读取xlsx文件不折叠
     data_records = df.to_dict(orient='split')
     for i in data_records['data']:
         if kw in str(i):
             Logger.info(f' {index_count} | {i[2]}-{i[4]}-{i[6]}')
-            gui_log.insert(f' {index_count} | {i[2]}-{i[4]}-{i[6]}')
             city = [index_count, i[0], i[1], i[2], i[3], i[4], i[5], i[6], i[7], i[8], i[9]]
             index_count += 1
             city_list.append(city)

core/sendmail.py

@@ -17,9 +17,6 @@ from core.language import Language
 from core.information import WeatherInfo
 from core.read_config import read_config
 from lib.hitokoto import hitokoto
-from lib.buildGUIClass import InsertLog
-
-gui_log = InsertLog()
 
 
 class Mail:
@@ -212,10 +209,8 @@ class Mail:
             self.smtp.login(self.sender, self.password)  # 登录
             self.smtp.sendmail(self.sender, self.receiver, self.message.as_string())  # 发送
             Logger.info(f'{self.language["mail_succeed"]}')
-            gui_log.insert(f'{self.language["mail_succeed"]}')
         except smtplib.SMTPException as e:  # 处理错误
             Logger.critical(f'{self.language["mail_error"]}: {e}')
-            gui_log.insert(f'{self.language["mail_error"]}: {e}')
             sys.exit(1)
 
     def free_version(self):
@@ -361,10 +356,8 @@ class Mail:
             self.smtp.login(self.sender, self.password)  # 登录
             self.smtp.sendmail(self.sender, self.receiver, self.message.as_string())  # 发送
             Logger.info(f'{self.language["mail_succeed"]}')
-            Logger.info(f'{self.language["mail_succeed"]}')
         except smtplib.SMTPException as e:  # 处理错误
             Logger.critical(f'{self.language["mail_error"]}: {e}')
-            gui_log.insert(f'{self.language["mail_error"]}: {e}')
             sys.exit(1)
 
     def warning_(self):
@@ -386,14 +379,11 @@ class Mail:
             case 'update':
                 status = '预警更新'
                 Logger.info(f'{self.language["new_warning"]}')
-                gui_log.insert(f'{self.language["new_warning"]}')
             case 'active':
                 status = '已有灾害'
                 Logger.info(f'{self.language["warning_updated"]}')
-                gui_log.insert(f'{self.language["warning_updated"]}')
             case 'cancel':
                 Logger.info(f'{self.language["warning_canceled"]}')
-                gui_log.insert(f'{self.language["warning_canceled"]}')
 
         mail_html = f"""
                     <!DOCTYPE html>
@@ -444,8 +434,6 @@ class Mail:
                 self.smtp.login(self.sender, self.password)  # 登录
                 self.smtp.sendmail(self.sender, self.receiver, self.message.as_string())  # 发送
                 Logger.info(f'{self.language["mail_succeed"]}')
-                gui_log.insert(f'{self.language["mail_succeed"]}')
         except smtplib.SMTPException as e:  # 处理错误
             Logger.critical(f'{self.language["mail_error"]}: {e}')
-            gui_log.insert(f'{self.language["mail_error"]}: {e}')
             sys.exit(1)

core/settings.py

@@ -11,13 +11,7 @@ import getpass
 from core.logger import Logger
 from core.language import Language
 from core.read_excel import read_excel
-from core.read_config import read_config
 from ruamel.yaml import YAML
-from lib.buildGUIClass import InsertLog
-from lib.buildGUIClass import var_command
-
-gui_log = InsertLog()
-gui = read_config()[2]['enable-GUI']
 
 
 def change_settings():
@@ -28,11 +22,8 @@ def change_settings():
     language = Language()
 
     Logger.info(f'[Modify]{language["change_setting"]}')
-    gui_log.insert(f'[Modify]{language["change_setting"]}')
     Logger.info(f'[Modify]{language["fill_the_config"]}')
-    gui_log.insert(f'[Modify]{language["fill_the_config"]}')
     Logger.info(f'[Modify]{language["input_a_city_name"]}')
-    gui_log.insert(f'[Modify]{language["input_a_city_name"]}')
     while True:
         time.sleep(0.3)
         city_name = input('-->')
@@ -47,24 +38,17 @@ def change_settings():
                 break
     searched_city = read_excel(city_name)
     Logger.info(f'[Modify]{language["user_input"]}:[{city_name}]')
-    gui_log.insert(f'[Modify]{language["user_input"]}:[{city_name}]')
     Logger.info(f'[Modify]{language["select_a_index"]}')
-    gui_log.insert(f'[Modify]{language["select_a_index"]}')
     if not searched_city:
         Logger.error(f'[Modify]{language["no_result"]}')
-        gui_log.insert(f'[Modify]{language["no_result"]}')
         sys.exit(1)
     time.sleep(0.3)
     while True:
         try:
             time.sleep(0.3)
-            # if not gui:
             user_input = input('-->')
-            # else:
-            #     user_input = var_command.get()
             if user_input == 'q':
                 Logger.info(f'[Exit]{language["exit"]}')
-                gui_log.insert(f'[Exit]{language["exit"]}')
                 sys.exit(1)
             index = searched_city[int(user_input)]
             with open('./config.yml', 'r', encoding='utf-8') as of:
@@ -76,15 +60,11 @@ def change_settings():
             with open('./config.yml', 'w', encoding='utf-8') as wf:
                 YAML().dump(data, wf)
             Logger.info(f'[Write]{language["write_successfully"]}:config.yml')
-            gui_log.insert(f'[Write]{language["write_successfully"]}:config.yml')
             break
         except (IndexError, ValueError) as e:
             Logger.info(e)
-            gui_log.insert(e)
             Logger.error(f'[Write]{language["input_type_error"]}')
-            gui_log.insert(f'[Write]{language["input_type_error"]}')
             continue
         finally:
             Logger.info(f'[Exit]{language["exit"]}')
-            gui_log.insert(f'[Exit]{language["exit"]}')
             sys.exit(0)

lib/buildGUIClass.py

@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-# -- coding:utf-8 --
-# @Author: markushammered@gmail.com
-# @Development Tool: PyCharm
-# @Create Time: 2022/1/9
-# @File Name: buildGUIClass.py
-import tkinter
-import tkinter as tk
-
-root = tk.Tk()
-root.title('QWeather client')
-sw = root.winfo_screenwidth()
-sh = root.winfo_screenheight()
-ww = 700
-wh = 490
-x = (sw - ww) / 2
-y = (sh - wh) / 2
-root.geometry("%dx%d+%d+%d" % (ww, wh, x, y))
-root.minsize(700, 490)
-root.maxsize(700, 490)
-
-log_label = tk.Label(root, text='Log information')
-log_label.place(x=170, y=4)
-log_text = tk.Text(root, width=55, height=15)
-log_text.place(x=30, y=30)
-var_command = tk.StringVar()
-
-
-class InsertLog:
-    def __init__(self):
-        self.log_text = log_text
-
-    def insert(self, msg: str):
-        """
-        insert the information to gui(Text)
-        :param msg: information
-        :return:
-        """
-        if '\n' not in msg:
-            msg = msg + '\n'
-        self.log_text.configure(state=tkinter.NORMAL)  # writable
-        self.log_text.insert('insert', msg)  # insert information
-        self.log_text.configure(state=tkinter.DISABLED)  # readable
-
-
-class Features:
-    def __init__(self):
-        self.root = root
-        self.tk = tk
-        self.log_text = log_text
-
-    def quit_(self):
-        """
-        quit gui
-        :return:
-        """
-        self.root.destroy()
-        self.root.quit()

lib/webservice.py

@@ -12,9 +12,6 @@ from core.logger import Logger
 from core.read_config import read_config
 from core.information import WeatherInfo
 from core.language import Language
-from lib.buildGUIClass import InsertLog
-
-gui_log = InsertLog()
 
 try:
     server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -23,7 +20,6 @@ try:
     server.listen(5)
 except OSError as e:
     Logger.critical(e)
-    gui_log.insert(e)
 
 language = Language()
 
@@ -316,19 +312,16 @@ def process_requests(c, a):
             c.send('HTTP/1.1 200 OK\r\n\r\n'.encode('utf-8'))
             c.send(html.encode('utf-8'))
             Logger.info(f'{language["get_resource"]} {data} {language["get_resource_from"]} {a[0]}:{a[1]}')
-            gui_log.insert(f'{language["get_resource"]} {data} {language["get_resource_from"]} {a[0]}:{a[1]}')
         try:
             with open(f'./{data}', 'rb') as f:
                 c.send('HTTP/1.1 200 OK\r\n\r\n'.encode('utf-8'))
                 c.send(f.read())
                 Logger.info(f'{language["get_resource"]} {data} {language["get_resource_from"]} {a[0]}:{a[1]}')
-                gui_log.insert(f'{language["get_resource"]} {data} {language["get_resource_from"]} {a[0]}:{a[1]}')
         except FileNotFoundError:
             with open('./res/basic-resources/404.html', 'r') as not_found:
                 c.send(f'HTTP/1.1 404 Not Found\r\n\r\n{not_found.read()}'.encode('utf-8'))
     except BrokenPipeError:
         Logger.error(f'{language["connection_speed_too_fast"]}')
-        gui_log.insert(f'{language["connection_speed_too_fast"]}')
     finally:
         c.close()
         return

requirements.txt

@@ -1,5 +1,5 @@
 requests>=2.26.0
 ruamel.yaml>=0.17.17
-pandas>=1.3.4
+pandas==1.3.4
 colorlog>=6.5.0
 openpyxl>=3.0.9