colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #35: Implemented logging

Browse Source
This commit is contained in:
Sumner Evans
2020-01-20 14:33:54 -07:00
parent 07f8d81509
commit 072a8319b4
8 changed files with 100 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sublime/__main__.py
View File

@@ -1,13 +1,50 @@
#! /usr/bin/env python3
import sys
import argparse
import logging
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk # noqa: F401
import sublime
from .app import SublimeMusicApp
def main():
parser = argparse.ArgumentParser(description='Sublime Music')
parser.add_argument(
'-v',
'--version',
help='show version and exit',
action='store_true',
)
parser.add_argument(
'-l',
'--logfile',
help='the filename to send logs to',
)
parser.add_argument(
'-m',
'--loglevel',
help='the minium level of logging to do',
default='WARNING',
)
args, unknown_args = parser.parse_known_args()
if args.version:
print(f'Sublime Music v{sublime.__version__}')
return
min_log_level = getattr(logging, args.loglevel.upper(), None)
if not isinstance(min_log_level, int):
logging.error(f'Invalid log level: {args.loglevel.upper()}.')
min_log_level = logging.WARNING
logging.basicConfig(
filename=args.logfile,
level=min_log_level,
format='%(asctime)s:%(levelname)s:%(name)s:%(module)s:%(message)s',
)
app = SublimeMusicApp()
app.run(sys.argv)
app.run(unknown_args)

13
sublime/app.py
View File

