From dc8c1555ea07f378b6df376c4f2f1c22969a94c7 Mon Sep 17 00:00:00 2001 From: Ralf Stemmer Date: Tue, 14 Jan 2020 16:26:58 +0100 Subject: [PATCH 1/2] Update of history and moving docker-content to a different section --- README.md | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 8464bab5..5a5795ce 100644 --- a/README.md +++ b/README.md @@ -2,38 +2,22 @@ # MusicDB -MusicDB is a music manager with focus on remote access to your music using a WebUI to. -manage an audio stream. -The WebUI is more a presentation of your music than a database frontend. +MusicDB is a music manager with focus on remote access to your music collection using a WebUI. +It allows you to manage an audio stream based on a song-queue. +The WebUI is focusing on being a presentation of your music rather than being a database frontend. So, when you are listening to your music, you do not work with software. Instead you explore your music collection. -**For more details, a list of features and screenshots see the start page [rstemmer.github.io/musicdb/](https://rstemmer.github.io/musicdb/index.html).** - ---- - -Until now I spent over 6 years for developing this awesome software. +I started this project on 4th January 2014. Since I finished a first test version, I use it nearly every day. Time to share it with the world. :smiley: -For news, follow [@MusicDBProject](https://twitter.com/MusicDBProject) on Twitter. - +**For more details, a list of features and screenshots see the start page [rstemmer.github.io/musicdb/](https://rstemmer.github.io/musicdb/index.html).** A detailed description of MusicDB and its components can be found in the documentation: [Overview of MusicDB](https://rstemmer.github.io/musicdb/build/html/basics/overview.html) - -## Docker-Bases Demo - -It is possible to run a Demo installation via Docker container. -Just clone this repository and execute the scripts in the docker sub-directory. - -```sh -git clone https://github.com/rstemmer/musicdb.git -cd musicdb -./docker/build.sh -./docker/run.sh -``` +For news, follow [@MusicDBProject](https://twitter.com/MusicDBProject) on Twitter. ## Important News @@ -175,6 +159,19 @@ Some helpful hints: If there are any problems setting up MusicDB, create an issue. +## Docker-Based Demo + +It is possible to run a Demo installation via Docker container. +Just clone this repository and execute the scripts in the docker sub-directory. + +```sh +git clone https://github.com/rstemmer/musicdb.git +cd musicdb +./docker/build.sh +./docker/run.sh +``` + + # Development This section describes how to contribute to this project. From 99dc258eb19d9f1697d5d3f6fcf8ebfda8d864d3 Mon Sep 17 00:00:00 2001 From: Ralf Stemmer Date: Sat, 25 Apr 2020 15:39:59 +0200 Subject: [PATCH 2/2] Fixed wrong interpretation of relative path arguments --- VERSION | 1 + mod/artwork.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/VERSION b/VERSION index 36275213..fb068551 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,4 @@ +5.2.2 - [artwork] Fixed wrong interpretation of relative path arguments 5.2.1 - [artwork] Fixed a bug that make the --album or --artwork option crash 5.2.0 - SEE CHANGELOG 5.1.1 - Some CSS-Updates to increase font size on 4k screens diff --git a/mod/artwork.py b/mod/artwork.py index d417138f..c9c5e829 100644 --- a/mod/artwork.py +++ b/mod/artwork.py @@ -103,6 +103,8 @@ def UpdateAlbum(self, albumpath, artworkpath=None): This method does partial update and can be used to force a specific artwork. If *artworkpath* is given, that artwork will be copied to the cache instead of extraction one from the metadata. + This method expects absolute paths or paths relative to the music root directory. + Args: albumpath (str): Path to an album. This can be absolute or relative to the music directory. artworkpath (str / NoneType): Absolute path to the artwork that shall be used if given. @@ -136,6 +138,18 @@ def UpdateAlbum(self, albumpath, artworkpath=None): def MDBM_Main(self, args): + # Make user paths absolute and check if they exist + if args.artwork: + args.artwork = os.path.abspath(args.artwork) + if not os.path.exists(args.artwork): + print("\033[1;31mERROR: Artwork path "+args.artwork+" does not exist!\033[0m") + return 1 + + if args.album: + args.album = os.path.abspath(args.album) + if not os.path.exists(args.album): + print("\033[1;31mERROR: Album path "+args.album+" does not exist!\033[0m") + return 1 # Update Cache and Manifest if args.update: