diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
commit | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (patch) | |
tree | f608874663d24f19ecf175ec556f2a330d47a726 /releng/models.py | |
parent | 747a562ddca10e29dd003e8b3c59f8f384d1bc8d (diff) | |
parent | cd7222047b41ac3efa389a22fdd22148d03c1d61 (diff) |
Merge tag 'release_2014-03-22' into archweb-generic
Fix long filenames; local storage for filter prefs
Conflicts:
templates/public/download.html
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): |