Merge branch 'master' into docker

Author: mattcen

README.md

@@ -11,7 +11,7 @@ mygpo is licensed under the GNU Affero General Public License Version 3. See fil
 
 Installation
 ------------
-See the [installation instructions](http://gpoddernet.readthedocs.io/en/latest/dev/installation.html) for details.
+See the [installation instructions](https://gpoddernet.readthedocs.io/en/latest/dev/installation.html) for details.
 
 
 Bugs
@@ -21,17 +21,22 @@ Please report bugs in the [GitHub issue tracker](https://github.com/gpodder/mygp
 
 Contributing
 ------------
-gpodder.net is an open source project and your contributions are wanted and appreciated.  To get started please see the [developer documentation](http://gpoddernet.readthedocs.io/en/latest/dev/index.html).
+gpodder.net is an open source project and your contributions are wanted and appreciated.  To get started please see the [developer documentation](https://gpoddernet.readthedocs.io/en/latest/dev/index.html).
 
+Slack
+------------
+Join our Slack channel: [gpodder-net.slack.com](https://gpodder-net.slack.com/)
+
+[Invitation link](https://join.slack.com/t/gpodder-net/shared_invite/zt-aaiagl5i-uZeqVR8w1Yf_G~9rhktRfw)
 
 Mailing List
 ------------
-mygpo and gpodder.net related issues are discussed on the [gPodder Mailing List](https://gpodder.github.io/docs/mailing-list.html).
+gpodder.org related issues are discussed on the [gPodder Mailing List](https://gpodder.github.io/docs/mailing-list.html).
 
 
 Documentation
 -------------
-Documentation, especially for the API, is stored in the [**doc** folder](https://github.com/gpodder/mygpo/tree/master/doc) and can be read on [ReadTheDocs](http://gpoddernet.readthedocs.io/en/latest/index.html).
+Documentation, especially for the API, is stored in the [**doc** folder](https://github.com/gpodder/mygpo/tree/master/doc) and can be read on [ReadTheDocs](https://gpoddernet.readthedocs.io/en/latest/index.html).
 
 
 Name (Why mygpo?)

conf/gunicorn.conf.py

@@ -1,21 +1,22 @@
 import multiprocessing
+import os
 
 bind = "unix:/tmp/mygpo.sock"
 workers = multiprocessing.cpu_count()
 
 # The maximum number of requests a worker will process before restarting.
 # max_requests = 1000
 
-errorlog='/var/log/gunicorn/error.log'
-accesslog='/var/log/gunicorn/access.log'
-loglevel='info'
+errorlog = "/var/log/gunicorn/error.log"
+accesslog = "/var/log/gunicorn/access.log"
+loglevel = "info"
 
 timeout = 120
 graceful_timeout = 60
 
 
 def get_bool(name, default):
-    return os.getenv(name, str(default)).lower() == 'true'
+    return os.getenv(name, str(default)).lower() == "true"
 
 
 def _post_fork_handler(server, worker):
@@ -24,7 +25,7 @@ def _post_fork_handler(server, worker):
 
 
 # check if we want to use gevent
-_USE_GEVENT = get_bool('USE_GEVENT', False)
+_USE_GEVENT = get_bool("USE_GEVENT", False)
 
 
 try:
@@ -38,7 +39,7 @@ def _post_fork_handler(server, worker):
     # Active gevent-related settings
 
     worker_connections = 100
-    worker_class = 'gevent'
+    worker_class = "gevent"
 
     # activate the handler
     post_fork = _post_fork_handler

conftest.py

@@ -3,7 +3,7 @@
 
 @pytest.fixture(autouse=True)
 def enable_db_access_for_all_tests(db):
-    """ Enable DB access for all tests
+    """Enable DB access for all tests
 
-    http://pytest-django.readthedocs.io/en/latest/faq.html#how-can-i-give-database-access-to-all-my-tests-without-the-django-db-marker """
+    http://pytest-django.readthedocs.io/en/latest/faq.html#how-can-i-give-database-access-to-all-my-tests-without-the-django-db-marker"""
     pass

doc/_ext/jsonlexer.py

@@ -2,7 +2,8 @@ def setup(app):
     # enable Pygments json lexer
     try:
         import pygments
-        if pygments.__version__ >= '1.5':
+
+        if pygments.__version__ >= "1.5":
             # use JSON lexer included in recent versions of Pygments
             from pygments.lexers import JsonLexer
         else:
@@ -11,4 +12,4 @@ def setup(app):
     except ImportError:
         pass  # not fatal if we have old (or no) Pygments and no pygments-json
     else:
-        app.add_lexer('json', JsonLexer())
+        app.add_lexer("json", JsonLexer())

doc/api/api1.rst

@@ -180,23 +180,16 @@ the toplist:
        "title": "FLOSS Weekly",
        "description": "Free, Libre and Open Source Software with Leo.",
        "subscribers": 4711,
-       "subscribers_last_week": 4700
       },
       {"url": "http://feeds.feedburner.com/LinuxOutlaws",
        "title": "The Linux Outlaws",
        "description": "A podcast about Linux with Dan and Fab.",
        "subscribers": 1337,
-       "subscribers_last_week": 1330,
       }]
 
 All shown keys must be provided by the server. The ``description`` field may be
 set to the empty string in case a description is not available. The ``title``
-field may be set to the URL in case a title is not available. The
-``subscribers_last_week`` field may be set to zero if no data is available. The
-client can use the ``subscribers_last_week`` counts to re-sort the list and get
-a ranking for the last week. With this information, a relative "position
-movement" can also be calculated if the developer of the client decides to do
-so.
+field may be set to the URL in case a title is not available.
 
 Downloading podcast suggestions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

doc/api/index.rst

@@ -25,6 +25,9 @@ compatibility. See :doc:`changes` for a list of changes. The current
 version is 2.11. This versioning scheme has been introduced in `bug 1273
 <https://bugs.gpodder.org/show_bug.cgi?id=1273>`_.
 
+The API is available as a machine-readable file in OpenAPI format at
+https://raw.githubusercontent.com/gpodder/mygpo/master/mygpo/api/openapi.yaml
+
 Contents
 --------
 

doc/api/reference/directory.rst

@@ -113,11 +113,10 @@ Retrieve Podcast Data
          "title": "Coverville",
          "author": "Brian Ibbott",
          "url": "http://feeds.feedburner.com/coverville",
-         "subscribers_last_week": 19,
          "logo_url": "http://www.coverville.com/art/coverville_iTunes300.jpg"
         }
 
-    ::query url: the feed URL of the podcast
+    :query url: the feed URL of the podcast
 
 
 .. _api-episode-data:
@@ -150,8 +149,8 @@ Retrieve Episode Data
          "mygpo_link": "http://gpodder.net/episode/1046492"
         }
 
-    ::query podcast: feed URL of the podcast to which the episode belongs
-    ::query url: media URL of the episode
+    :query podcast: feed URL of the podcast to which the episode belongs
+    :query url: media URL of the episode
 
 
 Podcast Toplist
@@ -183,7 +182,6 @@ Podcast Toplist
            "author": "Sixgun Productions",
            "url": "http://feeds.feedburner.com/linuxoutlaws",
            "position_last_week": 0,
-           "subscribers_last_week": 1736,
            "subscribers": 1736,
            "mygpo_link": "http://www.gpodder.net/podcast/11092",
            "logo_url": "http://linuxoutlaws.com/files/albumart-itunes.jpg"
@@ -195,7 +193,6 @@ Podcast Toplist
            "author": "Leo Laporte",
            "url": "http://feeds.twit.tv/floss_video_large",
            "position_last_week": 0,
-           "subscribers_last_week": 50,
            "subscribers": 50,
            "mygpo_link": "http://www.gpodder.net/podcast/31991",
            "logo_url": "http://static.mediafly.com/publisher/images/06cecab60c784f9d9866f5dcb73227c3/icon-150x150.png"
@@ -223,12 +220,7 @@ Podcast Toplist
 
     All shown keys must be provided by the server. The description field may be
     set to the empty string in case a description is not available. The title
-    field may be set to the URL in case a title is not available. The
-    subscribers_last_week field may be set to zero if no data is available. The
-    client can use the subscribers_last_week counts to re-sort the list and get
-    a ranking for the last week. With this information, a relative "position
-    movement" can also be calculated if the developer of the client decides to
-    do so.
+    field may be set to the URL in case a title is not available.
 
 
 Podcast Search

doc/api/reference/general.rst

@@ -105,7 +105,6 @@ JSON
        "author": "Sixgun Productions",
        "url": "http://feeds.feedburner.com/linuxoutlaws",
        "position_last_week": 1,
-       "subscribers_last_week": 1943,
        "subscribers": 1954,
        "mygpo_link": "http://gpodder.net/podcast/11092",
        "logo_url": "http://sixgun.org/files/linuxoutlaws.jpg",
@@ -128,7 +127,6 @@ XML
       <author>Sixgun Productions</author>
       <description>The hardest-hitting Linux podcast around</description>
       <subscribers>1954</subscribers>
-      <subscribers_last_week>1943</subscribers_last_week>
       <logo_url>http://sixgun.org/files/linuxoutlaws.jpg</logo_url>
       <scaled_logo_url>http://gpodder.net/logo/64/fa9fd87a4f9e488096e52839450afe0b120684b4.jpg</scaled_logo_url>
      </podcast>

doc/api/reference/suggestions.rst

@@ -31,7 +31,6 @@ Retrieve Suggested Podcasts
            "title": "Linux Geekdom",
            "author": "aj@linuxgeekdom.com (A.J. Stringham)",
            "url": "http://www.linuxgeekdom.com/rssmp3.xml",
-           "subscribers_last_week": 0,
            "logo_url": null
          },
          {
@@ -42,7 +41,6 @@ Retrieve Suggested Podcasts
            "title": "Going Linux",
            "author": "Larry Bushey",
            "url": "http://goinglinux.com/mp3podcast.xml",
-           "subscribers_last_week": 571,
            "logo_url": "http://goinglinux.com/images/GoingLinux80.png"
          }]