diff -Nru mopidy-internetarchive-2.0.0/CHANGES.rst mopidy-internetarchive-2.0.3/CHANGES.rst --- mopidy-internetarchive-2.0.0/CHANGES.rst 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/CHANGES.rst 2017-06-16 12:56:26.000000000 +0000 @@ -1,3 +1,21 @@ +v2.0.3 (2017-06-16) +------------------- + +- Handle archive.org JSON API changes. + + +v2.0.2 (2017-01-09) +------------------- + +- Fix file name handling. + + +v2.0.1 (2017-01-09) +------------------- + +- Handle multiple item titles. + + v2.0.0 (2015-12-08) ------------------- diff -Nru mopidy-internetarchive-2.0.0/.coveragerc mopidy-internetarchive-2.0.3/.coveragerc --- mopidy-internetarchive-2.0.0/.coveragerc 2015-09-14 06:08:48.000000000 +0000 +++ mopidy-internetarchive-2.0.3/.coveragerc 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[run] -source = mopidy_internetarchive diff -Nru mopidy-internetarchive-2.0.0/debian/changelog mopidy-internetarchive-2.0.3/debian/changelog --- mopidy-internetarchive-2.0.0/debian/changelog 2016-01-25 20:49:26.000000000 +0000 +++ mopidy-internetarchive-2.0.3/debian/changelog 2018-04-15 00:02:01.000000000 +0000 @@ -1,3 +1,15 @@ +mopidy-internetarchive (2.0.3-1) unstable; urgency=medium + + * New upstream release + * debian/control + - Bump Standards-Version to 4.1.4, no changes required + - Set Vcs-* to salsa.debian.org + - Require debhelper 10 + * debian/copyright + - Update copyright years + + -- Stein Magnus Jodal Sun, 15 Apr 2018 02:02:01 +0200 + mopidy-internetarchive (2.0.0-1) unstable; urgency=medium * Initial packaging (Closes: #812673) diff -Nru mopidy-internetarchive-2.0.0/debian/compat mopidy-internetarchive-2.0.3/debian/compat --- mopidy-internetarchive-2.0.0/debian/compat 2016-01-25 19:16:18.000000000 +0000 +++ mopidy-internetarchive-2.0.3/debian/compat 2018-04-15 00:02:01.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru mopidy-internetarchive-2.0.0/debian/control mopidy-internetarchive-2.0.3/debian/control --- mopidy-internetarchive-2.0.0/debian/control 2016-01-25 20:49:26.000000000 +0000 +++ mopidy-internetarchive-2.0.3/debian/control 2018-04-15 00:02:01.000000000 +0000 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Stein Magnus Jodal -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), dh-python, mopidy (>= 1.0.8-2), python (>= 2.7), @@ -13,10 +13,10 @@ python-requests, python-setuptools, python-uritools, -Standards-Version: 3.9.6 +Standards-Version: 4.1.4 Homepage: http://github.com/tkem/mopidy-internetarchive -Vcs-Git: git://anonscm.debian.org/pkg-mopidy/mopidy-internetarchive.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mopidy/mopidy-internetarchive.git +Vcs-Git: https://salsa.debian.org/mopidy-team/mopidy-internetarchive.git +Vcs-Browser: https://salsa.debian.org/mopidy-team/mopidy-internetarchive X-Python-Version: >= 2.7 Package: mopidy-internetarchive diff -Nru mopidy-internetarchive-2.0.0/debian/copyright mopidy-internetarchive-2.0.3/debian/copyright --- mopidy-internetarchive-2.0.0/debian/copyright 2016-01-25 20:41:15.000000000 +0000 +++ mopidy-internetarchive-2.0.3/debian/copyright 2018-04-15 00:02:01.000000000 +0000 @@ -4,11 +4,11 @@ Source: https://github.com/tkem/mopidy-internetarchive Files: * -Copyright: 2014-2015 Thomas Kemmer +Copyright: 2014-2017 Thomas Kemmer License: Apache-2.0 Files: debian/* -Copyright: 2016 Stein Magnus Jodal +Copyright: 2016-2018 Stein Magnus Jodal License: Apache-2.0 License: Apache-2.0 diff -Nru mopidy-internetarchive-2.0.0/debian/.git-dpm mopidy-internetarchive-2.0.3/debian/.git-dpm --- mopidy-internetarchive-2.0.0/debian/.git-dpm 2016-01-25 19:16:18.000000000 +0000 +++ mopidy-internetarchive-2.0.3/debian/.git-dpm 2018-04-15 00:01:42.000000000 +0000 @@ -1,11 +1,11 @@ # see git-dpm(1) from git-dpm package -2351ca9305a264ea9a30c02f67c7a8b75b7e76d2 -2351ca9305a264ea9a30c02f67c7a8b75b7e76d2 -2351ca9305a264ea9a30c02f67c7a8b75b7e76d2 -2351ca9305a264ea9a30c02f67c7a8b75b7e76d2 -mopidy-internetarchive_2.0.0.orig.tar.gz -bc8a91dec92a9803663ab7c696d2a008af3ad8b2 -23265 +81a99852f6bd40e8d1e0f4aec1d8dfb41e792b93 +81a99852f6bd40e8d1e0f4aec1d8dfb41e792b93 +81a99852f6bd40e8d1e0f4aec1d8dfb41e792b93 +81a99852f6bd40e8d1e0f4aec1d8dfb41e792b93 +mopidy-internetarchive_2.0.3.orig.tar.gz +2e9a09d7b1f9623ae3fcd962cfe088982b0ea40f +23009 debianTag="debian/%e%v" patchedTag="patched/%e%v" upstreamTag="upstream/%e%u" diff -Nru mopidy-internetarchive-2.0.0/docs/changelog.rst mopidy-internetarchive-2.0.3/docs/changelog.rst --- mopidy-internetarchive-2.0.0/docs/changelog.rst 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/changelog.rst 2017-01-09 16:47:01.000000000 +0000 @@ -1,6 +1,4 @@ Change Log ======================================================================== -This page lists all major changes to Mopidy-Internetarchive. - .. include:: ../CHANGES.rst diff -Nru mopidy-internetarchive-2.0.0/docs/config.rst mopidy-internetarchive-2.0.3/docs/config.rst --- mopidy-internetarchive-2.0.0/docs/config.rst 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/config.rst 2017-01-09 16:47:01.000000000 +0000 @@ -12,6 +12,10 @@ Configuration Values ------------------------------------------------------------------------ +.. confval:: internetarchive/enabled + + Whether this extension should be enabled or not. + .. confval:: internetarchive/base_url Base URL to access the Internet Archive. diff -Nru mopidy-internetarchive-2.0.0/docs/conf.py mopidy-internetarchive-2.0.3/docs/conf.py --- mopidy-internetarchive-2.0.0/docs/conf.py 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/conf.py 2017-01-09 16:47:01.000000000 +0000 @@ -8,12 +8,13 @@ def get_version(filename): from re import findall - with open(filename) as fh: - metadata = dict(findall(r"__([a-z]+)__ = '([^']+)'", fh.read())) + with open(filename) as f: + metadata = dict(findall(r"__([a-z]+)__ = '([^']+)'", f.read())) return metadata['version'] + project = 'Mopidy-InternetArchive' -copyright = '2014, 2015 Thomas Kemmer' +copyright = '2014-2017 Thomas Kemmer' version = get_version(b'../mopidy_internetarchive/__init__.py') release = version diff -Nru mopidy-internetarchive-2.0.0/docs/index.rst mopidy-internetarchive-2.0.3/docs/index.rst --- mopidy-internetarchive-2.0.0/docs/index.rst 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/index.rst 2017-01-09 16:47:01.000000000 +0000 @@ -13,16 +13,75 @@ collection. +Browsing the Internet Archive +------------------------------------------------------------------------ + +If your Mopidy client supports browsing, there should be a top-level +directory named *Internet Archive*. Beneath that, you will find the +Internet Archive collections listed in +:confval:`internetarchive/collections`, and you should be able to +browse individual audio items (albums) and files (tracks) within +these. + +For practical and performance reasons, the number of items that will +be shown within a collection is limited, e.g. you will not see all +167,967 audio items of the Live Music Archive [#footnote1]_. The +:ref:`default configuration ` sets this limit to 100, but +this can be changed using :confval:`internetarchive/browse_limit`. + +To allow browsing collections using different sort criteria, every +collection provides a number of *views*, virtual subdirectories which +let you browse the collection's items by popularity, title, publish +date, and so on. The default views are set up to resemble the +archive.org_ Web interface, but can be changed at your own discretion +with :confval:`internetarchive/browse_views`. + + +Searching the Internet Archive +------------------------------------------------------------------------ + +The Internet Archive only supports searching for *items*, but not for +individual files or tracks. Therefore, only *albums* will show up +when searching in Mopidy. This also means that only album-related +search fields are supported, so searching for track names or numbers +will yield no results from the Internet Archive. + +The number and ordering of search results returned from the Internet +Archive can be changed with :confval:`internetarchive/search_limit` +and :confval:`internetarchive/search_order`. Unless you explicitly +specify an Internet Archive collection to search within, search scope +will also be limited to the collections listed in +:confval:`internetarchive/collections`. + + +Archive Favorites +------------------------------------------------------------------------ + +If you have an Internet Archive account - also termed a `Virtual +Library Card`_ - you can access your `Archive Favorites`_ from Mopidy. +To do so, you just need to add the identifier of your favorites +collection to :confval:`internetarchive/collections`. Typically, the +identifier is *fav-{username}*, but you should be able to figure it +out from the archive.org_ Web site. When added to +:confval:`internetarchive/collections`, you will be able to browse and +search your Archive Favorites just like the other collections listed +there. + + .. toctree:: - :maxdepth: 2 + :hidden: - intro install config changelog license +.. rubric:: Footnotes + +.. [#footnote1] As of Jan. 9, 2017. + + .. _Mopidy: http://www.mopidy.com/ .. _Internet Archive: http://archive.org .. _alternative news programming: https://archive.org/details/audio_news @@ -32,4 +91,7 @@ .. _original music: https://archive.org/details/opensource_audio .. _Live Music Archive: https://archive.org/details/etree .. _LibriVox: https://archive.org/details/librivoxaudio -.. _donate: https://archive.org/donate/ + +.. _archive.org: https://archive.org/ +.. _Virtual Library Card: https://archive.org/account/login.createaccount.php +.. _Archive Favorites: https://archive.org/bookmarks.php diff -Nru mopidy-internetarchive-2.0.0/docs/install.rst mopidy-internetarchive-2.0.3/docs/install.rst --- mopidy-internetarchive-2.0.0/docs/install.rst 2015-09-09 07:37:26.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/install.rst 2017-01-09 16:47:01.000000000 +0000 @@ -1,9 +1,13 @@ Installation ======================================================================== -Mopidy-InternetArchive can be installed using pip_ by running:: +Debian/Ubuntu/Raspbian (jessie): Install the +``mopidy-internetarchive`` package from `apt.mopidy.com +`_:: - pip install Mopidy-InternetArchive + apt-get install mopidy-internetarchive +Otherwise, install the package from `PyPI +`_:: -.. _pip: https://pip.pypa.io/en/latest/ + pip install Mopidy-Internetarchive diff -Nru mopidy-internetarchive-2.0.0/docs/intro.rst mopidy-internetarchive-2.0.3/docs/intro.rst --- mopidy-internetarchive-2.0.0/docs/intro.rst 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/intro.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -Introduction -======================================================================== - -About the Internet Archive Metadata Model ------------------------------------------------------------------------- - -.. note:: - - This is just a brief introduction to get you accustomed to some - basic Internet Archive concepts and terminology related to this - Mopidy extension. For more in-depth information, please refer to - the FAQ_ or this `blog post`_. - -Files published on the Internet Archive are organized in so-called -*items*. An item is a directory or folder that includes the -originally uploaded content – audio, video, text, etc. – along with -any derivative files created from the originals, and some metadata -that describes the item. An item may contain a single audio file, or -a related set of audio files that represent a CD or a taped live -concert. All the files within an item have the same metadata, such as -(album) title, creator, description, and so on. For the purpose of -this Mopidy extension, Internet Archive items are treated as *albums*, -and the included audio files show up as the album's *tracks*. - -Every item also has a unique identifier, which can be used to access -the item on the Internet Archive's Web site:: - - http://archive.org/details/{identifier} - -Besides items containing media files, there are also *collections*, -which are used to to group related items. The `Audio Archive`_, for -example, is the collection item with the identifier *audio*. An item -can be a member of more than one collection, and collections may also -have sub-collections. Collections show up as *directories* when -browsing Mopidy. - - -Browsing the Internet Archive ------------------------------------------------------------------------- - -If your Mopidy client supports browsing, there should be a top-level -directory named *Internet Archive*. Beneath that, you will find the -Internet Archive collections listed in -:confval:`internetarchive/collections`, and you should be able to -browse individual audio items (albums) and files (tracks) within -these. - -For practical and performance reasons, the number of items that will -be shown within a collection is limited, e.g. you will not see all -147,929 audio items of the Live Music Archive [#footnote1]_. The -:ref:`default configuration ` sets this limit to 100, but -this can be changed using :confval:`internetarchive/browse_limit`. - -To allow browsing collections using different sort criteria, every -collection provides a number of *views*, virtual subdirectories which -let you browse the collection's items by popularity, title, publish -date, and so on. The default views are set up to resemble the -archive.org_ Web interface, but can be changed at your own discretion -with :confval:`internetarchive/browse_views`. - - -Searching the Internet Archive ------------------------------------------------------------------------- - -The Internet Archive only supports searching for *items*, but not for -individual files or tracks. Therefore, only *albums* will show up -when searching in Mopidy. This also means that only album-related -search fields are supported, so searching for track names or numbers -will yield no results from the Internet Archive. - -The number and ordering of search results returned from the Internet -Archive can be changed with :confval:`internetarchive/search_limit` -and :confval:`internetarchive/search_order`. Unless you explicitly -specify an Internet Archive collection to search within, search scope -will also be limited to the collections listed in -:confval:`internetarchive/collections`. - - -Archive Favorites ------------------------------------------------------------------------- - -If you have an Internet Archive account - also termed a `Virtual -Library Card`_ - you can access your `Archive Favorites`_ from Mopidy. -To do so, you just need to add the identifier of your favorites -collection to :confval:`internetarchive/collections`. Typically, the -identifier is *fav-{username}*, but you should be able to figure it -out from the archive.org_ Web site. When added to -:confval:`internetarchive/collections`, you will be able to browse and -search your Archive Favorites just like the other collections listed -there. - - -.. _FAQ: https://archive.org/about/faqs.php - -.. _blog post: https://blog.archive.org/2011/03/31/how-archive-org-items-are-structured/ - -.. _Audio Archive: https://archive.org/details/audio - -.. _archive.org: https://archive.org/ - -.. _Virtual Library Card: https://archive.org/account/login.createaccount.php - -.. _Archive Favorites: https://archive.org/bookmarks.php - -.. rubric:: Footnotes - -.. [#footnote1] As of Dec. 7, 2015. diff -Nru mopidy-internetarchive-2.0.0/docs/license.rst mopidy-internetarchive-2.0.3/docs/license.rst --- mopidy-internetarchive-2.0.0/docs/license.rst 2015-09-14 06:08:48.000000000 +0000 +++ mopidy-internetarchive-2.0.3/docs/license.rst 2017-01-09 16:47:01.000000000 +0000 @@ -1,7 +1,7 @@ License ======================================================================== -Mopidy-InternetArchive is Copyright (c) 2014, 2015 Thomas Kemmer. +Mopidy-InternetArchive is Copyright (c) 2014-2017 Thomas Kemmer. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this software except in compliance with the License. You diff -Nru mopidy-internetarchive-2.0.0/MANIFEST.in mopidy-internetarchive-2.0.3/MANIFEST.in --- mopidy-internetarchive-2.0.0/MANIFEST.in 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/MANIFEST.in 2017-01-09 16:47:01.000000000 +0000 @@ -1,5 +1,3 @@ -include .coveragerc -include .travis.yml include CHANGES.rst include LICENSE include MANIFEST.in @@ -7,7 +5,7 @@ include mopidy_internetarchive/ext.conf include tox.ini +recursive-include tests *.py + recursive-include docs * prune docs/_build - -recursive-include tests *.py \ No newline at end of file diff -Nru mopidy-internetarchive-2.0.0/mopidy_internetarchive/client.py mopidy-internetarchive-2.0.3/mopidy_internetarchive/client.py --- mopidy-internetarchive-2.0.0/mopidy_internetarchive/client.py 2015-11-17 11:07:25.000000000 +0000 +++ mopidy-internetarchive-2.0.3/mopidy_internetarchive/client.py 2017-06-16 12:56:26.000000000 +0000 @@ -84,9 +84,14 @@ class SearchResult(collections.Sequence): def __init__(self, result): - self.query = result['responseHeader']['params']['q'] - self.rowcount = result['response']['numFound'] - self.docs = result['response']['docs'] + response = result['response'] + self.docs = response.get('docs', []) + self.rowcount = response.get('numFound', None) + # query is optional, and responseHeader likely to change + try: + self.query = result['responseHeader']['params']['query'] + except: + self.query = None def __getitem__(self, key): return self.docs[key] @@ -100,6 +105,7 @@ class SearchError(Exception): pass + if __name__ == '__main__': import argparse import logging diff -Nru mopidy-internetarchive-2.0.0/mopidy_internetarchive/__init__.py mopidy-internetarchive-2.0.3/mopidy_internetarchive/__init__.py --- mopidy-internetarchive-2.0.0/mopidy_internetarchive/__init__.py 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/mopidy_internetarchive/__init__.py 2017-06-16 12:56:26.000000000 +0000 @@ -5,7 +5,7 @@ from mopidy import config, ext -__version__ = '2.0.0' +__version__ = '2.0.3' SORT_FIELDS = ['%s %s' % (f, o) for o in ('asc', 'desc') for f in ( 'addeddate', diff -Nru mopidy-internetarchive-2.0.0/mopidy_internetarchive/translator.py mopidy-internetarchive-2.0.3/mopidy_internetarchive/translator.py --- mopidy-internetarchive-2.0.0/mopidy_internetarchive/translator.py 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/mopidy_internetarchive/translator.py 2017-01-09 17:47:43.000000000 +0000 @@ -100,7 +100,6 @@ def uri(identifier='', filename=None, scheme=Extension.ext_name, **kwargs): - # filename may contain whitespace, e.g. PattiSmith1971 if filename: return uritools.uricompose(scheme, path=identifier, fragment=filename) elif kwargs: @@ -109,14 +108,23 @@ return '%s:%s' % (scheme, identifier) +def name(obj): + title = obj.get('title') + if isinstance(title, basestring): + return title + elif hasattr(title, '__getitem__'): + return title[0] + else: + return obj.get('identifier') + + def ref(obj, uri=uri): identifier = obj['identifier'] mediatype = obj['mediatype'] - name = obj.get('title', identifier) if mediatype == 'collection': - return Ref.directory(name=name, uri=uri(identifier)) + return Ref.directory(name=name(obj), uri=uri(identifier)) else: - return Ref.album(name=name, uri=uri(identifier)) + return Ref.album(name=name(obj), uri=uri(identifier)) def artists(obj): @@ -130,10 +138,9 @@ def album(obj, uri=uri): - identifier = obj['identifier'] return Album( - uri=uri(identifier), - name=obj.get('title', identifier), + uri=uri(obj['identifier']), + name=name(obj), artists=artists(obj), date=parse_date(obj.get('date')) ) @@ -166,10 +173,10 @@ track = Track(album=album(item['metadata'])) tracks = [] for obj in files(item, formats): - name = obj['name'] + filename = obj.get('name') tracks.append(track.replace( - uri=uri(identifier, name), - name=obj.get('title', name), + uri=uri(identifier, filename), + name=obj.get('title', filename), artists=artists(obj) or track.album.artists, genre=obj.get('genre'), track_no=parse_track(obj.get('track')), diff -Nru mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/PKG-INFO mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/PKG-INFO --- mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/PKG-INFO 2015-12-08 15:58:37.000000000 +0000 +++ mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/PKG-INFO 2017-06-16 12:57:14.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Mopidy-InternetArchive -Version: 2.0.0 +Version: 2.0.3 Summary: Mopidy extension for playing music from the Internet Archive Home-page: https://github.com/tkem/mopidy-internetarchive Author: Thomas Kemmer @@ -12,13 +12,16 @@ Mopidy-InternetArchive is a Mopidy_ extension for playing music from the `Internet Archive`_. + This extension lets you search for and stream recordings ranging from + `alternative news programming`_, to `Grateful Dead concerts`_, to `Old + Time Radio shows`_, to `book and poetry readings`_, to `original + music`_ uploaded by Internet Archive users. It also gives you access + to a vast number of high-quality live recordings from the `Live Music + Archive`_, and thousands of free audiobooks from the LibriVox_ + collection. - Installation - ------------------------------------------------------------------------ - - Mopidy-InternetArchive can be installed using pip_ by running:: - - pip install Mopidy-InternetArchive + For more information and installation instructions, please see + Mopidy-InternetArchive's online documentation_. Project Resources @@ -28,10 +31,6 @@ :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ :alt: Latest PyPI version - .. image:: https://img.shields.io/pypi/dm/Mopidy-InternetArchive.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ - :alt: Number of PyPI downloads - .. image:: http://img.shields.io/travis/tkem/mopidy-internetarchive/master.svg?style=flat :target: https://travis-ci.org/tkem/mopidy-internetarchive/ :alt: Travis CI build status @@ -41,10 +40,9 @@ :alt: Test coverage .. image:: https://readthedocs.org/projects/mopidy-internetarchive/badge/?version=latest&style=flat - :target: https://readthedocs.org/projects/mopidy-internetarchive/?badge=latest + :target: http://mopidy-internetarchive.readthedocs.org/en/latest/ :alt: Documentation Status - - `Documentation`_ - `Issue Tracker`_ - `Source Code`_ - `Change Log`_ @@ -53,15 +51,20 @@ License ------------------------------------------------------------------------ - Copyright (c) 2014, 2015 Thomas Kemmer. + Copyright (c) 2014-2017 Thomas Kemmer. Licensed under the `Apache License, Version 2.0`_. .. _Mopidy: http://www.mopidy.com/ - .. _Internet Archive: http://archive.org/ - - .. _pip: https://pip.pypa.io/en/latest/ + .. _Internet Archive: http://archive.org + .. _alternative news programming: https://archive.org/details/audio_news + .. _Grateful Dead concerts: https://archive.org/details/GratefulDead + .. _Old Time Radio shows: https://archive.org/details/radioprograms + .. _book and poetry readings: https://archive.org/details/audio_bookspoetry + .. _original music: https://archive.org/details/opensource_audio + .. _Live Music Archive: https://archive.org/details/etree + .. _LibriVox: https://archive.org/details/librivoxaudio .. _Documentation: http://mopidy-internetarchive.readthedocs.org/en/latest/ .. _Issue Tracker: https://github.com/tkem/mopidy-internetarchive/issues/ diff -Nru mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/requires.txt mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/requires.txt --- mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/requires.txt 2015-12-08 15:58:37.000000000 +0000 +++ mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/requires.txt 2017-06-16 12:57:14.000000000 +0000 @@ -1,6 +1,6 @@ setuptools Mopidy >= 1.1 Pykka >= 1.1 -requests >= 2.0 cachetools >= 1.0 -uritools >= 1.0 \ No newline at end of file +requests >= 2.0 +uritools >= 1.0 diff -Nru mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/SOURCES.txt mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/SOURCES.txt --- mopidy-internetarchive-2.0.0/Mopidy_InternetArchive.egg-info/SOURCES.txt 2015-12-08 15:58:39.000000000 +0000 +++ mopidy-internetarchive-2.0.3/Mopidy_InternetArchive.egg-info/SOURCES.txt 2017-06-16 12:57:14.000000000 +0000 @@ -1,5 +1,3 @@ -.coveragerc -.travis.yml CHANGES.rst LICENSE MANIFEST.in @@ -21,7 +19,6 @@ docs/config.rst docs/index.rst docs/install.rst -docs/intro.rst docs/license.rst mopidy_internetarchive/__init__.py mopidy_internetarchive/backend.py diff -Nru mopidy-internetarchive-2.0.0/PKG-INFO mopidy-internetarchive-2.0.3/PKG-INFO --- mopidy-internetarchive-2.0.0/PKG-INFO 2015-12-08 15:58:39.000000000 +0000 +++ mopidy-internetarchive-2.0.3/PKG-INFO 2017-06-16 12:57:14.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Mopidy-InternetArchive -Version: 2.0.0 +Version: 2.0.3 Summary: Mopidy extension for playing music from the Internet Archive Home-page: https://github.com/tkem/mopidy-internetarchive Author: Thomas Kemmer @@ -12,13 +12,16 @@ Mopidy-InternetArchive is a Mopidy_ extension for playing music from the `Internet Archive`_. + This extension lets you search for and stream recordings ranging from + `alternative news programming`_, to `Grateful Dead concerts`_, to `Old + Time Radio shows`_, to `book and poetry readings`_, to `original + music`_ uploaded by Internet Archive users. It also gives you access + to a vast number of high-quality live recordings from the `Live Music + Archive`_, and thousands of free audiobooks from the LibriVox_ + collection. - Installation - ------------------------------------------------------------------------ - - Mopidy-InternetArchive can be installed using pip_ by running:: - - pip install Mopidy-InternetArchive + For more information and installation instructions, please see + Mopidy-InternetArchive's online documentation_. Project Resources @@ -28,10 +31,6 @@ :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ :alt: Latest PyPI version - .. image:: https://img.shields.io/pypi/dm/Mopidy-InternetArchive.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ - :alt: Number of PyPI downloads - .. image:: http://img.shields.io/travis/tkem/mopidy-internetarchive/master.svg?style=flat :target: https://travis-ci.org/tkem/mopidy-internetarchive/ :alt: Travis CI build status @@ -41,10 +40,9 @@ :alt: Test coverage .. image:: https://readthedocs.org/projects/mopidy-internetarchive/badge/?version=latest&style=flat - :target: https://readthedocs.org/projects/mopidy-internetarchive/?badge=latest + :target: http://mopidy-internetarchive.readthedocs.org/en/latest/ :alt: Documentation Status - - `Documentation`_ - `Issue Tracker`_ - `Source Code`_ - `Change Log`_ @@ -53,15 +51,20 @@ License ------------------------------------------------------------------------ - Copyright (c) 2014, 2015 Thomas Kemmer. + Copyright (c) 2014-2017 Thomas Kemmer. Licensed under the `Apache License, Version 2.0`_. .. _Mopidy: http://www.mopidy.com/ - .. _Internet Archive: http://archive.org/ - - .. _pip: https://pip.pypa.io/en/latest/ + .. _Internet Archive: http://archive.org + .. _alternative news programming: https://archive.org/details/audio_news + .. _Grateful Dead concerts: https://archive.org/details/GratefulDead + .. _Old Time Radio shows: https://archive.org/details/radioprograms + .. _book and poetry readings: https://archive.org/details/audio_bookspoetry + .. _original music: https://archive.org/details/opensource_audio + .. _Live Music Archive: https://archive.org/details/etree + .. _LibriVox: https://archive.org/details/librivoxaudio .. _Documentation: http://mopidy-internetarchive.readthedocs.org/en/latest/ .. _Issue Tracker: https://github.com/tkem/mopidy-internetarchive/issues/ diff -Nru mopidy-internetarchive-2.0.0/README.rst mopidy-internetarchive-2.0.3/README.rst --- mopidy-internetarchive-2.0.0/README.rst 2015-12-08 15:56:55.000000000 +0000 +++ mopidy-internetarchive-2.0.3/README.rst 2017-01-09 16:47:01.000000000 +0000 @@ -4,13 +4,16 @@ Mopidy-InternetArchive is a Mopidy_ extension for playing music from the `Internet Archive`_. +This extension lets you search for and stream recordings ranging from +`alternative news programming`_, to `Grateful Dead concerts`_, to `Old +Time Radio shows`_, to `book and poetry readings`_, to `original +music`_ uploaded by Internet Archive users. It also gives you access +to a vast number of high-quality live recordings from the `Live Music +Archive`_, and thousands of free audiobooks from the LibriVox_ +collection. -Installation ------------------------------------------------------------------------- - -Mopidy-InternetArchive can be installed using pip_ by running:: - - pip install Mopidy-InternetArchive +For more information and installation instructions, please see +Mopidy-InternetArchive's online documentation_. Project Resources @@ -20,10 +23,6 @@ :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ :alt: Latest PyPI version -.. image:: https://img.shields.io/pypi/dm/Mopidy-InternetArchive.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-InternetArchive/ - :alt: Number of PyPI downloads - .. image:: http://img.shields.io/travis/tkem/mopidy-internetarchive/master.svg?style=flat :target: https://travis-ci.org/tkem/mopidy-internetarchive/ :alt: Travis CI build status @@ -33,10 +32,9 @@ :alt: Test coverage .. image:: https://readthedocs.org/projects/mopidy-internetarchive/badge/?version=latest&style=flat - :target: https://readthedocs.org/projects/mopidy-internetarchive/?badge=latest + :target: http://mopidy-internetarchive.readthedocs.org/en/latest/ :alt: Documentation Status -- `Documentation`_ - `Issue Tracker`_ - `Source Code`_ - `Change Log`_ @@ -45,15 +43,20 @@ License ------------------------------------------------------------------------ -Copyright (c) 2014, 2015 Thomas Kemmer. +Copyright (c) 2014-2017 Thomas Kemmer. Licensed under the `Apache License, Version 2.0`_. .. _Mopidy: http://www.mopidy.com/ -.. _Internet Archive: http://archive.org/ - -.. _pip: https://pip.pypa.io/en/latest/ +.. _Internet Archive: http://archive.org +.. _alternative news programming: https://archive.org/details/audio_news +.. _Grateful Dead concerts: https://archive.org/details/GratefulDead +.. _Old Time Radio shows: https://archive.org/details/radioprograms +.. _book and poetry readings: https://archive.org/details/audio_bookspoetry +.. _original music: https://archive.org/details/opensource_audio +.. _Live Music Archive: https://archive.org/details/etree +.. _LibriVox: https://archive.org/details/librivoxaudio .. _Documentation: http://mopidy-internetarchive.readthedocs.org/en/latest/ .. _Issue Tracker: https://github.com/tkem/mopidy-internetarchive/issues/ diff -Nru mopidy-internetarchive-2.0.0/setup.cfg mopidy-internetarchive-2.0.3/setup.cfg --- mopidy-internetarchive-2.0.0/setup.cfg 2015-12-08 15:58:39.000000000 +0000 +++ mopidy-internetarchive-2.0.3/setup.cfg 2017-06-16 12:57:14.000000000 +0000 @@ -10,11 +10,7 @@ build-dir = docs/_build all_files = 1 -[upload_sphinx] -upload-dir = docs/_build/html - [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -Nru mopidy-internetarchive-2.0.0/setup.py mopidy-internetarchive-2.0.3/setup.py --- mopidy-internetarchive-2.0.0/setup.py 2015-12-08 15:54:23.000000000 +0000 +++ mopidy-internetarchive-2.0.3/setup.py 2017-01-09 16:47:01.000000000 +0000 @@ -5,10 +5,11 @@ def get_version(filename): from re import findall - with open(filename) as fh: - metadata = dict(findall("__([a-z]+)__ = '([^']+)'", fh.read())) + with open(filename) as f: + metadata = dict(findall("__([a-z]+)__ = '([^']+)'", f.read())) return metadata['version'] + setup( name='Mopidy-InternetArchive', version=get_version('mopidy_internetarchive/__init__.py'), @@ -27,8 +28,8 @@ 'setuptools', 'Mopidy >= 1.1', 'Pykka >= 1.1', - 'requests >= 2.0', 'cachetools >= 1.0', + 'requests >= 2.0', 'uritools >= 1.0' ], entry_points={ diff -Nru mopidy-internetarchive-2.0.0/tests/test_search.py mopidy-internetarchive-2.0.3/tests/test_search.py --- mopidy-internetarchive-2.0.0/tests/test_search.py 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/tests/test_search.py 2017-06-16 12:56:26.000000000 +0000 @@ -7,7 +7,7 @@ client_mock.search.return_value = client_mock.SearchResult({ 'responseHeader': { 'params': { - 'q': 'album' + 'query': 'album' } }, 'response': { diff -Nru mopidy-internetarchive-2.0.0/tests/test_translator.py mopidy-internetarchive-2.0.3/tests/test_translator.py --- mopidy-internetarchive-2.0.0/tests/test_translator.py 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/tests/test_translator.py 2017-01-09 16:47:01.000000000 +0000 @@ -128,15 +128,26 @@ 'mediatype': 'collection', 'title': 'Foo' }) + # as of Dec 2016, items in oldtimeradio collections return title as list + assert models.Ref.album(name='#1', uri='internetarchive:otr') == ref({ + 'identifier': 'otr', + 'mediatype': 'audio', + 'title': ['#1', '#2'] + }) + assert models.Ref.directory(name='#1', uri='internetarchive:otr') == ref({ + 'identifier': 'otr', + 'mediatype': 'collection', + 'title': ['#1', '#2'] + }) def test_artists(artists=translator.artists): - assert None == artists({}) - assert None == artists({'artist': ''}) - assert None == artists({'creator': ''}) - assert None == artists({'artist': '', 'creator': ''}) - assert None == artists({'creator': []}) - assert None == artists({'artist': '', 'creator': []}) + assert artists({}) is None + assert artists({'artist': ''}) is None + assert artists({'creator': ''}) is None + assert artists({'artist': '', 'creator': ''}) is None + assert artists({'creator': []}) is None + assert artists({'artist': '', 'creator': []}) is None assert [models.Artist(name='foo')] == artists({ 'artist': 'foo' }) diff -Nru mopidy-internetarchive-2.0.0/tox.ini mopidy-internetarchive-2.0.3/tox.ini --- mopidy-internetarchive-2.0.0/tox.ini 2015-12-05 20:52:53.000000000 +0000 +++ mopidy-internetarchive-2.0.3/tox.ini 2017-01-09 16:47:01.000000000 +0000 @@ -1,21 +1,33 @@ [tox] -envlist = py27, flake8 +envlist = check-manifest,docs,flake8,py27 [testenv] sitepackages = true deps = mock - mopidy==dev pytest pytest-cov pytest-xdist -install_command = pip install --allow-unverified=mopidy --pre {opts} {packages} commands = - py.test --basetemp={envtmpdir} --cov=mopidy_internetarchive --cov-report=term-missing {posargs} + py.test --basetemp={envtmpdir} --cov=mopidy_internetarchive {posargs} + +[testenv:check-manifest] +deps = + check-manifest +commands = + check-manifest +skip_install = true + +[testenv:docs] +deps = + sphinx +commands = + sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html [testenv:flake8] deps = flake8 flake8-import-order +commands = + flake8 skip_install = true -commands = flake8 diff -Nru mopidy-internetarchive-2.0.0/.travis.yml mopidy-internetarchive-2.0.3/.travis.yml --- mopidy-internetarchive-2.0.0/.travis.yml 2015-09-14 06:08:48.000000000 +0000 +++ mopidy-internetarchive-2.0.3/.travis.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -sudo: false - -language: python - -python: - - "2.7_with_system_site_packages" - -addons: - apt: - sources: - - mopidy-stable - packages: - - mopidy - -env: - - TOX_ENV=py27 - - TOX_ENV=flake8 - -install: - - "pip install tox" - -script: - - "tox -e $TOX_ENV" - -after_success: - - "if [ $TOX_ENV == 'py27' ]; then pip install --pre coveralls; coveralls; fi"