Merged TV branch into Master

commit 832968da2df9313097b1a00c8fea4bb37aa91177
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 23:24:04 2014 +0100

    Moved imports into __main__

commit 4843db31e9cef6466f3ff0f4f3ad4b7d19f7737f
Merge: de1c41a dc63229
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 22:52:12 2014 +0100

    Merge branch 'master' into tv

    Conflicts:
    	src/Config.py

commit de1c41a51cfb46f19bbf365790fe95e160171757
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 21:51:57 2014 +0100

    Added support for multi-episodes

    Fixes #8

commit a298168d954cc0152374e3c4ac907d77343a9031
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 18:22:18 2014 +0100

    Added missing import

commit 2de615558f42b301d802752c36acabb5c5cb5b6f
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 15:11:35 2014 +0100

    Temporary bugfix for multi-episodes

commit bce5105c92317cd249c1e92a4a7a10107837cf67
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 13:47:14 2014 +0100

    Ooops

commit d3636b973a1aa471982e3fc2d4b56dc6bd260251
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 13:46:04 2014 +0100

    Fixed call of utils.download()

commit 5f26beaa17f58d4b6ce762c8f9673271c31ade1a
Merge: 2213bc5 38575d1
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Feb 8 13:38:25 2014 +0100

    Merge branch 'master' into tv

commit 2213bc5eb4cf7c545ff3acda370ff6a8423c3849
Merge: a4bf0f7 9a3aee7
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 19:23:14 2014 +0100

    Merge branch 'master' into tv

commit a4bf0f7f005186dba7842739a0a4a0e63854c830
Merge: 7cb8ce9 217468d
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:43:57 2014 +0100

    Merge branch 'master' into tv

commit 7cb8ce9cf56f705776b34eae234ec016b4192ea5
Merge: 73154c7 4bdbaee
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:40:49 2014 +0100

    Merge branch 'master' into tv

commit 4bdbaeefb947b28a343015dee24d99cb1b3d9f01
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:36:18 2014 +0100

    Logger splits logfiles now more intelligent

    Logfiles gets split when they are larger than 1024kb.
    But only on startup - logfiles won't split within a process.

    Fixed #7

commit 73154c7b683fc2440824966a08f47de32637153c
Merge: 7673973 04568ff
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:37:39 2014 +0100

    Merge branch 'master' into tv

commit 04568ff1c21d74d2d67f9944161ca0e40408dd39
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:36:18 2014 +0100

    Logger splits logfiles now more intelligent

    Logfiles gets split when they are larger than 1024kb. But only on startup - logfiles won't split within a process.

commit 767397352b1a8eb9cbdefd2b1870c4cd619e756b
Merge: ef2ec44 c9a709e
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:16:26 2014 +0100

    Merge branch 'master' into tv

commit ef2ec444cdde872144b4e6d99a0bfc57799bfc45
Merge: 9e93c39 a3ade4e
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Feb 7 17:11:28 2014 +0100

    Merge branch 'master' into tv

    Conflicts:
    	src/Logger.py

commit 9e93c3989cb5c3cdc18f61d0e7acf6930cfa3309
Merge: 13f1166 c45555c
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 20:33:33 2014 +0100

    Merge branch 'master' into tv

commit 13f116639fa521c13a055cf06e6a2ab0a4fc3b65
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 20:30:16 2014 +0100

    Started to improve TvdbApi

commit 3addeaf105aec39236c8f257f3442734497116e4
Merge: 6f957b1 06b46c1
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 19:51:06 2014 +0100

    Merge branch 'master' into tv

commit 6f957b19ce1139bb02f85de9b5722362c7a636ae
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 19:37:37 2014 +0100

    Added Cached decorator to TvdbApi

commit 4d7c0ebbefa07d58b6efd5063f1b58f783237310
Merge: 244b1a8 fcd2ab3
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 19:33:40 2014 +0100

    Merge branch 'master' into tv

