Added support for submitting ISRCs from audio files

.gitignore

@@ -7,3 +7,8 @@ musicbrainz2
 /*.toc
 *.pyc
 .tox
+.idea
+venv
+.eggs
+/build/scripts-3.9/isrcsubmit.py
+/build/scripts-3.9/isrcDigitalSubmit.py

AUTHORS

@@ -1,6 +1,7 @@
 This is just one isrcsubmit.
 There are other isrc submission tools by different people.
-
+This project also contains isrcDigitalSubmit, a derived tool
+which extracts ISRC codes from digital media instead of CDs.
 
 The following people have contributed to this isrcsubmit.py:
 
@@ -27,3 +28,7 @@ The following people have contributed to this isrcsubmit.py:
   Jim Patterson
   Guilherme Danno
    - minor fixes
+
+The following people have contributed to isrcDigitalSubmit.py:
+  Jim Patterson
+

Makefile

@@ -1,5 +1,5 @@
 #version := 2.1.0-dev
-version := 2.1.0
+version := 2.2.2
 
 build:
 	./setup.py build
@@ -17,7 +17,7 @@ upload:
 version:
 	sed -i -e 's/\(Isrcsubmit\s\)[0-9.]\+[0-9a-z.-]*/\1$(version)/' README.rst
 	sed -i -e 's/\(__version__\s=\s"\)[0-9.]\+[0-9a-z.-]*/\1$(version)/' \
-		isrcsubmit.py
+		isrcshared.py
 	sed -i -e 's/\(version="\)[0-9.]\+[0-9a-z.-]*/\1$(version)/' \
 		setup.py
 

README.rst

@@ -1,11 +1,17 @@
-Isrcsubmit 2.1.0 for MusicBrainz
+Isrcsubmit 2.2.2 for MusicBrainz
 ================================
 
-This python script extracts ISRCs_ from audio CDs
-and submits them to MusicBrainz_.
+This project includes two python scripts that extracts ISRCs
+and submits them to MusicBrainz_. isrcsubmit extracts ISRCs from
+Audio CDs. isrcDigitalSubmit extracts ISRCs from audio files.
 
-This script uses python-musicbrainzngs to access the MusicBrainz API
-and python-discid to create an identifier for the disc.
+These scripts use python-musicbrainzngs to access the MusicBrainz API.
+
+isrcsubmit uses python-discid to create an identifier for the disc which
+is used to locate corresponding releases in MusicBrainz. 
+
+isrcDigitalSubmit uses mutagen to analyze audio files, and locates matching
+MusicBrainz releases based on embedded Artist, Album and AlbumArtist tags.
 
 The script works for Linux, Mac OS X and Windows.
 
@@ -15,11 +21,11 @@ The script works for Linux, Mac OS X and Windows.
 Features:
 ---------
 
-* read ISRCs from disc
-* search for releases with the TOC of the disc
+* read ISRCs from disc or audio files
+* search for releases with the TOC of the disc or embedded tags
 * display release information from MusicBrainz
 * submit ISRCs
-* submit discIds / TOCs
+* submit discIds / TOCs (isrcsubmit)
 * duplicate ISRC detection (local and on server)
 
 
@@ -29,23 +35,32 @@ Dependencies:
 * Python 2 >= 2.6 or Python 3 >= 3.1
 * python-discid_ >= 1.0.0 (or python-libdiscid_ >= 0.2.0)
 * python-musicbrainzngs_ >= 0.4
+* mutagen_ >= 1.45.1
+* unidecode >= 1.2.0
 * keyring_ (optional)
 
 .. _python-discid: http://python-discid.readthedocs.org/
 .. _python-libdiscid: http://pythonhosted.org/python-libdiscid/
 .. _python-musicbrainzngs: http://python-musicbrainzngs.readthedocs.org/
-.. _keyring: https://github.com/jaraco/keyring
-
+.. _keyring: https://github.com/jaraco/keyring/
+.. _mutaagen: https://mutagen.readthedocs.io/
+.. _unicode: https://github.com/avian2/unidecode
 
 Usage:
 ------
 ::
 
     isrcsubmit.py [options] [username] [device]
+    isrcDigitalSubmit.py [options] [username] audioFiles ...
 
-All arguments are optional. For detailed usage see::
+All arguments are optional other than audioFiles for isrcDigitalSubmit.
+AudioFiles may be zipped (so a ZIP file as distributed by the vendor can
+usually be passed directly to the script).
+
+For detailed usage see::
 
     isrcsubmit.py -h
+    isrcDigitalSubmit.py -h
 
 
 Windows Usage:
@@ -54,6 +69,7 @@ Windows Usage:
 Windows users should use::
 
     isrcsubmit.bat
+    isrcDigitalSubmit.bat
 
 
 Mac Usage:
@@ -62,6 +78,7 @@ Mac Usage:
 Mac users should rather use::
 
     isrcsubmit.sh
+    isrcDigitalSubmit.sh
 
 This also works on Linux.
 
@@ -83,8 +100,36 @@ is fetched from MusicBrainz.
 If the disc is unknown, you will be given the chance to submit the ID
 to the server.
 
