diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:35:48 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:35:48 -0400 |
commit | f8e3c3b96277dc66a0d378b5d825bf1837daf1ee (patch) | |
tree | a14af7bf10f170938de28c316c1271d247e16d3c /releng/models.py | |
parent | 6e6f3c906c59360c792d3387eb0662f7f0f3eddc (diff) | |
parent | 824bd93116c4c0a48d7112ae0bceb46e70851df5 (diff) |
Merge branch 'master-nomake'
Diffstat (limited to 'releng/models.py')
-rw-r--r-- | releng/models.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/releng/models.py b/releng/models.py index 47803a36..a3af54f9 100644 --- a/releng/models.py +++ b/releng/models.py @@ -119,14 +119,13 @@ class Release(models.Model): release_date = models.DateField(db_index=True) version = models.CharField(max_length=50, unique=True) kernel_version = models.CharField(max_length=50, blank=True) - torrent_infohash = models.CharField(max_length=40, blank=True) md5_sum = models.CharField('MD5 digest', max_length=32, blank=True) sha1_sum = models.CharField('SHA1 digest', max_length=40, blank=True) - file_size = PositiveBigIntegerField(null=True, blank=True) created = models.DateTimeField(editable=False) available = models.BooleanField(default=True) info = models.TextField('Public information', blank=True) - torrent_data = models.TextField(blank=True) + torrent_data = models.TextField(blank=True, + help_text="base64-encoded torrent file") class Meta: get_latest_by = 'release_date' @@ -150,8 +149,9 @@ class Release(models.Model): ] if settings.TORRENT_TRACKERS: query.extend(('tr', uri) for uri in settings.TORRENT_TRACKERS) - if self.torrent_infohash: - query.insert(0, ('xt', "urn:btih:%s" % self.torrent_infohash)) + metadata = self.torrent() + if metadata and 'info_hash' in metadata: + query.insert(0, ('xt', "urn:btih:%s" % metadata['info_hash'])) return "magnet:?%s" % '&'.join(['%s=%s' % (k, v) for k, v in query]) def info_html(self): |