antizapret fix by inpos

pull/2/head
DiMartinoXBMC 2016-03-12 20:45:29 +03:00
parent 89d23556bb
commit 55cb8797e2
1 changed files with 32 additions and 24 deletions

View File

@ -14,28 +14,36 @@ if not os.path.exists(CACHE_DIR):
CACHE = 24 * 3600 # 24 hour caching
@contextmanager
#@contextmanager
def shelf(filename, ttl=0):
import shelve
filename = os.path.join(CACHE_DIR, filename)
with LOCKS.get(filename, threading.RLock()):
with closing(shelve.open(filename, writeback=True)) as d:
# with closing(shelve.open(filename, writeback=True)) as d:
d = shelve.open(filename, writeback=True)
try:
import time
if not d:
if not dict(d):
d.update({
"created_at": time.time(),
"data": {},
})
elif ttl > 0 and (time.time() - d["created_at"]) > ttl:
d["created_at"] = time.time()
d["data"] = {}
yield d["data"]
return d
except:
d.close()
raise
_config = {}
def config():
global _config
if not _config:
with shelf("antizapret.pac_config", ttl=CACHE) as pac_config:
# with shelf("antizapret.pac_config", ttl=CACHE) as pac_config:
d = shelf("antizapret.pac_config2", ttl=CACHE)
pac_config = d['data']
if not pac_config:
log("[antizapret]: Fetching Antizapret PAC file on %s" %PAC_URL)
try:
@ -50,6 +58,7 @@ def config():
else:
pac_config["server"] = None
pac_config["domains"] = []
d.close()
_config = pac_config
return _config
@ -96,4 +105,3 @@ def url_get(url, params={}, headers={}, post = None):
except urllib2.HTTPError as e:
log("[antizapret]: HTTP Error(%s): %s" % (e.errno, e.strerror))
return None