From 3c019ad98c840c2a3affc95f391cb131229c862d Mon Sep 17 00:00:00 2001 From: RTAkland Date: Wed, 15 Dec 2021 21:21:39 +0800 Subject: [PATCH] feat: Logger --- core/__init__.py | 6 +++ core/checktime.py | 6 +++ core/information.py | 6 +++ core/logger.py | 38 ++++++++++++++++++ core/qweather.py | 6 +++ core/read_excel.py | 6 +++ core/settings.py | 6 +++ core/test.py | 6 +++ {resource => res}/basic-resources/sunrise.png | Bin {resource => res}/basic-resources/sunset.png | Bin {resource => res}/china_city_list.xlsx | Bin {resource => res}/icons/100.png | Bin {resource => res}/icons/1001.png | Bin {resource => res}/icons/1002.png | Bin {resource => res}/icons/1003.png | Bin {resource => res}/icons/1004.png | Bin {resource => res}/icons/1005.png | Bin {resource => res}/icons/1006.png | Bin {resource => res}/icons/1007.png | Bin {resource => res}/icons/1008.png | Bin {resource => res}/icons/1009.png | Bin {resource => res}/icons/101.png | Bin {resource => res}/icons/1010.png | Bin {resource => res}/icons/1011.png | Bin {resource => res}/icons/1012.png | Bin {resource => res}/icons/1013.png | Bin {resource => res}/icons/1014.png | Bin {resource => res}/icons/1015.png | Bin {resource => res}/icons/1016.png | Bin {resource => res}/icons/1017.png | Bin {resource => res}/icons/1018.png | Bin {resource => res}/icons/1019.png | Bin {resource => res}/icons/102.png | Bin {resource => res}/icons/1020.png | Bin {resource => res}/icons/1021.png | Bin {resource => res}/icons/1022.png | Bin {resource => res}/icons/1023.png | Bin {resource => res}/icons/1024.png | Bin {resource => res}/icons/1025.png | Bin {resource => res}/icons/1026.png | Bin {resource => res}/icons/1027.png | Bin {resource => res}/icons/1028.png | Bin {resource => res}/icons/1029.png | Bin {resource => res}/icons/103.png | Bin {resource => res}/icons/1030.png | Bin {resource => res}/icons/1031.png | Bin {resource => res}/icons/1032.png | Bin {resource => res}/icons/1033.png | Bin {resource => res}/icons/1034.png | Bin {resource => res}/icons/1035.png | Bin {resource => res}/icons/1036.png | Bin {resource => res}/icons/1037.png | Bin {resource => res}/icons/1038.png | Bin {resource => res}/icons/1039.png | Bin {resource => res}/icons/104.png | Bin {resource => res}/icons/1040.png | Bin {resource => res}/icons/1041.png | Bin {resource => res}/icons/1042.png | Bin {resource => res}/icons/1043.png | Bin {resource => res}/icons/1044.png | Bin {resource => res}/icons/1045.png | Bin {resource => res}/icons/1046.png | Bin {resource => res}/icons/1047.png | Bin {resource => res}/icons/1048.png | Bin {resource => res}/icons/1049.png | Bin {resource => res}/icons/1050.png | Bin {resource => res}/icons/1051.png | Bin {resource => res}/icons/1052.png | Bin {resource => res}/icons/1053.png | Bin {resource => res}/icons/1054.png | Bin {resource => res}/icons/1055.png | Bin {resource => res}/icons/1056.png | Bin {resource => res}/icons/1057.png | Bin {resource => res}/icons/1058.png | Bin {resource => res}/icons/1059.png | Bin {resource => res}/icons/1061.png | Bin {resource => res}/icons/1064.png | Bin {resource => res}/icons/1101.png | Bin {resource => res}/icons/1302.png | Bin {resource => res}/icons/1402.png | Bin {resource => res}/icons/150.png | Bin {resource => res}/icons/151.png | Bin {resource => res}/icons/152.png | Bin {resource => res}/icons/153.png | Bin {resource => res}/icons/1601.png | Bin {resource => res}/icons/1602.png | Bin {resource => res}/icons/1603.png | Bin {resource => res}/icons/1604.png | Bin {resource => res}/icons/1605.png | Bin {resource => res}/icons/1606.png | Bin {resource => res}/icons/1607.png | Bin {resource => res}/icons/2001.png | Bin {resource => res}/icons/2002.png | Bin {resource => res}/icons/2003.png | Bin {resource => res}/icons/2004.png | Bin {resource => res}/icons/2005.png | Bin {resource => res}/icons/2006.png | Bin {resource => res}/icons/2007.png | Bin {resource => res}/icons/2008.png | Bin {resource => res}/icons/2009.png | Bin {resource => res}/icons/2010.png | Bin {resource => res}/icons/2011.png | Bin {resource => res}/icons/2012.png | Bin {resource => res}/icons/2013.png | Bin {resource => res}/icons/2014.png | Bin {resource => res}/icons/2015.png | Bin {resource => res}/icons/2016.png | Bin {resource => res}/icons/2017.png | Bin {resource => res}/icons/2018.png | Bin {resource => res}/icons/300.png | Bin {resource => res}/icons/301.png | Bin {resource => res}/icons/302.png | Bin {resource => res}/icons/303.png | Bin {resource => res}/icons/304.png | Bin {resource => res}/icons/305.png | Bin {resource => res}/icons/306.png | Bin {resource => res}/icons/307.png | Bin {resource => res}/icons/308.png | Bin {resource => res}/icons/309.png | Bin {resource => res}/icons/310.png | Bin {resource => res}/icons/311.png | Bin {resource => res}/icons/312.png | Bin {resource => res}/icons/313.png | Bin {resource => res}/icons/314.png | Bin {resource => res}/icons/315.png | Bin {resource => res}/icons/316.png | Bin {resource => res}/icons/317.png | Bin {resource => res}/icons/318.png | Bin {resource => res}/icons/350.png | Bin {resource => res}/icons/351.png | Bin {resource => res}/icons/399.png | Bin {resource => res}/icons/400.png | Bin {resource => res}/icons/401.png | Bin {resource => res}/icons/402.png | Bin {resource => res}/icons/403.png | Bin {resource => res}/icons/404.png | Bin {resource => res}/icons/405.png | Bin {resource => res}/icons/406.png | Bin {resource => res}/icons/407.png | Bin {resource => res}/icons/408.png | Bin {resource => res}/icons/409.png | Bin {resource => res}/icons/410.png | Bin {resource => res}/icons/456.png | Bin {resource => res}/icons/457.png | Bin {resource => res}/icons/499.png | Bin {resource => res}/icons/500.png | Bin {resource => res}/icons/501.png | Bin {resource => res}/icons/502.png | Bin {resource => res}/icons/503.png | Bin {resource => res}/icons/504.png | Bin {resource => res}/icons/507.png | Bin {resource => res}/icons/508.png | Bin {resource => res}/icons/509.png | Bin {resource => res}/icons/510.png | Bin {resource => res}/icons/511.png | Bin {resource => res}/icons/512.png | Bin {resource => res}/icons/513.png | Bin {resource => res}/icons/514.png | Bin {resource => res}/icons/515.png | Bin {resource => res}/icons/800.png | Bin {resource => res}/icons/801.png | Bin {resource => res}/icons/802.png | Bin {resource => res}/icons/803.png | Bin {resource => res}/icons/804.png | Bin {resource => res}/icons/805.png | Bin {resource => res}/icons/806.png | Bin {resource => res}/icons/807.png | Bin {resource => res}/icons/900.png | Bin {resource => res}/icons/901.png | Bin {resource => res}/icons/999.png | Bin {resource => res}/icons/9999.png | Bin {resource => res}/icons/convert.py | 0 {resource => res}/lang/en_us.json | 0 {resource => res}/lang/zh_cn.json | 0 test.py | 6 +++ tests/s.py | 6 +++ 176 files changed, 92 insertions(+) create mode 100644 core/__init__.py create mode 100644 core/checktime.py create mode 100644 core/information.py create mode 100644 core/logger.py create mode 100644 core/qweather.py create mode 100644 core/read_excel.py create mode 100644 core/settings.py create mode 100644 core/test.py rename {resource => res}/basic-resources/sunrise.png (100%) rename {resource => res}/basic-resources/sunset.png (100%) rename {resource => res}/china_city_list.xlsx (100%) rename {resource => res}/icons/100.png (100%) rename {resource => res}/icons/1001.png (100%) rename {resource => res}/icons/1002.png (100%) rename {resource => res}/icons/1003.png (100%) rename {resource => res}/icons/1004.png (100%) rename {resource => res}/icons/1005.png (100%) rename {resource => res}/icons/1006.png (100%) rename {resource => res}/icons/1007.png (100%) rename {resource => res}/icons/1008.png (100%) rename {resource => res}/icons/1009.png (100%) rename {resource => res}/icons/101.png (100%) rename {resource => res}/icons/1010.png (100%) rename {resource => res}/icons/1011.png (100%) rename {resource => res}/icons/1012.png (100%) rename {resource => res}/icons/1013.png (100%) rename {resource => res}/icons/1014.png (100%) rename {resource => res}/icons/1015.png (100%) rename {resource => res}/icons/1016.png (100%) rename {resource => res}/icons/1017.png (100%) rename {resource => res}/icons/1018.png (100%) rename {resource => res}/icons/1019.png (100%) rename {resource => res}/icons/102.png (100%) rename {resource => res}/icons/1020.png (100%) rename {resource => res}/icons/1021.png (100%) rename {resource => res}/icons/1022.png (100%) rename {resource => res}/icons/1023.png (100%) rename {resource => res}/icons/1024.png (100%) rename {resource => res}/icons/1025.png (100%) rename {resource => res}/icons/1026.png (100%) rename {resource => res}/icons/1027.png (100%) rename {resource => res}/icons/1028.png (100%) rename {resource => res}/icons/1029.png (100%) rename {resource => res}/icons/103.png (100%) rename {resource => res}/icons/1030.png (100%) rename {resource => res}/icons/1031.png (100%) rename {resource => res}/icons/1032.png (100%) rename {resource => res}/icons/1033.png (100%) rename {resource => res}/icons/1034.png (100%) rename {resource => res}/icons/1035.png (100%) rename {resource => res}/icons/1036.png (100%) rename {resource => res}/icons/1037.png (100%) rename {resource => res}/icons/1038.png (100%) rename {resource => res}/icons/1039.png (100%) rename {resource => res}/icons/104.png (100%) rename {resource => res}/icons/1040.png (100%) rename {resource => res}/icons/1041.png (100%) rename {resource => res}/icons/1042.png (100%) rename {resource => res}/icons/1043.png (100%) rename {resource => res}/icons/1044.png (100%) rename {resource => res}/icons/1045.png (100%) rename {resource => res}/icons/1046.png (100%) rename {resource => res}/icons/1047.png (100%) rename {resource => res}/icons/1048.png (100%) rename {resource => res}/icons/1049.png (100%) rename {resource => res}/icons/1050.png (100%) rename {resource => res}/icons/1051.png (100%) rename {resource => res}/icons/1052.png (100%) rename {resource => res}/icons/1053.png (100%) rename {resource => res}/icons/1054.png (100%) rename {resource => res}/icons/1055.png (100%) rename {resource => res}/icons/1056.png (100%) rename {resource => res}/icons/1057.png (100%) rename {resource => res}/icons/1058.png (100%) rename {resource => res}/icons/1059.png (100%) rename {resource => res}/icons/1061.png (100%) rename {resource => res}/icons/1064.png (100%) rename {resource => res}/icons/1101.png (100%) rename {resource => res}/icons/1302.png (100%) rename {resource => res}/icons/1402.png (100%) rename {resource => res}/icons/150.png (100%) rename {resource => res}/icons/151.png (100%) rename {resource => res}/icons/152.png (100%) rename {resource => res}/icons/153.png (100%) rename {resource => res}/icons/1601.png (100%) rename {resource => res}/icons/1602.png (100%) rename {resource => res}/icons/1603.png (100%) rename {resource => res}/icons/1604.png (100%) rename {resource => res}/icons/1605.png (100%) rename {resource => res}/icons/1606.png (100%) rename {resource => res}/icons/1607.png (100%) rename {resource => res}/icons/2001.png (100%) rename {resource => res}/icons/2002.png (100%) rename {resource => res}/icons/2003.png (100%) rename {resource => res}/icons/2004.png (100%) rename {resource => res}/icons/2005.png (100%) rename {resource => res}/icons/2006.png (100%) rename {resource => res}/icons/2007.png (100%) rename {resource => res}/icons/2008.png (100%) rename {resource => res}/icons/2009.png (100%) rename {resource => res}/icons/2010.png (100%) rename {resource => res}/icons/2011.png (100%) rename {resource => res}/icons/2012.png (100%) rename {resource => res}/icons/2013.png (100%) rename {resource => res}/icons/2014.png (100%) rename {resource => res}/icons/2015.png (100%) rename {resource => res}/icons/2016.png (100%) rename {resource => res}/icons/2017.png (100%) rename {resource => res}/icons/2018.png (100%) rename {resource => res}/icons/300.png (100%) rename {resource => res}/icons/301.png (100%) rename {resource => res}/icons/302.png (100%) rename {resource => res}/icons/303.png (100%) rename {resource => res}/icons/304.png (100%) rename {resource => res}/icons/305.png (100%) rename {resource => res}/icons/306.png (100%) rename {resource => res}/icons/307.png (100%) rename {resource => res}/icons/308.png (100%) rename {resource => res}/icons/309.png (100%) rename {resource => res}/icons/310.png (100%) rename {resource => res}/icons/311.png (100%) rename {resource => res}/icons/312.png (100%) rename {resource => res}/icons/313.png (100%) rename {resource => res}/icons/314.png (100%) rename {resource => res}/icons/315.png (100%) rename {resource => res}/icons/316.png (100%) rename {resource => res}/icons/317.png (100%) rename {resource => res}/icons/318.png (100%) rename {resource => res}/icons/350.png (100%) rename {resource => res}/icons/351.png (100%) rename {resource => res}/icons/399.png (100%) rename {resource => res}/icons/400.png (100%) rename {resource => res}/icons/401.png (100%) rename {resource => res}/icons/402.png (100%) rename {resource => res}/icons/403.png (100%) rename {resource => res}/icons/404.png (100%) rename {resource => res}/icons/405.png (100%) rename {resource => res}/icons/406.png (100%) rename {resource => res}/icons/407.png (100%) rename {resource => res}/icons/408.png (100%) rename {resource => res}/icons/409.png (100%) rename {resource => res}/icons/410.png (100%) rename {resource => res}/icons/456.png (100%) rename {resource => res}/icons/457.png (100%) rename {resource => res}/icons/499.png (100%) rename {resource => res}/icons/500.png (100%) rename {resource => res}/icons/501.png (100%) rename {resource => res}/icons/502.png (100%) rename {resource => res}/icons/503.png (100%) rename {resource => res}/icons/504.png (100%) rename {resource => res}/icons/507.png (100%) rename {resource => res}/icons/508.png (100%) rename {resource => res}/icons/509.png (100%) rename {resource => res}/icons/510.png (100%) rename {resource => res}/icons/511.png (100%) rename {resource => res}/icons/512.png (100%) rename {resource => res}/icons/513.png (100%) rename {resource => res}/icons/514.png (100%) rename {resource => res}/icons/515.png (100%) rename {resource => res}/icons/800.png (100%) rename {resource => res}/icons/801.png (100%) rename {resource => res}/icons/802.png (100%) rename {resource => res}/icons/803.png (100%) rename {resource => res}/icons/804.png (100%) rename {resource => res}/icons/805.png (100%) rename {resource => res}/icons/806.png (100%) rename {resource => res}/icons/807.png (100%) rename {resource => res}/icons/900.png (100%) rename {resource => res}/icons/901.png (100%) rename {resource => res}/icons/999.png (100%) rename {resource => res}/icons/9999.png (100%) rename {resource => res}/icons/convert.py (100%) rename {resource => res}/lang/en_us.json (100%) rename {resource => res}/lang/zh_cn.json (100%) create mode 100644 test.py create mode 100644 tests/s.py diff --git a/core/__init__.py b/core/__init__.py new file mode 100644 index 0000000..bd1ecf4 --- /dev/null +++ b/core/__init__.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: __init__.py \ No newline at end of file diff --git a/core/checktime.py b/core/checktime.py new file mode 100644 index 0000000..e364cb5 --- /dev/null +++ b/core/checktime.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: checktime.py \ No newline at end of file diff --git a/core/information.py b/core/information.py new file mode 100644 index 0000000..352b00c --- /dev/null +++ b/core/information.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: information.py \ No newline at end of file diff --git a/core/logger.py b/core/logger.py new file mode 100644 index 0000000..989174f --- /dev/null +++ b/core/logger.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: logger.py + +from colorlog import ColoredFormatter +import logging.handlers +import time + +date_format = '%H:%M:%S' +info_format_console = '%(log_color)s[%(asctime)s] |%(levelname)-8s |%(lineno)-3s |%(message)s' +info_format_file = '[%(asctime)s] |%(levelname)-8s |%(lineno)-3s |%(funcName)s |%(pathname)s |%(message)s' +formatter = ColoredFormatter(fmt=info_format_console, + datefmt=date_format, + reset=True, + log_colors={ + 'DEBUG': 'light_purple', + 'INFO': 'light_cyan', + 'WARNING': 'yellow', + 'ERROR': 'red', + 'CRITICAL': 'red,bold_red'}) +formatter_file = logging.Formatter(fmt=info_format_file, + datefmt=date_format) + +Logger = logging.getLogger('MainLogger') +Logger.setLevel(logging.DEBUG) +ConsoleLogger = logging.StreamHandler() # 输出到终端 +ConsoleLogger.setFormatter(formatter) +log_name = time.strftime('%Y-%m-%d#%H') # 一小时内使用的日志文件都是同一个 +FileLogger = logging.handlers.RotatingFileHandler(filename=f'./logs/{log_name}.log', + maxBytes=102400, + backupCount=5) # 每个日志文件最大102400字节(100Kb) +FileLogger.setFormatter(formatter_file) +Logger.addHandler(ConsoleLogger) +Logger.addHandler(FileLogger) + diff --git a/core/qweather.py b/core/qweather.py new file mode 100644 index 0000000..7d40b8d --- /dev/null +++ b/core/qweather.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: qweather.py \ No newline at end of file diff --git a/core/read_excel.py b/core/read_excel.py new file mode 100644 index 0000000..d6c6b67 --- /dev/null +++ b/core/read_excel.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: read_excel.py \ No newline at end of file diff --git a/core/settings.py b/core/settings.py new file mode 100644 index 0000000..d28a25e --- /dev/null +++ b/core/settings.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: settings.py \ No newline at end of file diff --git a/core/test.py b/core/test.py new file mode 100644 index 0000000..043b67a --- /dev/null +++ b/core/test.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: test.py \ No newline at end of file diff --git a/resource/basic-resources/sunrise.png b/res/basic-resources/sunrise.png similarity index 100% rename from resource/basic-resources/sunrise.png rename to res/basic-resources/sunrise.png diff --git a/resource/basic-resources/sunset.png b/res/basic-resources/sunset.png similarity index 100% rename from resource/basic-resources/sunset.png rename to res/basic-resources/sunset.png diff --git a/resource/china_city_list.xlsx b/res/china_city_list.xlsx similarity index 100% rename from resource/china_city_list.xlsx rename to res/china_city_list.xlsx diff --git a/resource/icons/100.png b/res/icons/100.png similarity index 100% rename from resource/icons/100.png rename to res/icons/100.png diff --git a/resource/icons/1001.png b/res/icons/1001.png similarity index 100% rename from resource/icons/1001.png rename to res/icons/1001.png diff --git a/resource/icons/1002.png b/res/icons/1002.png similarity index 100% rename from resource/icons/1002.png rename to res/icons/1002.png diff --git a/resource/icons/1003.png b/res/icons/1003.png similarity index 100% rename from resource/icons/1003.png rename to res/icons/1003.png diff --git a/resource/icons/1004.png b/res/icons/1004.png similarity index 100% rename from resource/icons/1004.png rename to res/icons/1004.png diff --git a/resource/icons/1005.png b/res/icons/1005.png similarity index 100% rename from resource/icons/1005.png rename to res/icons/1005.png diff --git a/resource/icons/1006.png b/res/icons/1006.png similarity index 100% rename from resource/icons/1006.png rename to res/icons/1006.png diff --git a/resource/icons/1007.png b/res/icons/1007.png similarity index 100% rename from resource/icons/1007.png rename to res/icons/1007.png diff --git a/resource/icons/1008.png b/res/icons/1008.png similarity index 100% rename from resource/icons/1008.png rename to res/icons/1008.png diff --git a/resource/icons/1009.png b/res/icons/1009.png similarity index 100% rename from resource/icons/1009.png rename to res/icons/1009.png diff --git a/resource/icons/101.png b/res/icons/101.png similarity index 100% rename from resource/icons/101.png rename to res/icons/101.png diff --git a/resource/icons/1010.png b/res/icons/1010.png similarity index 100% rename from resource/icons/1010.png rename to res/icons/1010.png diff --git a/resource/icons/1011.png b/res/icons/1011.png similarity index 100% rename from resource/icons/1011.png rename to res/icons/1011.png diff --git a/resource/icons/1012.png b/res/icons/1012.png similarity index 100% rename from resource/icons/1012.png rename to res/icons/1012.png diff --git a/resource/icons/1013.png b/res/icons/1013.png similarity index 100% rename from resource/icons/1013.png rename to res/icons/1013.png diff --git a/resource/icons/1014.png b/res/icons/1014.png similarity index 100% rename from resource/icons/1014.png rename to res/icons/1014.png diff --git a/resource/icons/1015.png b/res/icons/1015.png similarity index 100% rename from resource/icons/1015.png rename to res/icons/1015.png diff --git a/resource/icons/1016.png b/res/icons/1016.png similarity index 100% rename from resource/icons/1016.png rename to res/icons/1016.png diff --git a/resource/icons/1017.png b/res/icons/1017.png similarity index 100% rename from resource/icons/1017.png rename to res/icons/1017.png diff --git a/resource/icons/1018.png b/res/icons/1018.png similarity index 100% rename from resource/icons/1018.png rename to res/icons/1018.png diff --git a/resource/icons/1019.png b/res/icons/1019.png similarity index 100% rename from resource/icons/1019.png rename to res/icons/1019.png diff --git a/resource/icons/102.png b/res/icons/102.png similarity index 100% rename from resource/icons/102.png rename to res/icons/102.png diff --git a/resource/icons/1020.png b/res/icons/1020.png similarity index 100% rename from resource/icons/1020.png rename to res/icons/1020.png diff --git a/resource/icons/1021.png b/res/icons/1021.png similarity index 100% rename from resource/icons/1021.png rename to res/icons/1021.png diff --git a/resource/icons/1022.png b/res/icons/1022.png similarity index 100% rename from resource/icons/1022.png rename to res/icons/1022.png diff --git a/resource/icons/1023.png b/res/icons/1023.png similarity index 100% rename from resource/icons/1023.png rename to res/icons/1023.png diff --git a/resource/icons/1024.png b/res/icons/1024.png similarity index 100% rename from resource/icons/1024.png rename to res/icons/1024.png diff --git a/resource/icons/1025.png b/res/icons/1025.png similarity index 100% rename from resource/icons/1025.png rename to res/icons/1025.png diff --git a/resource/icons/1026.png b/res/icons/1026.png similarity index 100% rename from resource/icons/1026.png rename to res/icons/1026.png diff --git a/resource/icons/1027.png b/res/icons/1027.png similarity index 100% rename from resource/icons/1027.png rename to res/icons/1027.png diff --git a/resource/icons/1028.png b/res/icons/1028.png similarity index 100% rename from resource/icons/1028.png rename to res/icons/1028.png diff --git a/resource/icons/1029.png b/res/icons/1029.png similarity index 100% rename from resource/icons/1029.png rename to res/icons/1029.png diff --git a/resource/icons/103.png b/res/icons/103.png similarity index 100% rename from resource/icons/103.png rename to res/icons/103.png diff --git a/resource/icons/1030.png b/res/icons/1030.png similarity index 100% rename from resource/icons/1030.png rename to res/icons/1030.png diff --git a/resource/icons/1031.png b/res/icons/1031.png similarity index 100% rename from resource/icons/1031.png rename to res/icons/1031.png diff --git a/resource/icons/1032.png b/res/icons/1032.png similarity index 100% rename from resource/icons/1032.png rename to res/icons/1032.png diff --git a/resource/icons/1033.png b/res/icons/1033.png similarity index 100% rename from resource/icons/1033.png rename to res/icons/1033.png diff --git a/resource/icons/1034.png b/res/icons/1034.png similarity index 100% rename from resource/icons/1034.png rename to res/icons/1034.png diff --git a/resource/icons/1035.png b/res/icons/1035.png similarity index 100% rename from resource/icons/1035.png rename to res/icons/1035.png diff --git a/resource/icons/1036.png b/res/icons/1036.png similarity index 100% rename from resource/icons/1036.png rename to res/icons/1036.png diff --git a/resource/icons/1037.png b/res/icons/1037.png similarity index 100% rename from resource/icons/1037.png rename to res/icons/1037.png diff --git a/resource/icons/1038.png b/res/icons/1038.png similarity index 100% rename from resource/icons/1038.png rename to res/icons/1038.png diff --git a/resource/icons/1039.png b/res/icons/1039.png similarity index 100% rename from resource/icons/1039.png rename to res/icons/1039.png diff --git a/resource/icons/104.png b/res/icons/104.png similarity index 100% rename from resource/icons/104.png rename to res/icons/104.png diff --git a/resource/icons/1040.png b/res/icons/1040.png similarity index 100% rename from resource/icons/1040.png rename to res/icons/1040.png diff --git a/resource/icons/1041.png b/res/icons/1041.png similarity index 100% rename from resource/icons/1041.png rename to res/icons/1041.png diff --git a/resource/icons/1042.png b/res/icons/1042.png similarity index 100% rename from resource/icons/1042.png rename to res/icons/1042.png diff --git a/resource/icons/1043.png b/res/icons/1043.png similarity index 100% rename from resource/icons/1043.png rename to res/icons/1043.png diff --git a/resource/icons/1044.png b/res/icons/1044.png similarity index 100% rename from resource/icons/1044.png rename to res/icons/1044.png diff --git a/resource/icons/1045.png b/res/icons/1045.png similarity index 100% rename from resource/icons/1045.png rename to res/icons/1045.png diff --git a/resource/icons/1046.png b/res/icons/1046.png similarity index 100% rename from resource/icons/1046.png rename to res/icons/1046.png diff --git a/resource/icons/1047.png b/res/icons/1047.png similarity index 100% rename from resource/icons/1047.png rename to res/icons/1047.png diff --git a/resource/icons/1048.png b/res/icons/1048.png similarity index 100% rename from resource/icons/1048.png rename to res/icons/1048.png diff --git a/resource/icons/1049.png b/res/icons/1049.png similarity index 100% rename from resource/icons/1049.png rename to res/icons/1049.png diff --git a/resource/icons/1050.png b/res/icons/1050.png similarity index 100% rename from resource/icons/1050.png rename to res/icons/1050.png diff --git a/resource/icons/1051.png b/res/icons/1051.png similarity index 100% rename from resource/icons/1051.png rename to res/icons/1051.png diff --git a/resource/icons/1052.png b/res/icons/1052.png similarity index 100% rename from resource/icons/1052.png rename to res/icons/1052.png diff --git a/resource/icons/1053.png b/res/icons/1053.png similarity index 100% rename from resource/icons/1053.png rename to res/icons/1053.png diff --git a/resource/icons/1054.png b/res/icons/1054.png similarity index 100% rename from resource/icons/1054.png rename to res/icons/1054.png diff --git a/resource/icons/1055.png b/res/icons/1055.png similarity index 100% rename from resource/icons/1055.png rename to res/icons/1055.png diff --git a/resource/icons/1056.png b/res/icons/1056.png similarity index 100% rename from resource/icons/1056.png rename to res/icons/1056.png diff --git a/resource/icons/1057.png b/res/icons/1057.png similarity index 100% rename from resource/icons/1057.png rename to res/icons/1057.png diff --git a/resource/icons/1058.png b/res/icons/1058.png similarity index 100% rename from resource/icons/1058.png rename to res/icons/1058.png diff --git a/resource/icons/1059.png b/res/icons/1059.png similarity index 100% rename from resource/icons/1059.png rename to res/icons/1059.png diff --git a/resource/icons/1061.png b/res/icons/1061.png similarity index 100% rename from resource/icons/1061.png rename to res/icons/1061.png diff --git a/resource/icons/1064.png b/res/icons/1064.png similarity index 100% rename from resource/icons/1064.png rename to res/icons/1064.png diff --git a/resource/icons/1101.png b/res/icons/1101.png similarity index 100% rename from resource/icons/1101.png rename to res/icons/1101.png diff --git a/resource/icons/1302.png b/res/icons/1302.png similarity index 100% rename from resource/icons/1302.png rename to res/icons/1302.png diff --git a/resource/icons/1402.png b/res/icons/1402.png similarity index 100% rename from resource/icons/1402.png rename to res/icons/1402.png diff --git a/resource/icons/150.png b/res/icons/150.png similarity index 100% rename from resource/icons/150.png rename to res/icons/150.png diff --git a/resource/icons/151.png b/res/icons/151.png similarity index 100% rename from resource/icons/151.png rename to res/icons/151.png diff --git a/resource/icons/152.png b/res/icons/152.png similarity index 100% rename from resource/icons/152.png rename to res/icons/152.png diff --git a/resource/icons/153.png b/res/icons/153.png similarity index 100% rename from resource/icons/153.png rename to res/icons/153.png diff --git a/resource/icons/1601.png b/res/icons/1601.png similarity index 100% rename from resource/icons/1601.png rename to res/icons/1601.png diff --git a/resource/icons/1602.png b/res/icons/1602.png similarity index 100% rename from resource/icons/1602.png rename to res/icons/1602.png diff --git a/resource/icons/1603.png b/res/icons/1603.png similarity index 100% rename from resource/icons/1603.png rename to res/icons/1603.png diff --git a/resource/icons/1604.png b/res/icons/1604.png similarity index 100% rename from resource/icons/1604.png rename to res/icons/1604.png diff --git a/resource/icons/1605.png b/res/icons/1605.png similarity index 100% rename from resource/icons/1605.png rename to res/icons/1605.png diff --git a/resource/icons/1606.png b/res/icons/1606.png similarity index 100% rename from resource/icons/1606.png rename to res/icons/1606.png diff --git a/resource/icons/1607.png b/res/icons/1607.png similarity index 100% rename from resource/icons/1607.png rename to res/icons/1607.png diff --git a/resource/icons/2001.png b/res/icons/2001.png similarity index 100% rename from resource/icons/2001.png rename to res/icons/2001.png diff --git a/resource/icons/2002.png b/res/icons/2002.png similarity index 100% rename from resource/icons/2002.png rename to res/icons/2002.png diff --git a/resource/icons/2003.png b/res/icons/2003.png similarity index 100% rename from resource/icons/2003.png rename to res/icons/2003.png diff --git a/resource/icons/2004.png b/res/icons/2004.png similarity index 100% rename from resource/icons/2004.png rename to res/icons/2004.png diff --git a/resource/icons/2005.png b/res/icons/2005.png similarity index 100% rename from resource/icons/2005.png rename to res/icons/2005.png diff --git a/resource/icons/2006.png b/res/icons/2006.png similarity index 100% rename from resource/icons/2006.png rename to res/icons/2006.png diff --git a/resource/icons/2007.png b/res/icons/2007.png similarity index 100% rename from resource/icons/2007.png rename to res/icons/2007.png diff --git a/resource/icons/2008.png b/res/icons/2008.png similarity index 100% rename from resource/icons/2008.png rename to res/icons/2008.png diff --git a/resource/icons/2009.png b/res/icons/2009.png similarity index 100% rename from resource/icons/2009.png rename to res/icons/2009.png diff --git a/resource/icons/2010.png b/res/icons/2010.png similarity index 100% rename from resource/icons/2010.png rename to res/icons/2010.png diff --git a/resource/icons/2011.png b/res/icons/2011.png similarity index 100% rename from resource/icons/2011.png rename to res/icons/2011.png diff --git a/resource/icons/2012.png b/res/icons/2012.png similarity index 100% rename from resource/icons/2012.png rename to res/icons/2012.png diff --git a/resource/icons/2013.png b/res/icons/2013.png similarity index 100% rename from resource/icons/2013.png rename to res/icons/2013.png diff --git a/resource/icons/2014.png b/res/icons/2014.png similarity index 100% rename from resource/icons/2014.png rename to res/icons/2014.png diff --git a/resource/icons/2015.png b/res/icons/2015.png similarity index 100% rename from resource/icons/2015.png rename to res/icons/2015.png diff --git a/resource/icons/2016.png b/res/icons/2016.png similarity index 100% rename from resource/icons/2016.png rename to res/icons/2016.png diff --git a/resource/icons/2017.png b/res/icons/2017.png similarity index 100% rename from resource/icons/2017.png rename to res/icons/2017.png diff --git a/resource/icons/2018.png b/res/icons/2018.png similarity index 100% rename from resource/icons/2018.png rename to res/icons/2018.png diff --git a/resource/icons/300.png b/res/icons/300.png similarity index 100% rename from resource/icons/300.png rename to res/icons/300.png diff --git a/resource/icons/301.png b/res/icons/301.png similarity index 100% rename from resource/icons/301.png rename to res/icons/301.png diff --git a/resource/icons/302.png b/res/icons/302.png similarity index 100% rename from resource/icons/302.png rename to res/icons/302.png diff --git a/resource/icons/303.png b/res/icons/303.png similarity index 100% rename from resource/icons/303.png rename to res/icons/303.png diff --git a/resource/icons/304.png b/res/icons/304.png similarity index 100% rename from resource/icons/304.png rename to res/icons/304.png diff --git a/resource/icons/305.png b/res/icons/305.png similarity index 100% rename from resource/icons/305.png rename to res/icons/305.png diff --git a/resource/icons/306.png b/res/icons/306.png similarity index 100% rename from resource/icons/306.png rename to res/icons/306.png diff --git a/resource/icons/307.png b/res/icons/307.png similarity index 100% rename from resource/icons/307.png rename to res/icons/307.png diff --git a/resource/icons/308.png b/res/icons/308.png similarity index 100% rename from resource/icons/308.png rename to res/icons/308.png diff --git a/resource/icons/309.png b/res/icons/309.png similarity index 100% rename from resource/icons/309.png rename to res/icons/309.png diff --git a/resource/icons/310.png b/res/icons/310.png similarity index 100% rename from resource/icons/310.png rename to res/icons/310.png diff --git a/resource/icons/311.png b/res/icons/311.png similarity index 100% rename from resource/icons/311.png rename to res/icons/311.png diff --git a/resource/icons/312.png b/res/icons/312.png similarity index 100% rename from resource/icons/312.png rename to res/icons/312.png diff --git a/resource/icons/313.png b/res/icons/313.png similarity index 100% rename from resource/icons/313.png rename to res/icons/313.png diff --git a/resource/icons/314.png b/res/icons/314.png similarity index 100% rename from resource/icons/314.png rename to res/icons/314.png diff --git a/resource/icons/315.png b/res/icons/315.png similarity index 100% rename from resource/icons/315.png rename to res/icons/315.png diff --git a/resource/icons/316.png b/res/icons/316.png similarity index 100% rename from resource/icons/316.png rename to res/icons/316.png diff --git a/resource/icons/317.png b/res/icons/317.png similarity index 100% rename from resource/icons/317.png rename to res/icons/317.png diff --git a/resource/icons/318.png b/res/icons/318.png similarity index 100% rename from resource/icons/318.png rename to res/icons/318.png diff --git a/resource/icons/350.png b/res/icons/350.png similarity index 100% rename from resource/icons/350.png rename to res/icons/350.png diff --git a/resource/icons/351.png b/res/icons/351.png similarity index 100% rename from resource/icons/351.png rename to res/icons/351.png diff --git a/resource/icons/399.png b/res/icons/399.png similarity index 100% rename from resource/icons/399.png rename to res/icons/399.png diff --git a/resource/icons/400.png b/res/icons/400.png similarity index 100% rename from resource/icons/400.png rename to res/icons/400.png diff --git a/resource/icons/401.png b/res/icons/401.png similarity index 100% rename from resource/icons/401.png rename to res/icons/401.png diff --git a/resource/icons/402.png b/res/icons/402.png similarity index 100% rename from resource/icons/402.png rename to res/icons/402.png diff --git a/resource/icons/403.png b/res/icons/403.png similarity index 100% rename from resource/icons/403.png rename to res/icons/403.png diff --git a/resource/icons/404.png b/res/icons/404.png similarity index 100% rename from resource/icons/404.png rename to res/icons/404.png diff --git a/resource/icons/405.png b/res/icons/405.png similarity index 100% rename from resource/icons/405.png rename to res/icons/405.png diff --git a/resource/icons/406.png b/res/icons/406.png similarity index 100% rename from resource/icons/406.png rename to res/icons/406.png diff --git a/resource/icons/407.png b/res/icons/407.png similarity index 100% rename from resource/icons/407.png rename to res/icons/407.png diff --git a/resource/icons/408.png b/res/icons/408.png similarity index 100% rename from resource/icons/408.png rename to res/icons/408.png diff --git a/resource/icons/409.png b/res/icons/409.png similarity index 100% rename from resource/icons/409.png rename to res/icons/409.png diff --git a/resource/icons/410.png b/res/icons/410.png similarity index 100% rename from resource/icons/410.png rename to res/icons/410.png diff --git a/resource/icons/456.png b/res/icons/456.png similarity index 100% rename from resource/icons/456.png rename to res/icons/456.png diff --git a/resource/icons/457.png b/res/icons/457.png similarity index 100% rename from resource/icons/457.png rename to res/icons/457.png diff --git a/resource/icons/499.png b/res/icons/499.png similarity index 100% rename from resource/icons/499.png rename to res/icons/499.png diff --git a/resource/icons/500.png b/res/icons/500.png similarity index 100% rename from resource/icons/500.png rename to res/icons/500.png diff --git a/resource/icons/501.png b/res/icons/501.png similarity index 100% rename from resource/icons/501.png rename to res/icons/501.png diff --git a/resource/icons/502.png b/res/icons/502.png similarity index 100% rename from resource/icons/502.png rename to res/icons/502.png diff --git a/resource/icons/503.png b/res/icons/503.png similarity index 100% rename from resource/icons/503.png rename to res/icons/503.png diff --git a/resource/icons/504.png b/res/icons/504.png similarity index 100% rename from resource/icons/504.png rename to res/icons/504.png diff --git a/resource/icons/507.png b/res/icons/507.png similarity index 100% rename from resource/icons/507.png rename to res/icons/507.png diff --git a/resource/icons/508.png b/res/icons/508.png similarity index 100% rename from resource/icons/508.png rename to res/icons/508.png diff --git a/resource/icons/509.png b/res/icons/509.png similarity index 100% rename from resource/icons/509.png rename to res/icons/509.png diff --git a/resource/icons/510.png b/res/icons/510.png similarity index 100% rename from resource/icons/510.png rename to res/icons/510.png diff --git a/resource/icons/511.png b/res/icons/511.png similarity index 100% rename from resource/icons/511.png rename to res/icons/511.png diff --git a/resource/icons/512.png b/res/icons/512.png similarity index 100% rename from resource/icons/512.png rename to res/icons/512.png diff --git a/resource/icons/513.png b/res/icons/513.png similarity index 100% rename from resource/icons/513.png rename to res/icons/513.png diff --git a/resource/icons/514.png b/res/icons/514.png similarity index 100% rename from resource/icons/514.png rename to res/icons/514.png diff --git a/resource/icons/515.png b/res/icons/515.png similarity index 100% rename from resource/icons/515.png rename to res/icons/515.png diff --git a/resource/icons/800.png b/res/icons/800.png similarity index 100% rename from resource/icons/800.png rename to res/icons/800.png diff --git a/resource/icons/801.png b/res/icons/801.png similarity index 100% rename from resource/icons/801.png rename to res/icons/801.png diff --git a/resource/icons/802.png b/res/icons/802.png similarity index 100% rename from resource/icons/802.png rename to res/icons/802.png diff --git a/resource/icons/803.png b/res/icons/803.png similarity index 100% rename from resource/icons/803.png rename to res/icons/803.png diff --git a/resource/icons/804.png b/res/icons/804.png similarity index 100% rename from resource/icons/804.png rename to res/icons/804.png diff --git a/resource/icons/805.png b/res/icons/805.png similarity index 100% rename from resource/icons/805.png rename to res/icons/805.png diff --git a/resource/icons/806.png b/res/icons/806.png similarity index 100% rename from resource/icons/806.png rename to res/icons/806.png diff --git a/resource/icons/807.png b/res/icons/807.png similarity index 100% rename from resource/icons/807.png rename to res/icons/807.png diff --git a/resource/icons/900.png b/res/icons/900.png similarity index 100% rename from resource/icons/900.png rename to res/icons/900.png diff --git a/resource/icons/901.png b/res/icons/901.png similarity index 100% rename from resource/icons/901.png rename to res/icons/901.png diff --git a/resource/icons/999.png b/res/icons/999.png similarity index 100% rename from resource/icons/999.png rename to res/icons/999.png diff --git a/resource/icons/9999.png b/res/icons/9999.png similarity index 100% rename from resource/icons/9999.png rename to res/icons/9999.png diff --git a/resource/icons/convert.py b/res/icons/convert.py similarity index 100% rename from resource/icons/convert.py rename to res/icons/convert.py diff --git a/resource/lang/en_us.json b/res/lang/en_us.json similarity index 100% rename from resource/lang/en_us.json rename to res/lang/en_us.json diff --git a/resource/lang/zh_cn.json b/res/lang/zh_cn.json similarity index 100% rename from resource/lang/zh_cn.json rename to res/lang/zh_cn.json diff --git a/test.py b/test.py new file mode 100644 index 0000000..043b67a --- /dev/null +++ b/test.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: test.py \ No newline at end of file diff --git a/tests/s.py b/tests/s.py new file mode 100644 index 0000000..7199fc3 --- /dev/null +++ b/tests/s.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -- coding:utf-8 -- +# @Author: markushammered@gmail.com +# @Development Tool: PyCharm +# @Create Time: 2021/12/15 +# @File Name: s.py \ No newline at end of file