diff -Nru isrcsubmit-2.0.1/AUTHORS isrcsubmit-2.0.0/AUTHORS --- isrcsubmit-2.0.1/AUTHORS 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/AUTHORS 2014-05-05 15:12:54.000000000 +0000 @@ -22,6 +22,3 @@ Ulrich Klauer Jim Patterson - minor fixes - - Ville Skyttä - - mocking fix for the tests diff -Nru isrcsubmit-2.0.1/CHANGES.markdown isrcsubmit-2.0.0/CHANGES.markdown --- isrcsubmit-2.0.1/CHANGES.markdown 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/CHANGES.markdown 2014-05-05 15:12:54.000000000 +0000 @@ -1,9 +1,3 @@ -### Changes in 2.0.1 (2015-06-06) - * [#94] also install isrcsubmit-config.5 - * [#93] fix name 'FileNotFoundError' is not defined - * [#96] fix display of "missing backend" error - * [#98] be case insensitive for Y/N prompts - ### Changes in 2.0.0 (2014-05-05) * [#59] use libdiscid as isrc backend * [#6] use the NGS (WS/2) web service diff -Nru isrcsubmit-2.0.1/debian/bzr-builder.manifest isrcsubmit-2.0.0/debian/bzr-builder.manifest --- isrcsubmit-2.0.1/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ isrcsubmit-2.0.0/debian/bzr-builder.manifest 2015-06-12 08:04:08.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debversion} +lp:~jonnyjd/isrcsubmit/packaging revid:launchpad@jonnyjd.net-20140505163551-a7v7v87td0y22npe diff -Nru isrcsubmit-2.0.1/debian/changelog isrcsubmit-2.0.0/debian/changelog --- isrcsubmit-2.0.1/debian/changelog 2015-06-07 21:46:30.000000000 +0000 +++ isrcsubmit-2.0.0/debian/changelog 2015-06-12 08:04:08.000000000 +0000 @@ -1,47 +1,53 @@ -isrcsubmit (2.0.1-1) unstable; urgency=medium +isrcsubmit (2.0.0-0jonnyjd1~ubuntu15.10.1) wily; urgency=low - * New upstream release. - * debian/patches/mnapage.patch: Removed, applied upstream. - * debian/copyright: Update copyright years. - * debian/control: Document cdrdao in description. (Closes: #763885) + * Auto build. - -- Sebastian Ramacher Sun, 07 Jun 2015 23:46:29 +0200 + -- Johannes Dewender Fri, 12 Jun 2015 08:04:08 +0000 -isrcsubmit (2.0.0-2) unstable; urgency=medium +isrcsubmit (2.0.0-0jonnyjd1) UNRELEASED; urgency=low - * debian/patches/manpage.patch: Fix installation of manpages (Closes: - #773669) - * debian/control: Bump Standards-Version to 3.9.6, no changes required. + * New upstream release - -- Sebastian Ramacher Thu, 14 May 2015 17:52:42 +0200 + -- Johannes Dewender Mon, 05 May 2014 18:33:26 +0200 -isrcsubmit (2.0.0-1) unstable; urgency=medium +isrcsubmit (2.0.0~rc.1-0jonnyjd3) UNRELEASED; urgency=low - * New upstream release. - * debian/patches/extra-import.patch: Removed, applied upstream. - * debian/copyright: Update copyright years. + * Remove extra-import.patch again (applied upstream, git build) - -- Sebastian Ramacher Mon, 05 May 2014 17:25:39 +0200 + -- Johannes Dewender Wed, 05 Mar 2014 07:44:07 +0100 -isrcsubmit (2.0.0~rc.1-1) unstable; urgency=medium +isrcsubmit (2.0.0~rc.1-0jonnyjd2) UNRELEASED; urgency=low - * New upstream release. - * debian/rules: Run tests. - * debian/patches: - - libdiscid.patch: Replace discid with python_libdiscid in setup.py. - - extra-import.patch: get rid of extra import discid in test suite. - * debian/clean: Clean *.egg-info to be able to build twice in a row. + * Add patch extra-import.patch from upstream + + -- Johannes Dewender Tue, 04 Mar 2014 22:55:58 +0100 + +isrcsubmit (2.0.0~rc.1-0jonnyjd1) UNRELEASED; urgency=low + + * New upstream release + * Add python3-keyring to Recommends - -- Sebastian Ramacher Tue, 04 Mar 2014 14:47:53 +0100 + -- Johannes Dewender Tue, 04 Mar 2014 21:51:16 +0100 -isrcsubmit (2.0.0~beta.5-1) unstable; urgency=low +isrcsubmit (2.0.0~beta.5-0jonnyjd1) UNRELEASED; urgency=low - * Upload to unstable. * New upstream release. - * debian/patches: Removed, no longer needed. - * debian/control: Bump Standards-Version to 3.9.5. + * Remove patches (applied upstream) + + -- Johannes Dewender Wed, 16 Oct 2013 08:22:42 +0200 + +isrcsubmit (2.0.0~beta.4-1jonnyjd2) UNRELEASED; urgency=low + + * Remove dh-python depends for backporting + + -- Johannes Dewender Wed, 16 Oct 2013 00:34:11 +0200 + +isrcsubmit (2.0.0~beta.4-1jonnyjd1) UNRELEASED; urgency=low + + * Add python-discid as an alternative depends + * Add minimum versions to depends - -- Sebastian Ramacher Mon, 28 Oct 2013 22:31:00 +0100 + -- Johannes Dewender Tue, 15 Oct 2013 22:17:24 +0200 isrcsubmit (2.0.0~beta.4-1) experimental; urgency=low diff -Nru isrcsubmit-2.0.1/debian/control isrcsubmit-2.0.0/debian/control --- isrcsubmit-2.0.1/debian/control 2015-06-07 21:34:32.000000000 +0000 +++ isrcsubmit-2.0.0/debian/control 2015-06-12 08:04:07.000000000 +0000 @@ -5,12 +5,11 @@ Uploaders: Sebastian Ramacher Build-Depends: debhelper (>= 9), - dh-python, python3, - python3-libdiscid, + python3-discid (>= 1.0.0) | python3-libdiscid (>= 0.2.0), python3-musicbrainzngs (>= 0.4), - python3-sphinx -Standards-Version: 3.9.6 + python3-sphinx (>= 1.0) +Standards-Version: 3.9.4 Homepage: http://jonnyjd.github.io/musicbrainz-isrcsubmit/ X-Python3-Version: >= 3.1 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/isrcsubmit.git @@ -21,7 +20,7 @@ Depends: ${misc:Depends}, ${python3:Depends}, - python3-libdiscid, + python3-discid (>= 1.0.0) | python3-libdiscid (>= 0.2.0), python3-musicbrainzngs (>= 0.4) Recommends: cdrdao, @@ -34,7 +33,4 @@ data to MusicBrainz. ISRCs are used to uniquely identify sound and music video recordings. . - isrsubmit supports multiple backends to extract ISRCs: libdiscid (the default) - and cdrdao for discs that do not store ISRCs in the subchannel information. - . A valid MusicBrainz account is required to submit ISRCs. diff -Nru isrcsubmit-2.0.1/debian/copyright isrcsubmit-2.0.0/debian/copyright --- isrcsubmit-2.0.1/debian/copyright 2015-06-07 21:14:56.000000000 +0000 +++ isrcsubmit-2.0.0/debian/copyright 2015-06-12 08:04:07.000000000 +0000 @@ -4,11 +4,11 @@ Source: http://jonnyjd.github.io/musicbrainz-isrcsubmit/ Files: * -Copyright: 2009-2015 Johannes Dewender +Copyright: 2010-2013 Johannes Dewender License: GPL-3+ Files: debian/* -Copyright: 2013-2015 Sebastian Ramacher +Copyright: 2013 Sebastian Ramacher License: GPL-3+ License: GPL-3+ diff -Nru isrcsubmit-2.0.1/debian/patches/libdiscid.patch isrcsubmit-2.0.0/debian/patches/libdiscid.patch --- isrcsubmit-2.0.1/debian/patches/libdiscid.patch 2014-05-05 15:18:41.000000000 +0000 +++ isrcsubmit-2.0.0/debian/patches/libdiscid.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: Replace discid with python-libdiscid - discid is not in the archive, but python-libdiscid is. -Author: Sebastian Ramacher -Forwarded: not-needed -Last-Update: 2014-03-04 - ---- a/setup.py -+++ b/setup.py -@@ -49,7 +49,7 @@ - - args = {} - if have_setuptools: -- args["install_requires"] = ["discid >=1.0.0", "musicbrainzngs >=0.4"], -+ args["install_requires"] = ["python_libdiscid >=0.2", "musicbrainzngs >=0.4"], - # we load isrcsubmit on setup - args["setup_requires"] = args["install_requires"], - -@@ -99,7 +99,7 @@ - author="Johannes Dewender", - author_email="brainz@JonnyJD.net", - url="https://github.com/JonnyJD/musicbrainz-isrcsubmit", -- requires=["discid(>=1.0.0)", "musicbrainzngs(>=0.4)"], -+ requires=["python_libdiscid(>=0.2)", "musicbrainzngs(>=0.4)"], - scripts=["isrcsubmit.py"], - license="GPLv3+", - classifiers=[ diff -Nru isrcsubmit-2.0.1/debian/patches/series isrcsubmit-2.0.0/debian/patches/series --- isrcsubmit-2.0.1/debian/patches/series 2015-06-07 21:10:27.000000000 +0000 +++ isrcsubmit-2.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libdiscid.patch diff -Nru isrcsubmit-2.0.1/debian/rules isrcsubmit-2.0.0/debian/rules --- isrcsubmit-2.0.1/debian/rules 2015-06-07 21:13:36.000000000 +0000 +++ isrcsubmit-2.0.0/debian/rules 2015-06-12 08:04:07.000000000 +0000 @@ -9,20 +9,17 @@ override_dh_auto_build: python3 setup.py build +override_dh_auto_test: + python3 setup.py test + override_dh_auto_install: python3 setup.py install --root=debian/isrcsubmit \ --install-layout=deb \ --install-scripts=/usr/bin # get rid of .py - mv debian/isrcsubmit/usr/bin/isrcsubmit.py \ - debian/isrcsubmit/usr/bin/isrcsubmit + mv debian/isrcsubmit/usr/bin/isrcsubmit.py debian/isrcsubmit/usr/bin/isrcsubmit # there is no point in installing the egg rm -rf debian/isrcsubmit/usr/lib -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - python3 setup.py test -endif - override_dh_installchangelogs: dh_installchangelogs CHANGES.markdown diff -Nru isrcsubmit-2.0.1/debian/source/options isrcsubmit-2.0.0/debian/source/options --- isrcsubmit-2.0.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ isrcsubmit-2.0.0/debian/source/options 2015-06-12 08:04:07.000000000 +0000 @@ -0,0 +1 @@ +tar-ignore = .pc diff -Nru isrcsubmit-2.0.1/doc/conf.py isrcsubmit-2.0.0/doc/conf.py --- isrcsubmit-2.0.1/doc/conf.py 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/doc/conf.py 2014-05-05 15:12:54.000000000 +0000 @@ -44,7 +44,7 @@ # General information about the project. project = u'isrcsubmit' -copyright = u'2009-2015, Johannes Dewender' +copyright = u'2010-2013, Johannes Dewender' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff -Nru isrcsubmit-2.0.1/doc/isrcsubmit.1.rst isrcsubmit-2.0.0/doc/isrcsubmit.1.rst --- isrcsubmit-2.0.1/doc/isrcsubmit.1.rst 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/doc/isrcsubmit.1.rst 2014-05-05 15:12:54.000000000 +0000 @@ -34,7 +34,7 @@ -b , --backend= Force using a specific backend to extract ISRCs from the disc. Possible backends are: mediatools, media_info, cdrdao, libdiscid, discisrc. They are - tried in this order otherwise. See also :strong:`BACKENDS`. + tried in this order otherwise. --browser= Program to open URLs. This will be automatically deteced for most setups, if not chosen manually. @@ -47,43 +47,6 @@ --no-keyring Do not use keyring. -Backends --------- - -:program:`isrcsubmit` is able to use various backends to extract the ISRC. -The **libdiscid** library is a requirement for isrcsubmit -and can also be used as a backend on most systems. - -ISRCs are nearly always stored in the subchannel information -and all tools read them from there. -However, some drives tend to extract the same ISRC for adjacent tracks. -Restarting the script might help and using a different drive might help. -CD writers are reported to give better results than many CD reader drives. - -mediatools, media_info - These tools use an experimental algorithm to gather ISRCs from the disc. - This should give less duplicates on the same drive than with other tools. - However, there might be other problems. (only available for Windows) - -cdrdao - This tool can read ISRCs from CD-Text if no ISRCs are in the subchannel - information. - This is rarely the case. Most ISRCs are stored in the subchannel. - (usually available on Linux, but there are also Windows builds (plank)) - -libdiscid - Starting with **libdiscid** 0.3.0 this can be used not only for - the disc ID, but also to extract ISRCs. - (Windows, Mac; Linux support with 0.3.1) - -discisrc - The **discisrc** binary is created from source builds of **libdiscid**. - There is an experimental branch *isrc_raw* that might give - better results regarding duplicate ISRCs on Linux. - You can use this binary separately without installing - an experimental libdiscid library on the system. - - See also -------- @@ -92,5 +55,5 @@ Author ------ -This manual was written by Sebastian Ramacher and Johannes Dewender. -:program:`isrcsubmit` was written by Johannes Dewender. +This manual page was written by Sebastian Ramacher. :program:`isrcsubmit` was +written by Johannes Dewender. diff -Nru isrcsubmit-2.0.1/doc/isrcsubmit-config.5.rst isrcsubmit-2.0.0/doc/isrcsubmit-config.5.rst --- isrcsubmit-2.0.1/doc/isrcsubmit-config.5.rst 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/doc/isrcsubmit-config.5.rst 2014-05-05 15:12:54.000000000 +0000 @@ -12,7 +12,7 @@ ----------- The configuration file contains various options controlling the behavior of -:program:`isrcsubmit`. All the options given here can be overridden by passing +:program:`isrcsubmit`. All the options given here can be overriden by passing command line arguments to :program:`isrcsubmit`. If **$XDG_CONFIG_HOME** is not set, **%APPDATA%** is used on Windows diff -Nru isrcsubmit-2.0.1/isrcsubmit.py isrcsubmit-2.0.0/isrcsubmit.py --- isrcsubmit-2.0.1/isrcsubmit.py 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/isrcsubmit.py 2014-05-05 15:12:54.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2009-2015 Johannes Dewender +# Copyright (C) 2010-2013 Johannes Dewender # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ https://github.com/JonnyJD/musicbrainz-isrcsubmit """ -__version__ = "2.0.1" +__version__ = "2.0.0" AGENT_NAME = "isrcsubmit.py" DEFAULT_SERVER = "musicbrainz.org" # starting with highest priority @@ -369,7 +369,7 @@ if backend is None: print_error("Cannot find a backend to extract the ISRCS!", "Isrcsubmit can work with one of the following:", - " " + ", ".join(BACKENDS)) + " " + ", ".join(backend)) sys.exit(-1) return backend @@ -410,7 +410,7 @@ else: with open(os.devnull, "w") as devnull: Popen([options.browser, url], stdout=devnull) - except OSError as err: + except FileNotFoundError as err: error = ["Couldn't open the url in %s: %s" % (options.browser, str(err))] if submit: @@ -549,7 +549,7 @@ submit_requested = True else: printf("Would you like to open the browser to submit the disc?") - submit_requested = user_input(" [y/N] ").lower() == "y" + submit_requested = user_input(" [y/N] ") == "y" if submit_requested: open_browser(url, exit=True, submit=True) @@ -997,8 +997,7 @@ if duplicates > 0: printf("\nThere were %d ISRCs ", duplicates) print("that are attached to multiple tracks on this release.") - choice = user_input("Do you want to help clean those up? [y/N] ") - if choice.lower() == "y": + if user_input("Do you want to help clean those up? [y/N] ") == "y": cleanup_isrcs(release, isrcs) def cleanup_isrcs(release, isrcs): @@ -1038,7 +1037,7 @@ print("") url = "http://%s/isrc/%s" % (options.server, isrc) - if user_input("Open ISRC in the browser? [Y/n] ").lower() != "n": + if user_input("Open ISRC in the browser? [Y/n] ") != "n": open_browser(url) user_input("(press when done with this ISRC) ") @@ -1061,13 +1060,11 @@ stream_handler.setLevel(logging.INFO) # adding log file - logfile = "isrcsubmit.log" - file_handler = logging.FileHandler(logfile, mode='w', + file_handler = logging.FileHandler("isrcsubmit.log", mode='w', encoding="utf8", delay=True) formatter = logging.Formatter("%(levelname)s:%(name)s: %(message)s") file_handler.setFormatter(formatter) file_handler.setLevel(logging.DEBUG) - logger.info("Writing debug log to %s" % logfile) logging.getLogger().addHandler(file_handler) # add context to log file (DEBUG only added there) @@ -1110,7 +1107,7 @@ else: if errors > 0: print_error("%d problems detected" % errors) - if user_input("Do you want to submit? [y/N] ").lower() == "y": + if user_input("Do you want to submit? [y/N] ") == "y": ws2.submit_isrcs(tracks2isrcs) else: update_intention = False diff -Nru isrcsubmit-2.0.1/Makefile isrcsubmit-2.0.0/Makefile --- isrcsubmit-2.0.1/Makefile 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/Makefile 2014-05-05 15:12:54.000000000 +0000 @@ -1,5 +1,5 @@ #version := 2.1.0-dev -version := 2.0.1 +version := 2.0.0 build: ./setup.py build diff -Nru isrcsubmit-2.0.1/pkg/Makefile isrcsubmit-2.0.0/pkg/Makefile --- isrcsubmit-2.0.1/pkg/Makefile 2015-06-06 11:54:50.000000000 +0000 +++ isrcsubmit-2.0.0/pkg/Makefile 2014-05-05 15:12:54.000000000 +0000 @@ -1,4 +1,4 @@ -version := 2.0.1 +version := 2.0.0 current := isrcsubmit-$(version) downloads := ../web/isrcsubmit.jonnyjd.net/downloads/ @@ -18,7 +18,6 @@ source_branch := master source_dir := isrcsubmit -# TODO: make sure isrcsubmit.py is really updated! tag_ref := $(source_repo)/.git/refs/tags/v$(version) branch_ref := $(source_repo)/.git/refs/heads/$(source_branch) @@ -139,4 +138,4 @@ rm -rf $(base_libs) rm -rf mediatools mediatools.exe -.PHONY: $(source_ref) +.PHONY: source_update diff -Nru isrcsubmit-2.0.1/README.rst isrcsubmit-2.0.0/README.rst --- isrcsubmit-2.0.1/README.rst 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/README.rst 2014-05-05 15:12:54.000000000 +0000 @@ -1,5 +1,5 @@ -Isrcsubmit 2.0.1 for MusicBrainz -================================ +Isrcsubmit 2.0.0 for MusicBrainz +==================================== This python script extracts ISRCs_ from audio CDs and submits them to MusicBrainz_. @@ -126,13 +126,9 @@ The core of the MusicBrainz dataset including the ISRC contributions is placed into the Public Domain. -For a documentation of the available backends please refer to the manual -or the `web page`_. - You might find additional information about this script at the `MusicBrainz forums`_. -.. _web page: http://jonnyjd.github.io/musicbrainz-isrcsubmit/backends .. _MusicBrainz forums: http://forums.musicbrainz.org/viewtopic.php?id=3444 diff -Nru isrcsubmit-2.0.1/README.txt isrcsubmit-2.0.0/README.txt --- isrcsubmit-2.0.1/README.txt 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/README.txt 2014-05-05 15:12:54.000000000 +0000 @@ -1,5 +1,5 @@ -Isrcsubmit 2.0.1 for MusicBrainz -================================ +Isrcsubmit 2.0.0 for MusicBrainz +==================================== This python script extracts ISRCs_ from audio CDs and submits them to MusicBrainz_. @@ -126,13 +126,9 @@ The core of the MusicBrainz dataset including the ISRC contributions is placed into the Public Domain. -For a documentation of the available backends please refer to the manual -or the `web page`_. - You might find additional information about this script at the `MusicBrainz forums`_. -.. _web page: http://jonnyjd.github.io/musicbrainz-isrcsubmit/backends .. _MusicBrainz forums: http://forums.musicbrainz.org/viewtopic.php?id=3444 diff -Nru isrcsubmit-2.0.1/setup.py isrcsubmit-2.0.0/setup.py --- isrcsubmit-2.0.1/setup.py 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/setup.py 2014-05-05 15:12:54.000000000 +0000 @@ -42,7 +42,6 @@ import os.path man_pages = [ (os.path.join(man_dir, 'man1'), ['build/man/isrcsubmit.1']), - (os.path.join(man_dir, 'man5'), ['build/man/isrcsubmit-config.5']) ] else: man_pages = [] @@ -92,13 +91,11 @@ cmdclass["test"] = Test -with open("README.rst") as readme: - long_description = readme.read() setup(name="isrcsubmit", version=__version__, description="submit ISRCs from disc to MusicBrainz", - long_description=long_description, + long_description=open("README.rst").read(), author="Johannes Dewender", author_email="brainz@JonnyJD.net", url="https://github.com/JonnyJD/musicbrainz-isrcsubmit", diff -Nru isrcsubmit-2.0.1/test_isrcsubmit.py isrcsubmit-2.0.0/test_isrcsubmit.py --- isrcsubmit-2.0.1/test_isrcsubmit.py 2015-06-06 11:52:53.000000000 +0000 +++ isrcsubmit-2.0.0/test_isrcsubmit.py 2014-05-05 15:12:54.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2014 Johannes Dewender +# Copyright (C) 2013 Johannes Dewender # This test is free. You can redistribute and/or modify it at will. import os @@ -153,7 +153,7 @@ with open(file_name, "rb") as disc_file: return pickle.load(disc_file) -isrcsubmit.discid.read = _read +discid.read = _read # mock cdrdao reading