Useful file-related utility methods for logs

gracedb/core/models.py

@@ -213,6 +213,16 @@ class LogBase(models.Model):
         abstract = True
         ordering = ['-created', '-N']
 
+    @property
+    def full_filename(self):
+        if self.filename:
+            actual_filename = self.filename
+            if self.file_version is not None:
+                actual_filename += ",{n}".format(n=self.file_version)
+        else:
+            actual_filename = None
+        return actual_filename
+
     def fileurl(self):
         # Override this on derived classes
         return NotImplemented

gracedb/events/models.py

@@ -357,11 +357,8 @@ class EventLog(CleanSaveModel, LogBase, AutoIncrementModel):
 
     def fileurl(self):
         if self.filename:
-            actual_filename = self.filename
-            if self.file_version >= 0:
-                actual_filename += ',%d' % self.file_version
             return reverse('file-download', args=[self.event.graceid(),
-                actual_filename])
+                self.full_filename])
         else:
             return None
 

gracedb/superevents/models.py

@@ -346,12 +346,11 @@ class Log(CleanSaveModel, LogBase, AutoIncrementModel):
         unique_together = (('superevent', 'N'),)
 
     def get_full_file_path(self):
-        # TODO: add file_version?
-        return os.path.join(self.superevent.datadir, self.filename)
+        return os.path.join(self.superevent.datadir, self.full_filename)
 
     def fileurl(self):
-        # TODO: implement this
-        super(Log, self).fileurl()
+        return reverse("superevents:file-download", args=
+            [self.superevent.superevent_id, self.full_filename])
 
 
 class Labelling(m2mThroughBase):