Skip to content

Commit b1718a2

Browse files
JoeLamettaJoeLametta
committed
Merge branch 'develop'
2 parents 4238e71 + c13f541 commit b1718a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+578
-660
lines changed

‎.github/config.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/stale.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/greetings.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Greetings
2+
3+
on: [pull_request, issues]
4+
5+
jobs:
6+
greeting:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/first-interaction@v1
10+
with:
11+
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
issue-message: |
13+
👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
14+
15+
To help make it easier for us to investigate your issue, please follow the [contributing instructions](https://github.com/whipper-team/whipper#bug-reports--feature-requests).
16+
pr-message: '💖 Thanks for opening your first pull request here! 💖'

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: required
33

44
language: python
55
python:
6-
- "2.7"
6+
- "3.5"
77
virtualenv:
88
system_site_packages: false
99

‎CHANGELOG.md

Lines changed: 61 additions & 43 deletions
Large diffs are not rendered by default.

‎COVERAGE

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Coverage.py 4.5.4 text report against whipper v0.8.0
1+
Coverage.py 4.5.4 text report against whipper v0.9.0
22

33
$ coverage run --branch --omit='whipper/test/*' --source=whipper -m unittest discover
44
$ coverage report -m
@@ -10,46 +10,46 @@ whipper/__main__.py 7 7 2 0 0% 4-14
1010
whipper/command/__init__.py 0 0 0 0 100%
1111
whipper/command/accurip.py 41 41 18 0 0% 21-90
1212
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
13-
whipper/command/cd.py 227 189 60 0 13% 72-80, 85-196, 199, 212, 236-288, 295-322, 325-496
13+
whipper/command/cd.py 227 189 60 0 13% 72-80, 85-196, 199, 212, 236-288, 295-321, 324-493
1414
whipper/command/drive.py 57 57 10 0 0% 21-107
15-
whipper/command/image.py 38 38 6 0 0% 21-76
16-
whipper/command/main.py 68 68 22 0 0% 4-116
15+
whipper/command/image.py 37 37 6 0 0% 21-75
16+
whipper/command/main.py 68 68 24 0 0% 4-116
1717
whipper/command/mblookup.py 29 3 8 2 86% 21-23, 35->37, 37->28
1818
whipper/command/offset.py 110 110 32 0 0% 21-219
1919
whipper/common/__init__.py 0 0 0 0 100%
20-
whipper/common/accurip.py 132 5 54 5 95% 119, 125, 134-136, 114->119, 120->125, 150->153, 241->247, 250->256
21-
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
20+
whipper/common/accurip.py 132 5 62 4 95% 118, 124, 133-135, 113->118, 119->124, 241->247, 251->257
21+
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
2222
whipper/common/checksum.py 26 14 2 0 43% 41-42, 45-46, 49-64
2323
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
24-
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
25-
whipper/common/directory.py 21 8 10 2 55% 29, 39, 44-51, 28->29, 38->39
26-
whipper/common/drive.py 31 20 6 0 35% 35-40, 44-50, 54-60, 64-71
24+
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
25+
whipper/common/directory.py 18 5 4 0 68% 42-48
26+
whipper/common/drive.py 31 20 8 0 33% 35-40, 44-50, 54-60, 64-71
2727
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
2828
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
29-
whipper/common/path.py 24 0 8 3 91% 42->45, 52->57, 62->67
30-
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
29+
whipper/common/path.py 24 0 8 3 91% 42->45, 52->56, 60->65
30+
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
3131
whipper/common/renamer.py 102 2 16 1 97% 133, 156, 58->66
32-
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
32+
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
3333
whipper/extern/__init__.py 0 0 0 0 100%
34-
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
35-
whipper/extern/freedb.py 104 83 38 1 17% 49, 57-58, 61, 64, 84-163, 171-223, 56->57
34+
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
35+
whipper/extern/freedb.py 90 72 42 0 17% 46, 54, 74-153, 160-199
3636
whipper/extern/task/__init__.py 0 0 0 0 100%
37-
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
37+
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
3838
whipper/image/__init__.py 0 0 0 0 100%
39-
whipper/image/cue.py 91 9 20 3 89% 99, 116-117, 132-134, 159, 187, 205, 98->99, 115->116, 131->132
39+
whipper/image/cue.py 91 9 20 3 89% 98, 115-116, 131-133, 158, 186, 204, 97->98, 114->115, 130->131
4040
whipper/image/image.py 116 93 18 0 17% 49-57, 65-67, 74-107, 121-154, 157-173, 184-214
41-
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
42-
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
41+
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
42+
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
4343
whipper/program/__init__.py 0 0 0 0 100%
4444
whipper/program/arc.py 3 0 0 0 100%
45-
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
46-
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
45+
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
46+
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
4747
whipper/program/flac.py 9 5 0 0 44% 12-19
4848
whipper/program/sox.py 17 4 4 2 71% 18-19, 23-24, 17->18, 22->23
49-
whipper/program/soxi.py 28 2 2 1 90% 36, 49, 48->49
49+
whipper/program/soxi.py 28 2 4 1 91% 36, 49, 48->49
5050
whipper/program/utils.py 23 16 2 0 28% 12-17, 25-31, 42-47
5151
whipper/result/__init__.py 0 0 0 0 100%
5252
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
5353
whipper/result/result.py 57 13 6 0 70% 115-119, 137, 148-149, 158-165
5454
-----------------------------------------------------------------------------
55-
TOTAL 3997 1766 1108 129 53%
55+
TOTAL 3950 1727 1123 123 53%

‎Dockerfile

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,73 @@
11
FROM debian:buster
22

3-
RUN apt-get update \
4-
&& apt-get install -y cdrdao git python-gobject-2 python-musicbrainzngs python-mutagen \
5-
python-setuptools python-requests libsndfile1-dev flac sox \
6-
libiso9660-dev python-pip swig make pkgconf \
7-
eject locales \
8-
autoconf libtool curl \
9-
&& pip install pycdio==2.1.0
3+
RUN apt-get update && apt-get install --no-install-recommends -y \
4+
autoconf \
5+
automake \
6+
cdrdao \
7+
bzip2 \
8+
curl \
9+
eject \
10+
flac \
11+
gir1.2-glib-2.0 \
12+
git \
13+
libiso9660-dev \
14+
libsndfile1-dev \
15+
libtool \
16+
locales \
17+
make \
18+
pkgconf \
19+
python3-dev \
20+
python3-gi \
21+
python3-musicbrainzngs \
22+
python3-mutagen \
23+
python3-pip \
24+
python3-requests \
25+
python3-ruamel.yaml \
26+
python3-setuptools \
27+
sox \
28+
swig \
29+
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
30+
&& pip3 --no-cache-dir install pycdio==2.1.0
1031

1132
# libcdio-paranoia / libcdio-utils are wrongfully packaged in Debian, thus built manually
1233
# see https://github.com/whipper-team/whipper/pull/237#issuecomment-367985625
1334
RUN curl -o - 'https://ftp.gnu.org/gnu/libcdio/libcdio-2.1.0.tar.bz2' | tar jxf - \
14-
&& cd libcdio-2.1.0 \
15-
&& autoreconf -fi \
16-
&& ./configure --disable-dependency-tracking --disable-cxx --disable-example-progs --disable-static \
17-
&& make install \
18-
&& cd .. \
19-
&& rm -rf libcdio-2.1.0
35+
&& cd libcdio-2.1.0 \
36+
&& autoreconf -fi \
37+
&& ./configure --disable-dependency-tracking --disable-cxx --disable-example-progs --disable-static \
38+
&& make install \
39+
&& cd .. \
40+
&& rm -rf libcdio-2.1.0
2041

2142
# Install cd-paranoia from tarball
2243
RUN curl -o - 'https://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2' | tar jxf - \
23-
&& cd libcdio-paranoia-10.2+2.0.0 \
24-
&& autoreconf -fi \
25-
&& ./configure --disable-dependency-tracking --disable-example-progs --disable-static \
26-
&& make install \
27-
&& cd .. \
28-
&& rm -rf libcdio-paranoia-10.2+2.0.0
44+
&& cd libcdio-paranoia-10.2+2.0.0 \
45+
&& autoreconf -fi \
46+
&& ./configure --disable-dependency-tracking --disable-example-progs --disable-static \
47+
&& make install \
48+
&& cd .. \
49+
&& rm -rf libcdio-paranoia-10.2+2.0.0
2950

3051
RUN ldconfig
3152

3253
# add user
3354
RUN useradd -m worker -G cdrom \
34-
&& mkdir -p /output /home/worker/.config/whipper \
35-
&& chown worker: /output /home/worker/.config/whipper
55+
&& mkdir -p /output /home/worker/.config/whipper \
56+
&& chown worker: /output /home/worker/.config/whipper
3657
VOLUME ["/home/worker/.config/whipper", "/output"]
3758

3859
# setup locales + cleanup
3960
RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment \
40-
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
41-
&& echo "LANG=en_US.UTF-8" > /etc/locale.conf \
42-
&& locale-gen en_US.UTF-8 \
43-
&& apt-get clean && apt-get autoremove -y
61+
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
62+
&& echo "LANG=en_US.UTF-8" > /etc/locale.conf \
63+
&& locale-gen en_US.UTF-8
4464

4565
# install whipper
4666
RUN mkdir /whipper
4767
COPY . /whipper/
48-
RUN cd /whipper && python2 setup.py install \
49-
&& rm -rf /whipper \
50-
&& whipper -v
68+
RUN cd /whipper && python3 setup.py install \
69+
&& rm -rf /whipper \
70+
&& whipper -v
5171

5272
ENV LC_ALL=en_US.UTF-8
5373
ENV LANG=en_US

0 commit comments

Comments
 (0)