commit 244b1a872fa2e0ed51f0548f3aab5b07a39634de
Merge: e94c102 ef0b259
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 19:21:24 2014 +0100

    Merged from Master

commit e94c102049cc28156ab4b18fb3f3f5800cb07c55
Merge: aaff211 2f9eb15
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:57:58 2014 +0100

    Merge branch 'master' into tv

    Conflicts:
    	src/Config.py

commit 2f9eb15a92742c8dc2fb1d76145a299631f32a64
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:56:01 2014 +0100

    Added explicit Exception.

commit aaff211cc75c60ce023a8716f2d9aae52623ec45
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:52:12 2014 +0100

    Fixed season scraper

commit 6e117dca8e13ecafd5cbd9c4fa0b6aebf246afdb
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:47:51 2014 +0100

    Merged Master

commit c7a5c35ed17afee82436bfdaf548cd7eb7f613aa
Merge: 65c8d68 5ae2581
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:38:16 2014 +0100

    Merge branch 'master' into tv

    Conflicts:
    	src/TmdbApi.py

commit 5ae2581b7e1a87bee172a9d168d33f787885b0af
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:35:24 2014 +0100

    Removed class from Logger

commit 3d810bfa9165470c91ab20c8272713053fa08e53
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:27:52 2014 +0100

    Fixed layout of Logger

commit 5631ba2a7a3134a16b719278640c2331d1af67fc
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:26:24 2014 +0100

    Moved downloader to utils

commit 67dfe60523572e44e9d8630d2135df21985bde47
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Feb 6 00:19:02 2014 +0100

    removed class from Downloader

commit 65c8d683114661ceabbda4de607f7994b91c6f47
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 23:34:19 2014 +0100

    Removed class from TvScraper

commit 0e2a13cf2c6d5d000ee3971638fdde1f95e113f6
Merge: 527f7c3 375963c
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 23:16:02 2014 +0100

    Merge branch 'master' into tv

commit 527f7c3060590400086e8f3d4fc4d0ce14cd1777
Merge: e01cff5 3c2afad
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 23:14:28 2014 +0100

    Merge branch 'master' into tv

commit e01cff5aa72116aabdbcc280ecaf11147db260f2
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 23:06:23 2014 +0100

    Implemented --season parameter

commit c095e58beb1e5060944e15ce3f9cfe0e0fadafe8
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 21:34:02 2014 +0100

    Fixed test

commit 288a0ea3d04293c88d4c5c572078d521954f0571
Merge: 2642c7d 4874e22
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 21:33:43 2014 +0100

    Merge branch 'master' into tv

commit 2642c7d20f553ee898679a95a0ef6f60629d897f
Merge: 6f3a42d 50c012d
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 21:30:00 2014 +0100

    Merge branch 'master' into tv

    Conflicts:
    	pyscrape/tests/RegEx.py
    	src/RegEx.py
    	src/tests/RegEx.Movie.py
    	src/tests/RegEx.py

commit 6f3a42d6b8fc1f0fcfeb4848ca0e15fd8d442a99
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 21:06:05 2014 +0100

    Added --episode parameter

commit 99504a147025b366b3bcdf689f8eb60dff4c31e0
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 20:28:34 2014 +0100

    Added explicit Exception

commit 2aec487392431f5d67aab9aaf09dce6cd0bb4bda
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Feb 5 19:55:36 2014 +0100

    Removed/Added extension

commit 6aa7881d51f2767144be813e37a68aa9139e3353
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Feb 2 05:08:42 2014 +0100

    Folder name changed

commit 6844078c8e0f0a520f26e007459c28345fb16dd1
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Feb 2 04:59:26 2014 +0100

    Added <dateadded> to NFO files

commit 9cebb4c9f044bf80b28332d8e6ce7d8fc982f772
Merge: baa569f 2d0e93f
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 31 23:48:33 2014 +0100

    Merge branch 'master' into tv

commit baa569faa3418872eedbc78bfe021734b7a42f93
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 31 15:13:24 2014 +0100

    Added tvdb id support for TmdbApi

