nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-18 20:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using a document key for PK

Browse Source
This commit is contained in:
Andrew Williams
2010-12-20 11:21:09 +00:00
parent 7cce96a4a5
commit a41ab81712
2 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
eve_proxy/models.py
View File

@@ -54,20 +54,15 @@ class CachedDocumentManager(models.Manager):
"""
url = self.construct_url(url_path, params)
doc_key = hashlib.sha1(url).hexdigest()
try:
doc = super(CachedDocumentManager, self).get_query_set().get(url_path=url)
except self.model.MultipleObjectsReturned:
super(CachedDocumentManager, self).get_query_set().filter(url_path=url).delete()
doc = CachedDocument(url_path=url)
doc = super(CachedDocumentManager, self).get_query_set().get(pk=doc_key)
except self.model.DoesNotExist:
doc = CachedDocument(url_path=url)
doc = CachedDocument(pk=doc_key, url_path=url)
if doc.pk and no_cache:
doc.delete()
doc = CachedDocument(url_path=url)
if not doc.cached_until or datetime.utcnow() > doc.cached_until:
if not doc.cached_until or datetime.utcnow() > doc.cached_until or no_cache:
req = urllib2.Request(url)
req.add_header('CCP-Contact', 'matalok@pleaseignore.com')
@@ -113,7 +108,8 @@ class CachedDocument(models.Model):
"""
This is a cached XML document from the EVE API.
"""
url_path = models.CharField(max_length=255, unique=True)
doc_key = models.CharField(max_length=40, primary_key=True)
url_path = models.CharField(max_length=255)
body = models.TextField()
time_retrieved = models.DateTimeField(blank=True, null=True)
cached_until = models.DateTimeField(blank=True, null=True)