修复快速切换音乐,线程混乱问题,增加快速跳转快捷键

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Build
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: abatilo/actions-poetry@v2.0.0
+        with:
+          poetry-version: 1.1.4
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/pypoetry/virtualenvs
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
+      - name: Install dependencies
+        run: |
+          poetry install
+          poetry build
+      - name: Test with pytest
+        run: poetry run pytest -s
+      - name: Run cli
+        run: poetry run musicbox -v
+        env:
+          TERM: xterm

.gitignore

@@ -1,26 +1,36 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
 
 # Distribution / packaging
 .Python
-env/
-bin/
 build/
 develop-eggs/
 dist/
+downloads/
 eggs/
+.eggs/
 lib/
 lib64/
 parts/
 sdist/
 var/
+wheels/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
 
 # Installer logs
 pip-log.txt
@@ -29,47 +39,115 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
+.coverage.*
 .cache
 nosetests.xml
 coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
 
 # Translations
 *.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Rope
-.ropeproject
+*.pot
 
 # Django stuff:
 *.log
-*.pot
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
 docs/_build/
 
-# ctags
-tags
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
 
-src/.idea/*
-.idea/*
+# Cython debug symbols
+cython_debug/
 
-# ignore mac file
-.DS_Store
-src/.DS_Store
+# vscode
+.vscode/
 
-# ignore demo
-out.gif
+nemcache.sqlite
 
-# ignore swp files
-NEMbox/*.swp
+#Jetbrains
+.idea
 
-# ignore TEST files
-TEST
+# Vim
+.undodir
+Session.vim
+.vim
 
-# virtualenv
-venv
+test_login.py

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+repos:
+  - repo: https://github.com/ambv/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+        exclude: venv
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-yaml
+
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v2.3.6
+    hooks:
+      - id: reorder-python-imports
+        args: ["--py3-plus"]
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.4
+    hooks:
+      - id: flake8
+        # allow "imported but unused" for pre-commit, forbid it elsewhere e.g. in vscode
+        args: ["--config=setup.cfg", "--ignore=E402,F401"]

Change Log.md → CHANGELOG.md

@@ -1,4 +1,38 @@
-## 更新日志
+# 更新日志
+
+2018-05-21 版本 0.2.4.3    更新依赖，错误修复
+
+2017-11-28 版本 0.2.4.2    更新获取歌曲列表的api
+
+2017-06-03 版本 0.2.4.1    修正mpg123状态异常导致的cpu占用，增加歌词双行显示功能
+
+2017-03-17 版本 0.2.4.0    修复通知可能造成的崩溃
+
+2017-03-03 版本 0.2.3.9    邮箱用户登录修复
+
+2017-03-02 版本 0.2.3.8    登录接口修复
+
+2016-11-24 版本 0.2.3.7    新增背景色设置
+
+2016-11-07 版本 0.2.3.6    已知错误修复
+
+2016-10-16 版本 0.2.3.5    新增进入歌曲专辑功能
+
+2016-10-13 版本 0.2.3.4    新增查看歌曲评论
+
+2016-09-26 版本 0.2.3.3    keybinder 错误修复
+
+2016-09-15 版本 0.2.3.2    已知错误修复
+
+2016-09-12 版本 0.2.3.1    已知错误修复
+
+2016-09-11 版本 0.2.3.0    Python 2 和 3 支持
+
+2016-05-09 版本 0.2.2.10   修复最后一行歌名过长的问题
+
+2016-05-08 版本 0.2.2.9    缓存问题修复
+
+2016-05-07 版本 0.2.2.8    解决通知在Gnome桌面持续驻留（#303）的问题
 
 2016-05-07 版本 0.2.2.6    已知错误修复
 
@@ -48,15 +82,15 @@
 
 2015-10-14 版本 0.1.9.7    新增歌曲播放提醒
 
-2015-10-13 版本 0.1.9.6    修复因 cookie 过期导致的登陆问题
+2015-10-13 版本 0.1.9.6    修复因 cookie 过期导致的登录问题
 
 2015-10-13 版本 0.1.9.5    新增自定义全局快捷键功能
 
 2015-09-25 版本 0.1.9.4    修复部分列表无法暂停问题
 
 2015-09-25 版本 0.1.9.2    新增版本检查和更新提醒功能
 
-2015-09-24 版本 0.1.9.0    优化登陆逻辑，修复每日推荐的登陆问题
+2015-09-24 版本 0.1.9.0    优化登录逻辑，修复每日推荐的登录问题
 
 2015-09-23 版本 0.1.8.5    优化电台FM功能逻辑
 
@@ -80,7 +114,7 @@
 
 2015-08-02 版本 0.1.6.2    新增显示播放进度
 
-2015-07-30 版本 0.1.6.0    修复由于接口更换导致的用户登陆问题
+2015-07-30 版本 0.1.6.0    修复由于接口更换导致的用户登录问题
 
 2015-06-17 版本 0.1.5.6    优化对过长歌曲信息的显示
 
@@ -102,7 +136,7 @@
 
 2015-03-18 版本 0.1.3.3    修复Ubuntu等系统SSL登录报错问题
 
-2015-02-28 版本 0.1.3.2    修复170等新增号段手机用户无法登陆的问题
+2015-02-28 版本 0.1.3.2    修复170等新增号段手机用户无法登录的问题
 
 2015-02-05 版本 0.1.3.1    修复登录无法保存的问题
 
@@ -114,6 +148,6 @@
 
 2015-01-08 版本 0.1.2.0    增加音量控制
 
-2015-01-03 版本 0.1.1.1    修复部分仅手机注册用户登录无法登陆 (感谢Catofes反馈)
+2015-01-03 版本 0.1.1.1    修复部分仅手机注册用户登录无法登录 (感谢Catofes反馈)
 
-2015-01-02 版本 0.1.1.0    新增退出并清除用户信息功能
+2015-01-02 版本 0.1.1.0    新增退出并清除用户信息功能

LICENSE.txt → LICENSE

@@ -1,6 +1,6 @@
-### The MIT License (MIT)
+MIT License
 
-CopyRight (c) 2015 omi &lt;<a href="4399.omi@gmail.com">4399.omi@gmail.com</a>&gt;
+Copyright (c) 2020 omi <4399.omi@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.