Commit 0458a324 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.62'

parents c0e0c04b 6b018224
# Changelog
- * a58bf3d - 2018-08-27: Release v9.3.61
- * 26cd567 - 2018-08-27: Release v9.3.62
- * c831b4d - 2018-08-27: Fixed issue with TheTVDB indexer cache
- * c4c732f - 2018-08-27: Release v9.3.61
- * 085b442 - 2018-08-26: Shows returned from search filtered if show in library
- * ebd6252 - 2018-08-26: Release v9.3.60
- * a92e6b5 - 2018-08-26: Fixed issue with TheTVDB cache storing dict keys as strings instead of integer
......
......@@ -22,6 +22,7 @@ import functools
import io
import json
import os
import pickle
import re
import time
import urlparse
......@@ -311,18 +312,10 @@ class Tvdb:
headers = {}
self.shows = ShowCache()
if os.path.isfile(os.path.join(sickrage.app.data_dir, 'thetvdb.json')):
with io.open(os.path.join(sickrage.app.data_dir, 'thetvdb.json'), 'rb') as fp:
if os.path.isfile(os.path.join(sickrage.app.data_dir, 'thetvdb.db')):
with io.open(os.path.join(sickrage.app.data_dir, 'thetvdb.db'), 'rb') as fp:
try:
def json_keys2int(x):
if isinstance(x, dict):
try:
return {int(k): v for k, v in x.items()}
except ValueError:
pass
return x
self.shows = ShowCache(json.load(fp, object_hook=json_keys2int))
self.shows = ShowCache(pickle.load(fp))
except:
pass
......@@ -662,8 +655,8 @@ class Tvdb:
self._setShowData(sid, 'last_updated', int(time.mktime(datetime.now().timetuple())))
# save show cache
with io.open(os.path.join(sickrage.app.data_dir, 'thetvdb.json'), 'wb') as fp:
json.dump(self.shows, fp)
with io.open(os.path.join(sickrage.app.data_dir, 'thetvdb.db'), 'wb') as fp:
pickle.dump(self.shows, fp)
return self.shows[int(sid)]
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:15\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:02\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-08-27 11:14-0700\n"
"PO-Revision-Date: 2018-08-27 18:14\n"
"POT-Creation-Date: 2018-08-27 22:01-0700\n"
"PO-Revision-Date: 2018-08-28 05:01\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Finnish\n"
"MIME-Version: 1.0\n"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment