Merge branch 'develop' into bugfix/issue-335-drop-caching

.travis.yml

@@ -4,20 +4,27 @@ sudo: required
 language: python
 python:
   - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
 virtualenv:
   system_site_packages: false
 
 cache: pip
 
 env:
     - FLAKE8=false
-    - FLAKE8=true
+
+jobs:
+  include:
+  - python: 3.5
+    env: FLAKE8=true
 
 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 python3-pil
     # newer version of pydcio requires newer version of libcdio than travis has
     - pip install pycdio==0.21
     # install rest of dependencies

COVERAGE

@@ -1,4 +1,4 @@
-Coverage.py 4.5.4 text report against whipper v0.8.0
+Coverage.py 4.5.4 text report against whipper v0.9.0
 
 $ coverage run --branch --omit='whipper/test/*' --source=whipper -m unittest discover
 $ coverage report -m
@@ -10,46 +10,46 @@ whipper/__main__.py                   7      7      2      0     0%   4-14
 whipper/command/__init__.py           0      0      0      0   100%
 whipper/command/accurip.py           41     41     18      0     0%   21-90
 whipper/command/basecommand.py       69     29     30      8    53%   70, 72, 76, 82-88, 98-102, 107-114, 127, 129, 133, 139, 142-145, 68->70, 71->72, 75->76, 80->82, 96->98, 106->107, 126->127, 128->129
-whipper/command/cd.py               227    189     60      0    13%   72-80, 85-196, 199, 212, 236-288, 295-322, 325-496
+whipper/command/cd.py               227    189     60      0    13%   72-80, 85-196, 199, 212, 236-288, 295-321, 324-493
 whipper/command/drive.py             57     57     10      0     0%   21-107
-whipper/command/image.py             38     38      6      0     0%   21-76
-whipper/command/main.py              68     68     22      0     0%   4-116
+whipper/command/image.py             37     37      6      0     0%   21-75
+whipper/command/main.py              68     68     24      0     0%   4-116
 whipper/command/mblookup.py          29      3      8      2    86%   21-23, 35->37, 37->28
 whipper/command/offset.py           110    110     32      0     0%   21-219
 whipper/common/__init__.py            0      0      0      0   100%
-whipper/common/accurip.py           132      5     54      5    95%   119, 125, 134-136, 114->119, 120->125, 150->153, 241->247, 250->256
-whipper/common/cache.py             104     49     34      6    44%   66-90, 96, 99, 108-111, 114-115, 131, 143-147, 170-177, 201-206, 211-227, 95->96, 98->99, 130->131, 141->151, 142->143, 169->170
+whipper/common/accurip.py           132      5     62      4    95%   118, 124, 133-135, 113->118, 119->124, 241->247, 251->257
+whipper/common/cache.py             100     48     34      5    44%   66-90, 96, 99, 107-110, 113-114, 138-142, 165-172, 196-201, 206-222, 95->96, 98->99, 136->146, 137->138, 164->165
 whipper/common/checksum.py           26     14      2      0    43%   41-42, 45-46, 49-64
 whipper/common/common.py            150     28     38      6    78%   51-52, 119-120, 143-144, 162-169, 181, 274-279, 286-291, 328-332, 118->119, 131->134, 180->181, 190->197, 271->274, 326->334
-whipper/common/config.py             91      8     18      4    89%   105-106, 124-125, 131, 141, 143, 145, 130->131, 140->141, 142->143, 144->145
-whipper/common/directory.py          21      8     10      2    55%   29, 39, 44-51, 28->29, 38->39
-whipper/common/drive.py              31     20      6      0    35%   35-40, 44-50, 54-60, 64-71
+whipper/common/config.py             90      8     18      4    89%   104-105, 123-124, 130, 140, 142, 144, 129->130, 139->140, 141->142, 143->144
+whipper/common/directory.py          18      5      4      0    68%   42-48
+whipper/common/drive.py              31     20      8      0    33%   35-40, 44-50, 54-60, 64-71
 whipper/common/encode.py             44     23      2      0    46%   37-38, 41-42, 45-46, 53-56, 59-60, 63-64, 76-77, 80-81, 84-91
 whipper/common/mbngs.py             174     52     66      7    70%   38-39, 45, 93-99, 174-175, 180-181, 227, 233, 258-260, 269, 289-344, 159->158, 173->174, 179->180, 226->227, 232->233, 257->258, 266->269
-whipper/common/path.py               24      0      8      3    91%   42->45, 52->57, 62->67
-whipper/common/program.py           346    268    112      5    19%   85-87, 93-104, 113-147, 156-161, 164, 169-173, 218, 229-230, 232-236, 253-268, 276-387, 398-456, 464-472, 476-491, 502-542, 554-571, 574-592, 595-605, 608-616, 76->79, 215->218, 228->229, 231->232, 238->242
+whipper/common/path.py               24      0      8      3    91%   42->45, 52->56, 60->65
+whipper/common/program.py           345    267    117      5    19%   85-87, 93-104, 113-147, 156-161, 164, 169-173, 218, 229-230, 232-236, 253-268, 276-386, 397-455, 463-471, 475-490, 501-540, 552-569, 572-590, 593-603, 606-614, 76->79, 215->218, 228->229, 231->232, 238->242
 whipper/common/renamer.py           102      2     16      1    97%   133, 156, 58->66
