12 files changed, 171 insertions, 116 deletions

diff --git a/.gitignore b/.gitignore
index 55cf740..6296ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,3 @@ MANIFEST
 *.xml
 *.save
 downloads/
-youtube-podcaster.json
diff --git a/README.rst b/README.rst
index b485fbb..9b66292 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,4 @@
+=================
 YouTube Podcaster
 =================
 
diff --git a/docs/index.rst b/docs/index.rst
index 62a305d..73e63f8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,29 +1,4 @@
-=================
-youtube-podcaster
-=================
-
-This is the documentation of **youtube-podcaster**.
-
-.. note::
-
-    This is the main page of your project's `Sphinx <http://sphinx-doc.org/>`_
-    documentation. It is formatted in `reStructuredText
-    <http://sphinx-doc.org/rest.html>`__. Add additional pages by creating
-    rst-files in ``docs`` and adding them to the `toctree
-    <http://sphinx-doc.org/markup/toctree.html>`_ below. Use then
-    `references <http://sphinx-doc.org/markup/inline.html>`__ in order to link
-    them from this page, e.g. :ref:`authors <authors>` and :ref:`changes`.
-    It is also possible to refer to the documentation of other Python packages
-    with the `Python domain syntax
-    <http://sphinx-doc.org/domains.html#the-python-domain>`__. By default you
-    can reference the documentation of `Sphinx <http://sphinx.pocoo.org>`__,
-    `Python <http://docs.python.org/>`__, `matplotlib
-    <http://matplotlib.sourceforge.net>`__, `NumPy
-    <http://docs.scipy.org/doc/numpy>`__, `Scikit-Learn
-    <http://scikit-learn.org/stable>`__, `Pandas
-    <http://pandas.pydata.org/pandas-docs/stable>`__, `SciPy
-    <http://docs.scipy.org/doc/scipy/reference/>`__. You can add more by
-    extending the ``intersphinx_mapping`` in your Sphinx's ``conf.py``.
+.. include:: ../README.rst
 
 Contents
 ========
diff --git a/setup.cfg b/setup.cfg
index f1b8f8c..e559f20 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,53 +6,35 @@ author-email = t0m.vd.l33@gmail.com
 license = MIT License
 home-page = http://github.com/tomvanderlee/youtube-podcaster
 description-file = README.rst
-# Add here all kinds of additional classifiers as defined under
-# https://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifiers = Development Status :: 3 - Alpha,
-              License :: OSI Approved :: MIT License
-              Programming Language :: Python :: 3 :: Only
+        License :: OSI Approved :: MIT License
+        Programming Language :: Python :: 3 :: Only
 
 [entry_points]
 console_scripts = 
         youtube-podcaster = youtube_podcaster:main
-# Add here console scripts like:
-# console_scripts =
-#     hello_world = youtube_podcaster.module:function
-# as well as other entry_points.
-
 
 [files]
-# Add here 'data_files', 'packages' or 'namespace_packages'.
-# Additional data files are defined as key value pairs of source and target:
-packages =
-    youtube_podcaster
-# data_files =
-#    share/youtube_podcaster_docs = docs/*
+packages = 
+        youtube_podcaster
+data_files = 
+        share/man/man1/ = docs/_build/man/*
+        share/youtube-podcaster/ = youtube-podcaster.json.example
 
 [extras]
-# Add here additional requirements for extra features, like:
-# PDF =
-#    ReportLab>=1.2
-#    RXP
 
 [test]
-# py.test options when running `python setup.py test`
 addopts = tests
 
 [pytest]
-# Options for py.test:
-# Specify command line options as you would do when invoking py.test directly.
-# e.g. --cov-report html (or xml) for html/xml output or --junitxml junit.xml
-# in order to write a coverage file that can be read by Jenkins.
-addopts =
-    --cov youtube_podcaster --cov-report term-missing
-    --verbose
+addopts = 
+        --cov youtube_podcaster --cov-report term-missing
+        --verbose
 
 [aliases]
 docs = build_sphinx
 
 [bdist_wheel]
-# Use this option if your package is pure-python
 universal = 1
 
 [build_sphinx]
@@ -60,17 +42,11 @@ source_dir = docs
 build_dir = docs/_build
 
 [pbr]
-# Let pbr run sphinx-apidoc
 autodoc_tree_index_modules = True
-# autodoc_tree_excludes = ...
-# Let pbr itself generate the apidoc
-# autodoc_index_modules = True
-# autodoc_exclude_modules = ...
-# Convert warnings to errors
-# warnerrors = True
 
 [devpi:upload]
-# Options for the devpi: PyPI serer and packaging tool
-# VCS export must be deactivated since we are using setuptools-scm
 no-vcs = 1
 format = bdist_wheel
+
+[easy_install]
+
diff --git a/youtube-podcaster.json.example b/youtube-podcaster.json.example
new file mode 100644
index 0000000..d9b48af
--- /dev/null
+++ b/youtube-podcaster.json.example
@@ -0,0 +1,21 @@
+{
+    "server" : {
+        "interface": "0.0.0.0",
+        "port": 8888
+    },
+
+    "youtube": {
+        "api-key": ""
+    },
+
+    "podcasts": [{
+        "username": "",
+        "playlists": [""]
+    }],
+
+    "downloads": {
+        "format": "vorbis",
+        "path": "/tmp/downloads/",
+        "url": "localhost"
+    }
+}
diff --git a/youtube_podcaster/__init__.py b/youtube_podcaster/__init__.py
index 32aee7c..77ab9cc 100644
--- a/youtube_podcaster/__init__.py
+++ b/youtube_podcaster/__init__.py
@@ -1,27 +1,47 @@
 #!/usr/bin/env python3
 
-import json
+import argparse
 
-from http.server import (
-    HTTPServer,
-)
+from http.server import HTTPServer
 
-from . import (
-    youtube,
+from .podcastfeeder import create_feeder
+from .config import (
+        Config,
+        ConfigException
 )
 
-from .podcastfeeder import (
-    create_feeder
-)
+"""
+Start the program
+"""
 
 
 def main():
-    config = json.load(open("youtube-podcaster.json"))
+    arg_parser = argparse.ArgumentParser(prog="youtube-podcaster",
+                                         description="Converts youtube \
+                                         playlists to RSS-feeds")
+    arg_parser.add_argument("-c", "--config",
+                            dest="config",
+                            help="Use CONFIG as the config file")
+    arg_parser.add_argument("-i", "--interface",
+                            dest="interface",
+                            help="The interface the http server will listen on")
+    arg_parser.add_argument("-p", "--port",
+                            dest="port",
+                            help="The port the http server will listen on")
+    arg_parser.add_argument("--api-key",
+                            dest="apikey",
+                            help="The YouTube API v3 key")
+    args = arg_parser.parse_args()
 
     try:
-        PodcastFeeder = create_feeder(config["youtube"], config["podcasts"])
-        server = HTTPServer(("", 8888), PodcastFeeder)
+        config = Config.parse_config(args)
+
+        PodcastFeeder = create_feeder(config)
+
+        server = HTTPServer(config.get_server_address(), PodcastFeeder)
         server.serve_forever()
+    except ConfigException as e: