diff --git a/assets/database_structure.sql b/assets/database_structure.sql deleted file mode 100644 index 293f428..0000000 --- a/assets/database_structure.sql +++ /dev/null @@ -1,66 +0,0 @@ -DROP TABLE IF EXISTS artist; -CREATE TABLE artist ( - id TEXT PRIMARY KEY NOT NULL, - name TEXT -); - -DROP TABLE IF EXISTS artist_release_group; -CREATE TABLE artist_release_group ( - artist_id TEXT NOT NULL, - release_group_id TEXT NOT NULL -); - -DROP TABLE IF EXISTS artist_track; -CREATE TABLE artist_track ( - artist_id TEXT NOT NULL, - track_id TEXT NOT NULL -); - -DROP TABLE IF EXISTS release_group; -CREATE TABLE release_group ( - id TEXT PRIMARY KEY NOT NULL, - albumartist TEXT, - albumsort INT, - musicbrainz_albumtype TEXT, - compilation TEXT, - album_artist_id TEXT -); - -DROP TABLE IF EXISTS release_; -CREATE TABLE release_ ( - id TEXT PRIMARY KEY NOT NULL, - release_group_id TEXT NOT NULL, - title TEXT, - copyright TEXT, - album_status TEXT, - language TEXT, - year TEXT, - date TEXT, - country TEXT, - barcode TEXT -); - -DROP TABLE IF EXISTS track; -CREATE TABLE track ( - id TEXT PRIMARY KEY NOT NULL, - downloaded BOOLEAN NOT NULL DEFAULT 0, - release_id TEXT NOT NULL, - track TEXT, - length INT, - tracknumber TEXT, - isrc TEXT, - genre TEXT, - lyrics TEXT, - path TEXT, - file TEXT, - url TEXT, - src TEXT -); - -DROP TABLE IF EXISTS source; -CREATE TABLE source ( - track_id TEXT NOT NULL, - src TEXT NOT NULL, - url TEXT NOT NULL, - valid BOOLEAN NOT NULL DEFAULT 1 -); diff --git a/assets/logo.svg b/assets/logo.svg index 49738fc..eb043bc 100644 --- a/assets/logo.svg +++ b/assets/logo.svg @@ -1,73 +1,35 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/assets/logos/.png b/assets/logos/.png deleted file mode 100644 index df21544..0000000 Binary files a/assets/logos/.png and /dev/null differ diff --git a/assets/logos/00.jpg b/assets/logos/00.jpg deleted file mode 100644 index a4f0a94..0000000 Binary files a/assets/logos/00.jpg and /dev/null differ diff --git a/assets/logos/01.png b/assets/logos/01.png deleted file mode 100644 index e0c807d..0000000 Binary files a/assets/logos/01.png and /dev/null differ diff --git a/assets/logos/01.svg b/assets/logos/01.svg deleted file mode 100644 index 13e2386..0000000 --- a/assets/logos/01.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/assets/logos/02.png b/assets/logos/02.png deleted file mode 100644 index 1bc91de..0000000 Binary files a/assets/logos/02.png and /dev/null differ diff --git a/assets/logos/02.svg b/assets/logos/02.svg deleted file mode 100644 index 49738fc..0000000 --- a/assets/logos/02.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.png b/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.png deleted file mode 100644 index 7c75bb2..0000000 Binary files a/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.png and /dev/null differ diff --git a/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.svg b/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.svg deleted file mode 100644 index bac4a90..0000000 --- a/assets/logos/craiyon_142854_simplistic_black_and_white_logo_of_an_octopus_wearing_headphones__svg__cute__octupus.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/logos/craiyon_144924_simplistic__black_and_white_logo__octopus_wearing_headphones__svg__cute__in_frame__ce.png b/assets/logos/craiyon_144924_simplistic__black_and_white_logo__octopus_wearing_headphones__svg__cute__in_frame__ce.png deleted file mode 100644 index df21544..0000000 Binary files a/assets/logos/craiyon_144924_simplistic__black_and_white_logo__octopus_wearing_headphones__svg__cute__in_frame__ce.png and /dev/null differ diff --git a/assets/temp_database_structure.sql b/assets/temp_database_structure.sql deleted file mode 100644 index 293f428..0000000 --- a/assets/temp_database_structure.sql +++ /dev/null @@ -1,66 +0,0 @@ -DROP TABLE IF EXISTS artist; -CREATE TABLE artist ( - id TEXT PRIMARY KEY NOT NULL, - name TEXT -); - -DROP TABLE IF EXISTS artist_release_group; -CREATE TABLE artist_release_group ( - artist_id TEXT NOT NULL, - release_group_id TEXT NOT NULL -); - -DROP TABLE IF EXISTS artist_track; -CREATE TABLE artist_track ( - artist_id TEXT NOT NULL, - track_id TEXT NOT NULL -); - -DROP TABLE IF EXISTS release_group; -CREATE TABLE release_group ( - id TEXT PRIMARY KEY NOT NULL, - albumartist TEXT, - albumsort INT, - musicbrainz_albumtype TEXT, - compilation TEXT, - album_artist_id TEXT -); - -DROP TABLE IF EXISTS release_; -CREATE TABLE release_ ( - id TEXT PRIMARY KEY NOT NULL, - release_group_id TEXT NOT NULL, - title TEXT, - copyright TEXT, - album_status TEXT, - language TEXT, - year TEXT, - date TEXT, - country TEXT, - barcode TEXT -); - -DROP TABLE IF EXISTS track; -CREATE TABLE track ( - id TEXT PRIMARY KEY NOT NULL, - downloaded BOOLEAN NOT NULL DEFAULT 0, - release_id TEXT NOT NULL, - track TEXT, - length INT, - tracknumber TEXT, - isrc TEXT, - genre TEXT, - lyrics TEXT, - path TEXT, - file TEXT, - url TEXT, - src TEXT -); - -DROP TABLE IF EXISTS source; -CREATE TABLE source ( - track_id TEXT NOT NULL, - src TEXT NOT NULL, - url TEXT NOT NULL, - valid BOOLEAN NOT NULL DEFAULT 1 -); diff --git a/music_kraken/connection/connection.py b/music_kraken/connection/connection.py index 407e21f..a570fd0 100644 --- a/music_kraken/connection/connection.py +++ b/music_kraken/connection/connection.py @@ -228,10 +228,10 @@ class Connection: self.lock = False if r is None: - self.LOGGER.warning(f"{self.HOST.netloc} didn't respond at {url}. ({try_count}-{self.TRIES})") + self.LOGGER.warning(f"{parsed_url.netloc} didn't respond at {url}. ({try_count}-{self.TRIES})") self.LOGGER.debug("request headers:\n\t"+ "\n\t".join(f"{k}\t=\t{v}" for k, v in headers.items())) else: - self.LOGGER.warning(f"{self.HOST.netloc} responded wit {r.status_code} at {url}. ({try_count}-{self.TRIES})") + self.LOGGER.warning(f"{parsed_url.netloc} responded wit {r.status_code} at {url}. ({try_count}-{self.TRIES})") self.LOGGER.debug("request headers:\n\t"+ "\n\t".join(f"{k}\t=\t{v}" for k, v in r.request.headers.items())) self.LOGGER.debug("response headers:\n\t"+ "\n\t".join(f"{k}\t=\t{v}" for k, v in r.headers.items())) self.LOGGER.debug(r.content)