commit 0915e77dad2cfcfe9ddfc7a39563e58ad8c696a6
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Wed Jan 29 17:56:15 2014 +0100

    Fixed Bug for missing episodes

commit d5aea3aff0bd2fd4cf3cc4fb7854156faa9c192d
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Jan 26 22:12:50 2014 +0100

    Bugfix where a poster was not found

commit 381e146e8f7ed554c5f639e46aafec77ca40b11d
Merge: e9a82f8 3bf916f
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Jan 26 16:30:36 2014 +0100

    Merge branch 'master' into tv

commit e9a82f82bc0d5f32b597ae7f6789d53abfcaa427
Merge: 90f100c 6a4b22c
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Jan 26 12:19:23 2014 +0100

    Merge branch 'master' into tv

commit 90f100cdd3aeb6a811379a5eb7c14602aaf32c98
Merge: d432cef da6adbd
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Jan 26 03:11:53 2014 +0100

    Merge branch 'master' into tv

commit d432cef166f534e9e6079ff2a3449f839709f296
Merge: 084733c 6396e3e
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sun Jan 26 03:08:13 2014 +0100

    Merged Master

commit 084733ce792c343ce7d66c683a15c29c002cafad
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 25 21:28:40 2014 +0100

    Added support for season posters

commit d6d8679d5672f8deabf980d9ff3371f7db516415
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 25 12:31:27 2014 +0100

    ffmpeg screenshot improved

commit 6d4cb943ec6c62ed1762dff9f75dc2f7b131821c
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 25 03:48:36 2014 +0100

    Encodings added

commit 5eb8a4f2c6d710fdc2bf892b2155e10721bebdea
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 25 03:14:24 2014 +0100

    typo fixed

commit da1004f53e1f73418ef2f84c6291ff3e6354f81d
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 25 01:14:20 2014 +0100

    Path parameter for single show implemented

commit 067cff39f9603c181fed7ebde149085c5199e5eb
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 22:57:10 2014 +0100

    Log message updated

commit 4648d86d47e6a832b822a94b3fef1def6ea668a3
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 22:36:01 2014 +0100

    Added --delete-existing parameter

commit be1a0e20680ec9b8e901d821a4909d4ff870b2a9
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 21:05:58 2014 +0100

    Downloader verifies now if the downloaded file is incorrupt

commit f77da5a04aa502120e027c391fe784bcf937e52f
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 18:18:07 2014 +0100

    Fixed imports

commit c602b895fe9861ea79dbe35119e8ee7733aa05da
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 18:12:43 2014 +0100

    Typo in example config fixed

commit 6ce3b5e6e3c0a72c246d2f16b7ded6982e71be95
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 17:24:39 2014 +0100

    Cached API results implemented

commit 62be4f40cabdb1d3709e6762605b0740e050e344
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 17:12:36 2014 +0100

    Show paths support implemented

commit f15ca8bace7e79705d2110d9e27c275d55fb23e0
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 16:14:44 2014 +0100

    Added Try/Except for user interrupt

commit ff786b1c281ce9d5f83806c5c7451d66c0902aad
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 16:02:40 2014 +0100

    ffmpeg options to config transfered

commit 64fd617a3c216d46ccb20a3cdc18f389e67b5121
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Fri Jan 24 02:02:18 2014 +0100

    Added support for single Episodes

    Remove unwanted audio tracks
    Create picture from episode
    Create NFO

commit be7a1f1caba47bb47c747a510f6e6128016a02e8
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Thu Jan 23 21:07:19 2014 +0100

    RegEx returns now the original filename

commit 95d698efa60a3aed7375944b789794e837d94821
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 18 20:05:21 2014 +0100

    Logger for TvScraper gets now correctly initialized

commit 7bbe0fbdcd23629a9ae9e8316059afaf13e156d8
Merge: 8216c1a 564315a
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 18 20:00:54 2014 +0100

    Merge branch 'master' into tv

