From 8c41f4ddb3c37cfa104e702636948effc93c3b57 Mon Sep 17 00:00:00 2001
From: ABCbum <kimlong221002@gmail.com>
Date: Sun, 22 Dec 2019 11:34:40 +0700
Subject: [PATCH] Update whipper's dependencies

whipper now requires `discid` package - which can be installed through
pip and `discid` relies on libdiscid.

Signed-off-by: ABCbum <kimlong221002@gmail.com>
---
 .travis.yml      | 2 +-
 Dockerfile       | 3 ++-
 README.md        | 2 ++
 requirements.txt | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7aa1d08..3dd3a75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ install:
     # Dependencies
     - sudo apt-get -qq update
     - pip install --upgrade -qq pip
-    - sudo apt-get -qq install cdparanoia cdrdao flac gir1.2-glib-2.0 libcdio-dev libgirepository1.0-dev libiso9660-dev libsndfile1-dev sox swig libcdio-utils
+    - sudo apt-get -qq install cdparanoia cdrdao flac gir1.2-glib-2.0 libcdio-dev libgirepository1.0-dev libiso9660-dev libsndfile1-dev sox swig libcdio-utils libdiscid0
     # newer version of pydcio requires newer version of libcdio than travis has
     - pip install pycdio==0.21
     # install rest of dependencies
diff --git a/Dockerfile b/Dockerfile
index 7a89763..73cb13d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     flac \
     gir1.2-glib-2.0 \
     git \
+    libdiscid0 \
     libiso9660-dev \
     libsndfile1-dev \
     libtool \
@@ -27,7 +28,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     sox \
     swig \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && pip3 --no-cache-dir install pycdio==2.1.0
+    && pip3 --no-cache-dir install pycdio==2.1.0 discid
 
 # libcdio-paranoia / libcdio-utils are wrongfully packaged in Debian, thus built manually
 # see https://github.com/whipper-team/whipper/pull/237#issuecomment-367985625
diff --git a/README.md b/README.md
index 5c77e5b..85823c1 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ Whipper relies on the following packages in order to run correctly and provide a
 - [setuptools](https://pypi.python.org/pypi/setuptools), for installation, plugins support
 - [requests](https://pypi.python.org/pypi/requests), for retrieving AccurateRip database entries
 - [pycdio](https://pypi.python.org/pypi/pycdio/), for drive identification (required for drive offset and caching behavior to be stored in the configuration file).
+- [discid](https://pypi.org/project/discid/), for calculating Musicbrainz disc id.
   - To avoid bugs it's advised to use the most recent `pycdio` version with the corresponding `libcdio` release or, if stuck to old pycdio versions, **0.20**/**0.21** with `libcdio` ≥ **0.90** ≤ **0.94**. All other combinations won't probably work.
 - [ruamel.yaml](https://pypi.org/project/ruamel.yaml/), for generating well formed YAML report logfiles
 - [libsndfile](http://www.mega-nerd.com/libsndfile/), for reading wav files
@@ -148,6 +149,7 @@ Some dependencies aren't available in the PyPI. They can be probably installed u
 - [flac](https://xiph.org/flac/)
 - [sox](http://sox.sourceforge.net/)
 - [git](https://git-scm.com/) or [mercurial](https://www.mercurial-scm.org/)
+- [libdiscid](https://musicbrainz.org/doc/libdiscid)
 
 PyPI installable dependencies are listed in the [requirements.txt](https://github.com/whipper-team/whipper/blob/master/requirements.txt) file and can be installed issuing the following command:
 
diff --git a/requirements.txt b/requirements.txt
index cdbc373..0f3a62e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ PyGObject
 requests
 ruamel.yaml
 setuptools_scm
+discid
\ No newline at end of file