Merge pull request #862 from gpodder/fix/download_user

Fix download archived user data

Author: elelay

mygpo/api/subscriptions.py

@@ -63,7 +63,9 @@ def update_subscriptions(self, user, device, add, remove):
 
         conflicts = intersect(add, remove)
         if conflicts:
-            msg = "can not add and remove '{}' at the same time".format(str(conflicts))
+            msg = "{} {} can not add and remove '{}' at the same time".format(
+                user.pk, device.uid, str(conflicts)
+            )
             logger.warning(msg)
             raise RequestException(msg)
 

mygpo/history/models.py

@@ -170,7 +170,7 @@ def create_entry(
         if exists:
             logger.debug(
                 "Trying to save duplicate {cls} for {user} "
-                "/ {episode}".format(cls=cls, user=user, episode=episode)
+                "/ {episode}".format(cls=cls, user=user, episode=episode.get_id())
             )
             # if such an entry already exists, do nothing
             return

mygpo/maintenance/merge.py

@@ -23,7 +23,7 @@
 logger = logging.getLogger(__name__)
 
 
-PG_UNIQUE_VIOLATION = '23505'
+PG_UNIQUE_VIOLATION = "23505"
 
 
 class IncorrectMergeException(Exception):

mygpo/podcasts/models.py

@@ -47,7 +47,7 @@ class TitleModel(models.Model):
     subtitle = models.TextField(null=False, blank=True)
 
     def __str__(self):
-        return self.title
+        return self.title or f"NOTITLE<{self.pk}>"
 
     class Meta:
         abstract = True

mygpo/settings.py

@@ -40,7 +40,7 @@ def get_intOrNone(name, default):
 
 MANAGERS = ADMINS
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 DATABASES = {
     "default": dj_database_url.config(default="postgres://mygpo:mygpo@localhost/mygpo")

mygpo/users/management/commands/archive.py

@@ -97,7 +97,7 @@ def handle(
                 returncode=1,
             )
 
-        if options.get('archive'):
+        if options.get("archive"):
             archive = options["archive"]
         else:
             archive = os.path.join(
@@ -230,7 +230,7 @@ def export_chapters(self):
         last_episode = None
         last_episode_id = None
         for c in Chapter.objects.filter(user=self.user.id).order_by(
-            'episode_id', 'start'
+            "episode_id", "start"
         ):
             if last_episode_id and last_episode_id != c.episode_id:
                 data.append(last_episode)
@@ -460,7 +460,7 @@ def export_subscriptions(self, episodes_with_state_only=True):
     @timed
     def export_opml(self):
         podcasts = get_subscribed_podcasts(self.user)
-        exporter = Exporter('')
+        exporter = Exporter("")
         opml = exporter.generate(podcasts)
         with open(os.path.join(self.output_dir, "subscriptions.opml"), "wb") as f:
             f.write(opml)

mygpo/users/migrations/0017_add_user_archived.py

@@ -6,18 +6,18 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0016_alter_userprofile_twitter'),
+        ("users", "0016_alter_userprofile_twitter"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='userprofile',
-            name='archive_path',
+            model_name="userprofile",
+            name="archive_path",
             field=models.TextField(blank=True),
         ),
         migrations.AddField(
-            model_name='userprofile',
-            name='archived_date',
+            model_name="userprofile",
+            name="archived_date",
             field=models.DateTimeField(null=True),
         ),
     ]

mygpo/users/tasks.py

@@ -57,10 +57,34 @@ def remove_inactive_users():
 
     for user in users:
         clients = models.Client.objects.filter(user=user)
-        logger.warning('Deleting %d clients of user "%s"', len(clients), user.username)
-        clients.delete()
-        logger.warning('Deleting user "%s"', user.username)
-        user.delete()
+        if user.profile.archive_path:
+            logger.warning(
+                'Would delete %d clients of ARCHIVED user "%s" at "%s"',
+                len(clients),
+                user.username,
+                user.profile.archive_path,
+            )
+        elif clients:
+            logger.warning(
+                'Would delete %d clients of user "%s" joined %s last_login %s',
+                len(clients),
+                user.username,
+                user.date_joined,
+                user.last_login,
+            )
+        else:
+            logger.info(
+                'Would delete user "%s" joined %s last_login %s without client',
+                user.username,
+                user.date_joined,
+                user.last_login,
+            )
+
+
+#        logger.warning('Deleting %d clients of user "%s"', len(clients), user.username)
+#        clients.delete()
+#        logger.warning('Deleting user "%s"', user.username)
+#        user.delete()
 
 
 @shared_task(run_every=timedelta(hours=1))

mygpo/users/views/user.py

@@ -23,6 +23,7 @@
 import requests
 from oauth2client.client import FlowExchangeError
 
+from mygpo.settings import ARCHIVE_ROOT
 from mygpo.web.forms import RestorePasswordForm
 from mygpo.constants import DEFAULT_LOGIN_REDIRECT
 from mygpo.users.models import UserProxy
@@ -168,14 +169,14 @@ def get(self, request):
         """Shows the info page"""
 
         # Do not show this page for already-logged-in users
+        username = request.GET.get("user", "")
         if request.user.is_authenticated:
-            # return HttpResponseRedirect(DEFAULT_LOGIN_REDIRECT)
-            raise Exception("coucou")
+            username = request.user.username
 
         return render(
             request,
             "user_archived.html",
-            {"username": request.GET.get("user", "")},
+            {"username": username},
         )
 
 
@@ -196,7 +197,7 @@ def download_archive(request):
 
     if not user.is_active and user.profile.archive_path is not None:
         archive_path = os.path.abspath(os.path.normpath(user.profile.archive_path))
-        if os.path.dirname(archive_path) == settings.ARCHIVE_ROOT:
+        if os.path.dirname(archive_path) == ARCHIVE_ROOT:
             return FileResponse(open(archive_path, "rb"), as_attachment=True)
         return HttpResponseBadRequest("Invalid archive path")