ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shelve.open fails on corrupted files

pull/15/head^2
elijahcapricorn 2017-05-08 15:13:05 +03:00
parent 2b750b47d2
commit f73bcb10a5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/proxy/antizapret.py
View File

@ -1,10 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os, re, fnmatch, threading, urllib2, time, shelve import os, re, fnmatch, threading, urllib2, time, shelve, anydbm
from contextlib import contextmanager, closing from contextlib import contextmanager, closing
from functions import log, debug, tempdir from functions import log, debug, tempdir
LOCKS = {}
PAC_URL = "http://antizapret.prostovpn.org/proxy.pac" PAC_URL = "http://antizapret.prostovpn.org/proxy.pac"
CACHE_DIR = tempdir() CACHE_DIR = tempdir()
USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36" USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36"
@ -20,7 +19,11 @@ def config():
try: try:
CONFIG_LOCK.acquire() CONFIG_LOCK.acquire()
filename = os.path.join(CACHE_DIR, "antizapret.pac_config2") filename = os.path.join(CACHE_DIR, "antizapret.pac_config2")
shelf = shelve.open(filename) try:
shelf = shelve.open(filename)
except anydbm.error:
os.remove(filename)
shelf = shelve.open(filename)
created_at = 0 created_at = 0
data = {} data = {}
@ -108,5 +111,4 @@ def url_get(url, params={}, headers={}, post = None):
return data return data
except urllib2.HTTPError as e: except urllib2.HTTPError as e:
log("[antizapret]: HTTP Error(%s): %s" % (e.errno, e.strerror)) log("[antizapret]: HTTP Error(%s): %s" % (e.errno, e.strerror))
return None return None