commit 8216c1aa1418531665294311d97750ba1164c31d
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 18 19:39:28 2014 +0100

    Added support for season thumbs

commit 2dd36eda4447b5bded566773c76059763cc7e566
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 18 18:19:33 2014 +0100

    Fixed bug where tmdb_id was null

commit 46c31931a57a86e5abf7288ceeec33b56bcadffa
Author: SchadLucas <schad.lucas@gmail.com>
Date:   Sat Jan 11 12:24:09 2014 +0100

    Renamed test file

commit 40126bf9b9abd05dc6bafae6726140745390d879
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Wed Jan 8 12:55:06 2014 +0100

    Moved Exception class to correct folder

commit e4bd6c941f6e8ae3b8829563e6d15a0c4efeeb0b
Merge: 65777e9 afc5546
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Wed Jan 8 02:37:55 2014 +0100

    Merge branch 'tv' of https://github.com/SchadLucas/pyscrape into tv

commit 65777e9d0af844c44a292b61af448cfdd4187cd4
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Wed Jan 8 02:31:10 2014 +0100

    Added regular expressions to match episode names

commit 07dcae5a0e86ce695dcebd504790810bca763bec
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:18:40 2014 +0100

    Support for download of info and artwork for shows

    replaced TvShow class with tulpe
    implemented ShowNotFoundException
    skip scraping for a TV show when no id was found

    added download for show artwork
    primary source: fanart.tv backup source: themoviedb.org

    provided image types(XBMC/ArtworkDownloader format):
    banner
    poster
    thumb
    extrathumbs
    fanart
    extrafanart
    clearart
    folder
    logo

commit 0e180b4e33e05dfa1b6b09e9c3a022b556536d1e
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:11:27 2014 +0100

    Edited .gitignore

commit aba79bd7695b45f4e2033451a030b9e92dd3bc67
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:07:44 2014 +0100

    first attempt to create a valid tvshow.nfo

commit 82919045a03c2a60737b025af4e013177a9a0033
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Mon Jan 6 09:29:45 2014 +0100

    Initial TV commit

commit afc5546b486094fd115ff988c10374d89830e475
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:18:40 2014 +0100

    Support for download of info and artwork for shows

    replaced TvShow class with tulpe
    implemented ShowNotFoundException
    skip scraping for a TV show when no id was found

    added download for show artwork
    primary source: fanart.tv backup source: themoviedb.org

    provided image types(XBMC/ArtworkDownloader format):
    banner
    poster
    thumb
    extrathumbs
    fanart
    extrafanart
    clearart
    folder
    logo

commit e8b208e8a2f23c6fa1491efa75b4cd1d4f1b0b15
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 22:47:50 2014 +0100

    updated tmdb api url base

commit 4c90baf161f82292e20705a422ef416625e27b93
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 21:19:19 2014 +0100

    fixed missing language support for banner

commit c858562ba2da2db305e812c64853ec9dc2150fb5
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 18:42:50 2014 +0100

    made fanart api class-less

commit 2e50771c17511851b54fc7997a34537c917ad703
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:11:27 2014 +0100

    Edited .gitignore

commit e6c69703dfacfa9288b9a4834fc15990b1da5ffb
Merge: e98d9f0 dbb2458
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:09:14 2014 +0100

    Merge remote-tracking branch 'origin/tv' into tv

    Conflicts:
    	pyscrape/TvScraper.py
    	pyscrape/TvdbApi.py

commit e98d9f0922365d32450f4a059dfad8fa311f057a
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Tue Jan 7 16:07:44 2014 +0100

    first attempt to create a valid tvshow.nfo

commit 0dc51466c5a475ab1d69d4ed538934acb3ddd8ba
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Mon Jan 6 09:29:45 2014 +0100

    Initial TV commit

commit dbb2458865aa9843d56e25d0c4694ab4472fb0de
Author: Lucas Schad <schad.lucas@gmail.com>
Date:   Mon Jan 6 09:29:45 2014 +0100

    Initial TV commit