-whipper/common/task.py               77     19     14      2    75%   47-52, 86-87, 91-94, 102, 115-116, 123, 129, 135, 141, 147, 84->86, 99->102
+whipper/common/task.py               77     15     14      2    79%   47-52, 86-87, 102, 115-116, 123, 129, 135, 141, 147, 84->86, 99->102
 whipper/extern/__init__.py            0      0      0      0   100%
-whipper/extern/asyncsub.py          130     71     66     12    40%   15-17, 32, 37-38, 47-84, 89-102, 115, 122, 134, 145, 151, 156-160, 164-176, 14->15, 35->37, 45->47, 110->113, 114->115, 121->122, 133->134, 139->141, 141->152, 144->145, 148->151, 163->164
-whipper/extern/freedb.py            104     83     38      1    17%   49, 57-58, 61, 64, 84-163, 171-223, 56->57
+whipper/extern/asyncsub.py          112     55     58     11    46%   15-17, 32, 37-38, 47-84, 89-102, 115, 122, 134, 145, 151, 14->15, 35->37, 45->47, 110->113, 114->115, 121->122, 133->134, 139->141, 141->152, 144->145, 148->151
+whipper/extern/freedb.py             90     72     42      0    17%   46, 54, 74-153, 160-199
 whipper/extern/task/__init__.py       0      0      0      0   100%
-whipper/extern/task/task.py         271    115     54     11    53%   54, 58, 79, 87, 153-155, 174-176, 184-200, 218-221, 242-243, 284-285, 288-294, 309-310, 318-320, 329-336, 342-359, 363, 366, 373-390, 401-402, 405-408, 412, 415, 430, 433-435, 451, 463, 509-514, 521-526, 535-543, 546-554, 557-558, 566, 571-573, 53->54, 57->58, 66->68, 152->153, 166->exit, 217->218, 231->233, 236->exit, 498->500, 532->535, 570->571
+whipper/extern/task/task.py         270    115     56     11    53%   53, 59, 78, 86, 152-154, 173-175, 183-199, 217-220, 241-242, 283-284, 287-293, 308-309, 317-319, 328-335, 341-358, 362, 365, 372-389, 400-401, 404-407, 411, 414, 429, 432-434, 450, 462, 508-513, 520-525, 534-542, 545-553, 556-557, 565, 570-572, 52->53, 56->59, 65->67, 151->152, 165->exit, 216->217, 230->232, 235->exit, 497->499, 531->534, 569->570
 whipper/image/__init__.py             0      0      0      0   100%
-whipper/image/cue.py                 91      9     20      3    89%   99, 116-117, 132-134, 159, 187, 205, 98->99, 115->116, 131->132
+whipper/image/cue.py                 91      9     20      3    89%   98, 115-116, 131-133, 158, 186, 204, 97->98, 114->115, 130->131
 whipper/image/image.py              116     93     18      0    17%   49-57, 65-67, 74-107, 121-154, 157-173, 184-214
-whipper/image/table.py              395     18    114     16    93%   238, 497, 576, 661-662, 682-683, 692-695, 746, 792-793, 795-796, 840-841, 846-848, 181->184, 496->497, 530->534, 553->556, 575->576, 583->590, 681->682, 690->696, 691->692, 720->724, 724->719, 745->746, 791->792, 794->795, 839->840, 845->846
-whipper/image/toc.py                203     16     60     10    90%   134, 261-262, 278-281, 339-341, 363-365, 385, 409, 439, 130->134, 212->220, 260->261, 277->278, 287->292, 323->330, 338->339, 362->363, 372->376, 404->409
+whipper/image/table.py              394     18    120     16    93%   240, 499, 578, 663-664, 684-685, 694-697, 748, 794-795, 797-798, 842-843, 848-850, 180->183, 498->499, 532->536, 555->558, 577->578, 585->592, 683->684, 692->698, 693->694, 722->726, 726->721, 747->748, 793->794, 796->797, 841->842, 847->848
+whipper/image/toc.py                203     16     60     10    90%   133, 260-261, 277-280, 338-340, 362-364, 384, 408, 438, 129->133, 211->219, 259->260, 276->277, 286->291, 322->329, 337->338, 361->362, 371->375, 403->408
 whipper/program/__init__.py           0      0      0      0   100%
 whipper/program/arc.py                3      0      0      0   100%