+Identifying Releases from Tags
+------------------------------
+
+A Digital Media release has no equivalent of a DiscID as defined for CDs.
+Instead, it uses tags that are embedded in the digital media files. The
+tags of interest are Album, AlbumArtist, Artist and TrackNumber. (Other
+formats eg. MP3 might name these different; this discussion will use the
+Vorbis tag names).
+
+Identifying a release is most straightforward if the albumartist tag is found. 
+The same albumartist tag must be on all tracks. isrcDigitalSubmit will look for
+a Digital Media release with that album artist and title. If more than one is found,
+the user will be asked to choose.
+
+If no Album Artist is found, the artist will be treated as an album artist. 
+An attempt is made to strip away any "featured artist" from tracks, either by looking
+for connectors like "feat." or "duet with", or by checking for a common name that
+is found on all artist name strings. If it can't identify a single artist, it will
+look for a release without specifying an artist.
+
+If all else fails, the user can point the script to a specific release by use of
+the --release-id= option.
+
+isrcDigitalRelease always verifies that the digital media release matches the MusicBrainz
+release by checking for matching titles and artists and similar track times. It also
+verifies that the format is "Digital Media"; it will not attach
+ISRCs to releases with a different format.
+
 
-"Installation":
+Installation:
 ---------------
 
 If you downloaded isrcsubmit as a zip package for your platform
@@ -103,7 +148,7 @@ but "python setup.py install" might work for you.
 However, the backends and libraries should get
 installed so that the script has access to them.
 
-On Linux you just install the above mentioneed dependencies with
+On Linux you just install the above mentioned dependencies with
 the package manager of your distribution.
 For Ubuntu all dependencies should be in the MusicBrainz Stable PPA,
 if not in the official repositories.
@@ -133,7 +178,7 @@ 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
+.. _MusicBrainz forums: https://community.metabrainz.org/search?q=isrcsubmit
 
 
 Bugs:

doc/conf.py

@@ -175,7 +175,8 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('isrcsubmit.1', 'isrcsubmit', u'isrcsubmit Documentation', [], 1),
-    ('isrcsubmit-config.5', 'isrcsubmit-config', u'isrcsubmit Documentation',
+    ('isrcDigitalSubmit.1', 'isrcDigitalSubmit', u'isrcDigitalSubmit Documentation', [], 1),
+    ('isrcsubmit-config.5', 'isrcsubmit-config', u'isrcsubmit and isrcDigitalSubmit Configuration Documentation',
      [], 5)
 ]
 

doc/isrcDigitalSubmit.1.rst

@@ -0,0 +1,50 @@
+isrcDigitalSubmit manual page
+======================
+
+Synopsis
+--------
+
+**isrcDigitalSubmit** [*options*] [*user*] *audioFile*...
+
+Description
+-----------
+
+:program:`isrcDigitalSubmit` extracts International Standard Recording Codes (ISRC)
+from audio files and allows one to submit the data to MusicBrainz. ISRCs are used
+to uniquely identifiy sound and music video recordings.
+
+Options
+-------
+
+--version
+    Show program's version number and exit.
+-h
+    Short usage help.
+--help
+    Complete help for the program.
+--debug
+    Show debug messages.
+-u <username>, --user=<username>
+    MusicBrainz username, if not given as argument.
+--release-id=<release_id>
+    Optional MusicBrainz ID of the release. This will be gathered if not given.
+--browser=<browser>
+    Program to open URLs. This will be automatically deteced for most setups,
+    if not chosen manually.
+--server=<server>
+    Server to send ISRCs to. If not given, musicbrainz.org is used.
+--keyring
+    Use keyring if it is available.
+--no-keyring
+    Do not use keyring.
+
+See also
+--------
+
+:manpage:`isrcsubmit-config(5)`
+
+Author
+------
+
+This manual was written by Sebastian Ramacher and Johannes Dewender.
+:program:`isrcDigitalSubmit` was written by Jim Patterson adapted from isrcsubmit by Johannes Dewender.

doc/isrcsubmit-config.5.rst

@@ -12,8 +12,8 @@ Description
 -----------
 
 The configuration file contains various options controlling the behavior of
-:program:`isrcsubmit`. All the options given here can be overridden by passing
-command line arguments to :program:`isrcsubmit`.
+:program:`isrcsubmit` and :program:`isrcDigitalubmit`. All the options given here can be overridden by passing
+command line arguments.
 
 If **$XDG_CONFIG_HOME** is not set, **%APPDATA%** is used on Windows
 and **~/.config** for all other systems.
@@ -25,7 +25,7 @@ This refers to the ``[general]`` section of the configuration file.
 
 backend
 ^^^^^^^
-Force using a specific backend to extract ISRCs from the disc. Possible
+(:program:`isrcsubmit` only). Force using a specific backend to extract ISRCs from the disc. Possible
 backends are: mediatools, media_info, cdrdao, libdiscid, discisrc.
 
 browser
@@ -34,7 +34,7 @@ Program to open URLs.
 
 device
 ^^^^^^
-CD device with a loaded audio CD.
+(:program:`isrcsubmit` only). CD device with a loaded audio CD.
 
 keyring
 ^^^^^^^

isrcDigitalSubmit.bat

@@ -0,0 +1,5 @@
+@echo off
+for /f "tokens=2 delims=:." %%x in ('chcp') do set cp=%%x
+chcp 65001>NUL & cmd /c "isrcDigitalSubmit.py %*" & chcp %cp%>NUL
+echo.
+pause