update last_attempt_date *after* the actual attempt so the UI is accu…

…rate, save torrent name on media

src/frontend/src/app/torrent-details/torrent-details.component.html

@@ -18,11 +18,8 @@
     </thead>
     <tbody>
     <tr *ngFor="let result of results">
-      <td>
-        <button type="button" class="btn btn-outline-success" *ngIf="result.torrent" placement="right" [ngbPopover]="result.torrent.name" popoverTitle="Torrent Name">
-          {{ result.watchMedia.name }}
-        </button>
-        <button *ngIf="!result.torrent" type="button" class="btn" [ngClass]="{'btn-outline-success': result.watchMedia.collected, 'btn-outline-secondary': !result.watchMedia.collected}">{{ result.watchMedia.name }}</button>
+      <td class="text-nowrap">
+        <button type="button" class="btn" [ngClass]="{'btn-outline-success': result.watchMedia.collected, 'btn-outline-secondary': !result.watchMedia.collected}" placement="right" [ngbPopover]="result.watchMedia.transmission_torrent_name || '(torrent no longer exists)'" popoverTitle="Torrent Name">{{ result.watchMedia.name }}</button>
       </td>
       <td><span *ngIf="result.watchMedia.release_date">{{ result.watchMedia.release_date | date | date: 'shortDate' }}</span></td>
       <td>{{ result.watchMedia.date_added | date | date: 'shortDate' }}</td>

src/nefarious/migrations/0066_auto_20210904_2035.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.2 on 2021-09-04 20:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nefarious', '0065_auto_20210829_2248'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='watchmovie',
+            name='transmission_torrent_name',
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+        migrations.AddField(
+            model_name='watchtvepisode',
+            name='transmission_torrent_name',
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+        migrations.AddField(
+            model_name='watchtvseason',
+            name='transmission_torrent_name',
+            field=models.CharField(blank=True, max_length=1000, null=True),
+        ),
+    ]

src/nefarious/models.py

@@ -88,6 +88,7 @@ class WatchMediaBase(models.Model):
     download_path = models.CharField(max_length=1000, blank=True, null=True, unique=True)
     last_attempt_date = models.DateTimeField(blank=True, null=True)
     transmission_torrent_hash = models.CharField(max_length=100, null=True, blank=True)
+    transmission_torrent_name = models.CharField(max_length=1000, null=True, blank=True)
     release_date = models.DateField(null=True, blank=True)
 
     def abs_download_path(self):

src/nefarious/processors.py

@@ -3,6 +3,8 @@
 from django.conf import settings
 from datetime import datetime
 from django.utils import dateparse
+from transmissionrpc import Torrent
+
 from nefarious.models import WatchMovie, NefariousSettings, TorrentBlacklist, WatchTVEpisode, WatchTVSeason
 from nefarious.parsers.movie import MovieParser
 from nefarious.parsers.tv import TVParser
@@ -35,11 +37,6 @@ def fetch(self):
         valid_search_results = []
         search = self._get_search_results()
 
-        # TODO - last attempt should only populate _after_ an actual attempt
-        # save this attempt date
-        self.watch_media.last_attempt_date = datetime.utcnow()
-        self.watch_media.save()
-
         if search.ok:
 
             for result in search.results:
@@ -66,7 +63,7 @@ def fetch(self):
                     # add to transmission
                     torrent = transmission_client.add_torrent(
                         best_result['torrent_url'],
-                        paused=True,  # start paused to we can verify if the torrent has been blacklisted
+                        paused=True,  # start paused so we can verify if the torrent has been blacklisted
                         download_dir=self._get_download_dir(transmission_session),
                     )
 
@@ -82,6 +79,10 @@ def fetch(self):
                         # start the torrent
                         if not settings.DEBUG:
                             torrent.start()
+
+                        # set attempt date
+                        self._set_last_attempt_date()
+
                         return True
                     else:
                         # remove the blacklisted/paused torrent and continue to the next result
@@ -101,6 +102,9 @@ def fetch(self):
 
         logger_background.info('Unable to find any results for media {}'.format(self.watch_media))
 
+        # set attempt date
+        self._set_last_attempt_date()
+
         return False
 
     def is_match(self, title: str) -> bool:
@@ -117,6 +121,10 @@ def is_match(self, title: str) -> bool:
             )
         )
 
+    def _set_last_attempt_date(self):
+        self.watch_media.last_attempt_date = datetime.utcnow()
+        self.watch_media.save()
+
     def _sanitize_title(self, title: str):
         # conditionally remove possessive apostrophes
         if self._reprocess_without_possessive_apostrophes:
@@ -150,7 +158,8 @@ def _get_tmdb_title_key(self):
     def _get_media_type(self) -> str:
         raise NotImplementedError
 
-    def _save_torrent_details(self, torrent):
+    def _save_torrent_details(self, torrent: Torrent):
+        self.watch_media.transmission_torrent_name = torrent.name
         self.watch_media.transmission_torrent_hash = torrent.hashString
         self.watch_media.save()