-whipper/program/cdparanoia.py       309    180     78      2    39%   48-50, 59-60, 124-126, 198-199, 239-253, 256-306, 309-347, 350-354, 357-393, 447-500, 505-552, 586-589, 592, 599, 607-612, 123->124, 598->599
-whipper/program/cdrdao.py           114     75     34      2    28%   33-58, 80-86, 90-105, 108-137, 140-144, 147-161, 168-171, 181-183, 187-189, 180->181, 186->187
+whipper/program/cdparanoia.py       307    179     78      2    39%   48-50, 59-60, 124-126, 198-199, 239-253, 256-306, 309-347, 350-354, 357-393, 447-499, 504-551, 585-588, 591, 598, 606-611, 123->124, 597->598
+whipper/program/cdrdao.py           113     74     32      2    28%   33-58, 80-86, 90-105, 108-137, 140-144, 147-160, 167-170, 180-182, 186-188, 179->180, 185->186
 whipper/program/flac.py               9      5      0      0    44%   12-19
 whipper/program/sox.py               17      4      4      2    71%   18-19, 23-24, 17->18, 22->23
-whipper/program/soxi.py              28      2      2      1    90%   36, 49, 48->49
+whipper/program/soxi.py              28      2      4      1    91%   36, 49, 48->49
 whipper/program/utils.py             23     16      2      0    28%   12-17, 25-31, 42-47
 whipper/result/__init__.py            0      0      0      0   100%
 whipper/result/logger.py            144     23     40     16    78%   68, 84-92, 112, 123, 128, 130, 134-135, 143, 202, 240, 244-245, 252-253, 67->68, 83->84, 111->112, 122->123, 127->128, 129->130, 133->134, 142->143, 201->202, 213->217, 217->222, 222->226, 226->230, 234->244, 236->240, 249->252
 whipper/result/result.py             57     13      6      0    70%   115-119, 137, 148-149, 158-165
 -----------------------------------------------------------------------------
-TOTAL                              3997   1766   1108    129    53%
+TOTAL                              3950   1727   1123    123    53%

Dockerfile

@@ -1,52 +1,75 @@
 FROM debian:buster
 
-RUN apt-get update \
-  && apt-get install -y autoconf cdrdao curl eject flac gir1.2-glib-2.0 git libiso9660-dev \
-  libsndfile1-dev libtool locales make pkgconf python3-gi \
-  python3-musicbrainzngs python3-mutagen python3-pip python3-requests \
-  python3-ruamel.yaml python3-setuptools sox swig \
-  && pip3 install pycdio==2.1.0
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    autoconf \
+    automake \
+    cdrdao \
+    bzip2 \
+    curl \
+    eject \
+    flac \
+    gir1.2-glib-2.0 \
+    git \
+    libdiscid0 \
+    libiso9660-dev \
+    libsndfile1-dev \
+    libtool \
+    locales \
+    make \
+    pkgconf \
+    python3-dev \
+    python3-gi \
+    python3-musicbrainzngs \
+    python3-mutagen \
+    python3-pil \
+    python3-pip \
+    python3-requests \
+    python3-ruamel.yaml \
+    python3-setuptools \
+    sox \
+    swig \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+    && 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
 RUN curl -o - 'https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2' | tar jxf - \
-  && cd libcdio-2.1.0 \
-  && autoreconf -fi \
-  && ./configure --disable-dependency-tracking --disable-cxx --disable-example-progs --disable-static \
-  && make install \
-  && cd .. \
-  && rm -rf libcdio-2.1.0
+    && cd libcdio-2.1.0 \
+    && autoreconf -fi \
+    && ./configure --disable-dependency-tracking --disable-cxx --disable-example-progs --disable-static \
+    && make install \
+    && cd .. \
+    && rm -rf libcdio-2.1.0
 
 # Install cd-paranoia from tarball
 RUN curl -o - 'https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2' | tar jxf - \
-  && cd libcdio-paranoia-10.2+2.0.0 \
-  && autoreconf -fi \
-  && ./configure --disable-dependency-tracking --disable-example-progs --disable-static \
-  && make install \
-  && cd .. \ 
-  && rm -rf libcdio-paranoia-10.2+2.0.0
+    && cd libcdio-paranoia-10.2+2.0.0 \
+    && autoreconf -fi \
+    && ./configure --disable-dependency-tracking --disable-example-progs --disable-static \
+    && make install \
+    && cd .. \
+    && rm -rf libcdio-paranoia-10.2+2.0.0
 
 RUN ldconfig
 
 # add user
 RUN useradd -m worker -G cdrom \
-  && mkdir -p /output /home/worker/.config/whipper \
-  && chown worker: /output /home/worker/.config/whipper
+    && mkdir -p /output /home/worker/.config/whipper \
+    && chown worker: /output /home/worker/.config/whipper
 VOLUME ["/home/worker/.config/whipper", "/output"]
 
 # setup locales + cleanup
 RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
-  && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-  && echo "LANG=en_US.UTF-8" > /etc/locale.conf \
-  && locale-gen en_US.UTF-8 \
-  && apt-get clean && apt-get autoremove -y
+    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+    && echo "LANG=en_US.UTF-8" > /etc/locale.conf \
+    && locale-gen en_US.UTF-8
 
 # install whipper
 RUN mkdir /whipper
 COPY . /whipper/
 RUN cd /whipper && python3 setup.py install \
-  && rm -rf /whipper \
-  && whipper -v
+    && rm -rf /whipper \
+    && whipper -v
 
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US