@@ -29,15 +29,8 @@ import os import re import sys -try: - from vendor import * -except ImportError: - #Attempt to add empty __init__.py to tvdb_api - open(os.path.join(os.path.dirname(sys.argv[0]), 'vendor/tvdb_api/__init__.py'), 'w').close() - from vendor import * - +from vendor import * tvdb = tvdb_api.Tvdb() -tvdb_cache = {} r_show = r"(?P<show>[-\w. ]+?)(?P<locale>US|UK)?[-. ]*" @@ -109,16 +102,12 @@ def filter(n): lookup += ' ' + m['locale'] lookup = lookup.lower() - if lookup not in tvdb_cache: - print 'Fetching series data for "%s"...' % lookup - tvdb_cache[lookup] = tvdb[lookup] - episode = m['episode'] if '-' in episode: episode = episode.split('-')[0] - m['title'] = tvdb_cache[lookup][int(m['season'])][int(episode)]['episodename'] - m['show'] = tvdb_cache[lookup]['seriesname'] + m['title'] = tvdb[lookup][int(m['season'])][int(episode)]['episodename'] + m['show'] = tvdb[lookup]['seriesname'] except (tvdb_api.tvdb_error, tvdb_api.tvdb_shownotfound, tvdb_api.tvdb_seasonnotfound, tvdb_api.tvdb_episodenotfound): if 'title' in m and m['title']: m['title'] = nice(m['title']) scenerename.py @@ -1 +1 @@ -Subproject commit b70994f7116e4c5359330f12b7e753de78a2598d +Subproject commit ad0db1ebcf19b16119fb2410d8ddc67ce0b76b58 vendor/tvdb_api d687481bfb522e9549209c6b89c1ba5c16b5c7c9 JakeWharton jakewharton@gmail.com http://github.com/Knio/scenerename/commit/c5b9cfdea6c8c80022b36a55a7ca31f27a77db08 c5b9cfdea6c8c80022b36a55a7ca31f27a77db08 2009-05-21T09:34:15-07:00 2009-05-21T09:34:15-07:00 Updated tvdb_api to latest version (fixes __init__.py problem). Removed local cache since tvdb_api caches internally. e9d5cfd95635f465cd385bf558a9d817cd4158ff JakeWharton jakewharton@gmail.com