Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use module level based logger instead of root logger #4

Merged
merged 2 commits into from
Jan 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 204 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ black = "*"
[tool.poetry.scripts]
syncedlyrics = "syncedlyrics.cli:cli_handler"

[tool.poetry.group.dev.dependencies]
black = "^22.12.0"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
6 changes: 4 additions & 2 deletions syncedlyrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
from .providers import NetEase, Lyricsify
from .utils import is_lrc_valid, save_lrc_file

logger = logging.getLogger(__name__)


def search(
search_term: str,
Expand All @@ -37,12 +39,12 @@ def search(
for provider in _providers:
lrc = provider.get_lrc(search_term)
if is_lrc_valid(lrc, allow_plain_format):
logging.info(
logger.info(
f'synced-lyrics found for "{search_term}" on {provider.__class__.__name__}'
)
break
if not lrc:
logging.info(f'No synced-lyrics found for "{search_term}" :(')
logger.info(f'No synced-lyrics found for "{search_term}" :(')
return
if save_path:
save_path = save_path.format(search_term=search_term)
Expand Down
7 changes: 5 additions & 2 deletions syncedlyrics/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ def cli_handler():
"-v", "--verbose", help="Use this flag to show the logs", action="store_true"
)
args = parser.parse_args()
if args.verbose:
logging.basicConfig(level=logging.DEBUG)

logging.basicConfig(
level=logging.DEBUG if args.verbose else logging.INFO
)

lrc = search(args.search_term, args.allow_plain, args.output)
if lrc:
print(lrc)
6 changes: 4 additions & 2 deletions syncedlyrics/providers/netease.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"cookie": "NMTID=00OAVK3xqDG726ITU6jopU6jF2yMk0AAAGCO8l1BA; JSESSIONID-WYYY=8KQo11YK2GZP45RMlz8Kn80vHZ9%2FGvwzRKQXXy0iQoFKycWdBlQjbfT0MJrFa6hwRfmpfBYKeHliUPH287JC3hNW99WQjrh9b9RmKT%2Fg1Exc2VwHZcsqi7ITxQgfEiee50po28x5xTTZXKoP%2FRMctN2jpDeg57kdZrXz%2FD%2FWghb%5C4DuZ%3A1659124633932; _iuqxldmzr_=32; _ntes_nnid=0db6667097883aa9596ecfe7f188c3ec,1659122833973; _ntes_nuid=0db6667097883aa9596ecfe7f188c3ec; WNMCID=xygast.1659122837568.01.0; WEVNSM=1.0.0; WM_NI=CwbjWAFbcIzPX3dsLP%2F52VB%2Bxr572gmqAYwvN9KU5X5f1nRzBYl0SNf%2BV9FTmmYZy%2FoJLADaZS0Q8TrKfNSBNOt0HLB8rRJh9DsvMOT7%2BCGCQLbvlWAcJBJeXb1P8yZ3RHA%3D; WM_NIKE=9ca17ae2e6ffcda170e2e6ee90c65b85ae87b9aa5483ef8ab3d14a939e9a83c459959caeadce47e991fbaee82af0fea7c3b92a81a9ae8bd64b86beadaaf95c9cedac94cf5cedebfeb7c121bcaefbd8b16dafaf8fbaf67e8ee785b6b854f7baff8fd1728287a4d1d246a6f59adac560afb397bbfc25ad9684a2c76b9a8d00b2bb60b295aaafd24a8e91bcd1cb4882e8beb3c964fb9cbd97d04598e9e5a4c6499394ae97ef5d83bd86a3c96f9cbeffb1bb739aed9ea9c437e2a3; WM_TID=AAkRFnl03RdABEBEQFOBWHCPOeMra4IL; playerid=94262567",
}

logger = logging.getLogger(__name__)


class NetEase(LRCProvider):
"""NetEase provider class"""
Expand All @@ -41,7 +43,7 @@ def search_track(self, search_term: str) -> Optional[dict]:
track = results[0]
track_name = f"{track.get('name')} {track.get('artists')[0].get('name')}"
if partial_ratio(search_term, track_name) < 70:
logging.info(
logger.info(
f"Found something but it seems the result is not the requested track -> {track_name}"
)
return
Expand All @@ -63,5 +65,5 @@ def get_lrc(self, search_term: str) -> Optional[str]:
if not track:
return
track_name = f"{track.get('artists')[0].get('name')} - {track.get('name')}"
logging.info(f"Getting synced lyrics of {track_name}...")
logger.info(f"Getting synced lyrics of {track_name}...")
return self.get_lrc_by_id(track["id"])