@@ -1,4 +1,5 @@
import os
import logging
import math
import random
@@ -381,7 +382,8 @@ class SublimeMusicApp(Gtk.Application):
}
method = method_call_map.get(interface, {}).get(method)
if method is None:
print(f'Unknown/unimplemented method: {interface}.{method}')
logging.warning(
f'Unknown/unimplemented method: {interface}.{method}.')
invocation.return_value(method(*params) if callable(method) else None)
def on_dbus_set_property(
@@ -416,7 +418,7 @@ class SublimeMusicApp(Gtk.Application):
setter = setter_map.get(interface).get(property_name)
if setter is None:
print('Set: Unknown property:', setter)
logging.warning('Set: Unknown property: {property_name}.')
return
if callable(setter):
setter(value)
@@ -883,10 +885,9 @@ class SublimeMusicApp(Gtk.Application):
cover_art_future.add_done_callback(
lambda f: on_cover_art_download_complete(f.result()))
except Exception:
print(
'Unable to display notification.',
'Is a notification daemon running?',
)
logging.warning(
'Unable to display notification. Is a notification '
'daemon running?')
def on_song_download_complete(song_id):
if self.state.current_song.id != song.id:

11
sublime/cache_manager.py
View File

@@ -1,4 +1,5 @@
import os
import logging
import glob
import itertools
import threading
@@ -227,9 +228,9 @@ class CacheManager(metaclass=Singleton):
@staticmethod
def shutdown():
CacheManager.should_exit = True
print('Shutdown start')
logging.info('CacheManager shutdown start')
CacheManager.executor.shutdown()
print('Shutdown complete')
logging.info('CacheManager shutdown complete')
@staticmethod
def calculate_server_hash(server: Optional[ServerConfiguration]):
@@ -402,7 +403,7 @@ class CacheManager(metaclass=Singleton):
self.current_downloads.add(abs_path_str)
if resource_downloading:
print(abs_path, 'already being downloaded.')
logging.info(f'{abs_path} already being downloaded.')
# The resource is already being downloaded. Busy loop until
# it has completed. Then, just return the path to the
# resource.
@@ -411,7 +412,7 @@ class CacheManager(metaclass=Singleton):
while abs_path_str in self.current_downloads:
sleep(0.2)
else:
print(abs_path, 'not found. Downloading...')
logging.info(f'{abs_path} not found. Downloading...')
os.makedirs(download_path.parent, exist_ok=True)
self.save_file(download_path, download_fn())
@@ -421,7 +422,7 @@ class CacheManager(metaclass=Singleton):
if download_path.exists():
shutil.move(download_path, abs_path)
print(abs_path, 'downloaded. Returning.')
logging.info(f'{abs_path} downloaded. Returning.')
return abs_path_str
def after_download(path: str):

8
sublime/server/server.py
View File

@@ -1,3 +1,4 @@
import logging
import math
import os
@@ -93,10 +94,10 @@ class Server:
# def _get(self, url, timeout=(3.05, 2), **params):
def _get(self, url, **params):
params = {**self._get_params(), **params}
print(f'[START] get: {url}')
logging.info(f'[START] get: {url}')
if os.environ.get('SUBLIME_MUSIC_DEBUG_DELAY'):
print(
logging.info(
"SUBLIME_MUSIC_DEBUG_DELAY enabled. Pausing for",
f"{os.environ['SUBLIME_MUSIC_DEBUG_DELAY']} seconds.",
)
@@ -117,7 +118,7 @@ class Server:
if result.status_code != 200:
raise Exception(f'[FAIL] get: {url} status={result.status_code}')
print(f'[FINISH] get: {url}')
logging.info(f'[FINISH] get: {url}')
return result
def _get_json(
@@ -156,7 +157,6 @@ class Server:
return response
def do_download(self, url, **params) -> bytes:
print('download', url)
download = self._get(url, **params)
if 'json' in download.headers.get('Content-Type'):
# TODO make better

5
sublime/ui/albums.py
View File

@@ -1,3 +1,5 @@
import logging
import gi
from typing import Union
@@ -223,7 +225,8 @@ class AlbumsPanel(Gtk.Box):
year = int(entry.get_text())
except Exception:
# TODO prevent input of non-numerals
print('failed, should do something to prevent non-numeric input')
logging.error(
'failed, should do something to prevent non-numeric input')
return
if self.to_year_entry == entry:

10
sublime/ui/artists.py
View File

@@ -287,8 +287,8 @@ class ArtistDetailPanel(Gtk.Box):
# stuff and un-cache things.
@util.async_callback(
lambda *a, **k: CacheManager.get_artist(*a, **k),
before_download=lambda self: self.set_all_loading(),
on_failure=lambda self, e: print('fail a', e),
before_download=lambda self: self.set_all_loading(True),
on_failure=lambda self, e: self.set_all_loading(False),
)
def update_artist_view(
self,
@@ -382,10 +382,14 @@ class ArtistDetailPanel(Gtk.Box):
# Helper Methods
# =========================================================================
def set_all_loading(self):
def set_all_loading(self, loading_state):
if loading_state:
self.albums_list.spinner.start()
self.albums_list.spinner.show()
self.artist_artwork.set_loading(True)
else:
self.albums_list.spinner.hide()
self.artist_artwork.set_loading(False)
def make_label(self, text=None, name=None, **params):
return Gtk.Label(

14
sublime/ui/common/players.py
View File

@@ -1,3 +1,4 @@
import logging
import threading
from uuid import UUID
from urllib.parse import urlparse
@@ -248,10 +249,21 @@ class ChromecastPlayer(Player):
def run(self):
bottle.run(self.app, host=self.host, port=self.port)
getting_chromecasts = False
@classmethod
def get_chromecasts(cls) -> Future:
def do_get_chromecasts():
if not ChromecastPlayer.getting_chromecasts:
logging.info('Getting Chromecasts')
ChromecastPlayer.getting_chromecasts = True
ChromecastPlayer.chromecasts = pychromecast.get_chromecasts()
else:
logging.info('Already getting Chromecasts... busy wait')
while ChromecastPlayer.getting_chromecasts:
sleep(0.1)
ChromecastPlayer.getting_chromecasts = False
return ChromecastPlayer.chromecasts
return ChromecastPlayer.executor.submit(do_get_chromecasts)
@@ -266,7 +278,7 @@ class ChromecastPlayer(Player):
self.chromecast.register_status_listener(
ChromecastPlayer.cast_status_listener)
self.chromecast.wait()
print(f'Using: {self.chromecast.device.friendly_name}')
logging.info(f'Using: {self.chromecast.device.friendly_name}')
def __init__(
self,

1
sublime/ui/playlists.py
View File

@@ -220,7 +220,6 @@ class PlaylistList(Gtk.Box):
def create_playlist(self, playlist_name):
def on_playlist_created(f):
print(f)
CacheManager.invalidate_playlists_cache()
self.update(force=True)