qqmusic-api-python 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. qqmusic_api/__init__.py +1 -1
  2. qqmusic_api/lyric.py +7 -7
  3. {qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/METADATA +1 -1
  4. {qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/RECORD +6 -6
  5. {qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/WHEEL +0 -0
  6. {qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/licenses/LICENSE +0 -0
qqmusic_api/__init__.py CHANGED
@@ -5,7 +5,7 @@ from .utils.credential import Credential
5
5
  from .utils.session import create_session, get_session, set_session, set_session_credential
6
6
  from .utils.sync import sync
7
7
 
8
- __version__ = "0.2.1"
8
+ __version__ = "0.2.2"
9
9
 
10
10
  logger = logging.getLogger("qqmusicapi")
11
11
 
qqmusic_api/lyric.py CHANGED
@@ -1,12 +1,14 @@
1
1
  """歌词 API"""
2
2
 
3
- import xml.etree.ElementTree as ET
3
+ import re
4
4
 
5
5
  from .utils.common import get_api, qrc_decrypt
6
6
  from .utils.network import Api
7
7
 
8
8
  API = get_api("lyric")
9
9
 
10
+ QRC_PATTERN = re.compile(r'<Lyric_.* LyricType=".*" LyricContent="(?P<content>.*?)"/>', re.DOTALL)
11
+
10
12
 
11
13
  async def get_lyric(
12
14
  *,
@@ -52,14 +54,12 @@ async def get_lyric(
52
54
  res = await Api(**API["info"]).update_params(**params).result
53
55
 
54
56
  lyric = qrc_decrypt(res["lyric"])
57
+
55
58
 
56
59
  if lyric and qrc:
57
- try:
58
- root = ET.fromstring(lyric)
59
- lyric_info = root[1]
60
- lyric = lyric_info[0].attrib.get("LyricContent", lyric)
61
- except Exception:
62
- pass
60
+ m_qrc = QRC_PATTERN.search(lyric)
61
+ if m_qrc and m_qrc.group("content"):
62
+ lyric = m_qrc.group("content")
63
63
 
64
64
  return {
65
65
  "lyric": lyric,
{qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: qqmusic-api-python
3
- Version: 0.2.1
3
+ Version: 0.2.2
4
4
  Summary: QQ音乐API封装库
5
5
  Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
6
6
  Project-URL: repository, https://github.com/luren-dc/QQMusicApi
{qqmusic_api_python-0.2.1.dist-info → qqmusic_api_python-0.2.2.dist-info}/RECORD RENAMED
@@ -1,8 +1,8 @@
1
- qqmusic_api/__init__.py,sha256=pKRqXeEqpMcvyCDGNN-3-onX-DXUVk28ob8MCj1pqbM,620
1
+ qqmusic_api/__init__.py,sha256=MsB0ijfLk7SvlC28_k-NqeSxN8wu_hRx62qg_7yNKBA,620
2
2
  qqmusic_api/album.py,sha256=cHasufexbQwQoqUWcF2C0-9ELtoyKMxjk7BNkQ5rCO8,2205
3
3
  qqmusic_api/login.py,sha256=zRUPcmAZ5LiUfO9uShJfZ5Xc4n2bCxe55kDxLpknB0k,13289
4
4
  qqmusic_api/login_utils.py,sha256=_sObteyghUSDSHCkAeFHQrgpf7FO_5I_YyQKIts-3Vg,4153
5
- qqmusic_api/lyric.py,sha256=Itrm2g51kNxD3dwTRBRgcPcrssrH4U4ViV7042K4g-g,1549
5
+ qqmusic_api/lyric.py,sha256=TCVi8tJ_so8-S14be6e6B2pDYFLw94sKKF5C7MZ0hU4,1563
6
6
  qqmusic_api/mv.py,sha256=FUpOFphGsui6I1rPe4Z2B6dTbKF_lCUE1lQSD_igWmk,2833
7
7
  qqmusic_api/search.py,sha256=V4sfFt-xmc7wKgYxN_hSSFKL8mISoDZ5BxXj0RuxY6U,3214
8
8
  qqmusic_api/singer.py,sha256=YPBjh0s6vUX7Gy03jOqJcJ47DgPZp1hVRE7w767PvG0,4688
@@ -34,7 +34,7 @@ qqmusic_api/utils/session.py,sha256=wPe8kQ31WFCLhzwGGBzJPjDDAiS65E1DQ4Q54FYBLfU,
34
34
  qqmusic_api/utils/sign.py,sha256=774CzI1WNHSh0CVkgY1MZLjgj7R5WVX8Q3ZUyU70lbk,1395
35
35
  qqmusic_api/utils/sync.py,sha256=av7Z4sdL5myf8ceR-pn26_31cvkN5h9D7-iE4Q0OrTs,741
36
36
  qqmusic_api/utils/tripledes.py,sha256=v_ivJ64MD3AZ8soN_7wx_3wL0rSBXCDeqe0GyOHrXLk,15852
37
- qqmusic_api_python-0.2.1.dist-info/METADATA,sha256=S8LxeMJm1fTwfzC54KURcGf_x2ZMnd26BL1BMk3v--I,3849
38
- qqmusic_api_python-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
39
- qqmusic_api_python-0.2.1.dist-info/licenses/LICENSE,sha256=dWHDhxdkwc4EVZ0xMf13_qTkjzPqbI1YL_1OzmZxaxU,1062
40
- qqmusic_api_python-0.2.1.dist-info/RECORD,,
37
+ qqmusic_api_python-0.2.2.dist-info/METADATA,sha256=Fb1e1k5LC1RYbU65ZJ-Z8d3tI-rsZkefEdJB9NZOt3I,3849
38
+ qqmusic_api_python-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
39
+ qqmusic_api_python-0.2.2.dist-info/licenses/LICENSE,sha256=dWHDhxdkwc4EVZ0xMf13_qTkjzPqbI1YL_1OzmZxaxU,1062
40
+ qqmusic_api_python-0.2.2.dist-info/RECORD,,