feat: fixed a bug

This commit is contained in:
RTAkland
2021-12-16 21:00:04 +08:00
parent 9767bc9ef1
commit 5ad45b5f1c
2 changed files with 15 additions and 13 deletions

6
QWeather.py Normal file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env python3
# -- coding:utf-8 --
# @Author: markushammered@gmail.com
# @Development Tool: PyCharm
# @Create Time: 2021/12/16
# @File Name: QWeather.py

View File

@@ -6,24 +6,19 @@
# @File Name: information.py # @File Name: information.py
import requests import requests
from core import read_config
class WeatherInfo: class WeatherInfo:
def __init__(self, key: str, location: int, unit: str, language: str): def __init__(self):
""" self.config = read_config()
:param key: Key
:param location: City
:param unit: Unit
:param language: Language
"""
self.dev = 'https://devapi.qweather.com/v7/weather/7d' self.dev = 'https://devapi.qweather.com/v7/weather/7d'
self.free = 'https://devapi.qweather.com/v7/weather/3d' self.free = 'https://devapi.qweather.com/v7/weather/3d'
self.warning = 'https://devapi.qweather.com/v7/warning/now' self.warning = 'https://devapi.qweather.com/v7/warning/now'
self.key = key self.key = self.config[1]['key']
self.location = location self.location = self.config[1]['location']
self.unit = unit self.unit = self.config[1]['unit']
self.language = language self.language = self.config[1]['lang']
self.params = {'location': self.location, self.params = {'location': self.location,
'key': self.key, 'key': self.key,
'unit': self.unit, 'unit': self.unit,
@@ -118,13 +113,14 @@ class WeatherInfo:
:return: release_time, title, status, level, type_, text, start_time, end_time :return: release_time, title, status, level, type_, text, start_time, end_time
""" """
warning_res = self.session.get(self.warning, params=self.params).json() warning_res = self.session.get(self.warning, params=self.params).json()
release_time = warning_res['warning'][0]['pubTime'] release_time = warning_res['warning'][0]['pubTime']
title = warning_res['warning'][0]['title'] title = warning_res['warning'][0]['title']
status = warning_res['warning'][0]['status'] status = warning_res['warning'][0]['status']
level = warning_res['warning'][0]['level'] level = warning_res['warning'][0]['level']
type_ = warning_res['warning'][0]['typeName'] type_ = warning_res['warning'][0]['typeName']
text = warning_res['warning'][0]['text'] text = warning_res['warning'][0]['text']
start_time = ['warning'][0]['startTime'] start_time = warning_res['warning'][0]['startTime']
end_time = warning_res['warning'][0]['endTime'] end_time = warning_res['warning'][0]['endTime']
match start_time, end_time: match start_time, end_time:
case None, None: case None, None: