Changeset 499

Timestamp:

07/10/08 14:37:01 (6 months ago)

Author:

thomas

Message:

Added active queries and tests

Files:

• trunk/djedna/catalog2/forms.py (modified) (1 diff)
• trunk/djedna/catalog2/models.py (modified) (13 diffs)
• trunk/djedna/catalog2/tests.py (modified) (21 diffs)

trunk/djedna/catalog2/forms.py

@@ -93 +93 @@
-            'title', 'slug', 'number', 'length', 'year', 'artist',
-            'new_artist_name', 'album', 'new_album_title', 'trackfiles',
-is_
+
-        ]
-    

trunk/djedna/catalog2/models.py

@@ -24 +24 @@
-import time
-import wave
+import zipfile
-
-from django.conf import settings
@@ -105 +106 @@
-        return published_q & not_expired_q
-    
-    def get_unpublished_q(self, now=None):
-        if not now:
-            now = datetime.datetime.now()
-        published_q = self.get_published_q(now=now)
-        return ~published_q
-    
-    def get_active_q(self, now=None):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    def get_site_q(self, site_id=None):
@@ -138 +114 @@
-        return models.Q(sites__id__exact=site_id)
-    
+    def get_active_site_q(self, now=None, site_id=None):
+        return self.get_active_q(now=now) & self.get_site_q(site_id=site_id)
+    
+    def get_active_query_set(self, now=None):
+        return self.get_query_set().filter(self.get_active_q(now=now))
+    active = property(get_active_query_set)
+    
+    def get_inactive_query_set(self, now=None):
+        return self.get_query_set().exclude(self.get_active_q(now=now))
+    inactive = property(get_inactive_query_set)
+    
-    def get_site_query_set(self, site_id=None):
-        if site_id == None:
-            site_id = settings.SITE_ID
-        return self.get_query_set().filter(self.get_site_q(site_id=site_id))
-    on_site = property(get_site_query_set)
-    
-    def get_active_site_q(self, now=None, site_id=None):
-        if not now:
-            now = datetime.datetime.now()
-        if site_id == None:
-            site_id = settings.SITE_ID
-        return self.get_active_q(now=now) & self.get_site_q(site_id=site_id)
-    
-    def get_inactive_site_q(self, now=None, site_id=None):
-        if not now:
-            now = datetime.datetime.now()
-        if site_id == None:
-            site_id = settings.SITE_ID
-        return self.get_inactive_q(now=now) & self.get_site_q(site_id=site_id)
-    
-    def get_active_site_query_set(self, now=None, site_id=None):
-        if not now:
-            now = datetime.datetime.now()
-        if site_id == None:
-            site_id = settings.SITE_ID
-        return self.get_query_set().filter(
-            self.get_active_site_q(now=now, site_id=site_id)
@@ -169 +136 @@
-    
-    def get_inactive_site_query_set(self, now=None, site_id=None):
-
-
-
-
-
-
+
+
-        )
-    inactive_on_site = property(get_inactive_site_query_set)
+    
-
-class Publishable(models.Model):
-is_
+
-    publish = models.DateTimeField(null=True, blank=True)
-    expire = models.DateTimeField(null=True, blank=True)
@@ -188 +152 @@
-    class Meta:
-        abstract = True
+    
+    def is_active(self, now=None):
+        active = self.active
+        if active:
+            if not now:
+                now = datetime.datetime.now()
+            published = True
+            if self.publish and self.publish > now:
+                published = False
+            if published and self.expire and self.expire < now:
+                published = False
+            active = published
+        return active
-    
-
@@ -291 +268 @@
-    def update(self, group_hash=None, force_update=False):
-        needs_update = force_update
-is_
+
-            needs_update = True
-        file_modified = self._get_file_modified_datetime()
@@ -308 +285 @@
-        self.mimetype = self.file_mimetype or ''
-        if not self.file_exists():
-is_
+
-        super(MediaFile, self).save()
-        if create and not self.sites.count():
@@ -788 +765 @@
-                        self.relative_path, requested_size
-                    )
-                    relative_path = thumbnail.relative_dest
-                    imagefile, created = \
-                        ImageFile.objects.get_or_create_from_path(
-relative_path
+thumbnail.relative_dest
-                            master=self,
-                            sites=self.sites.all()
@@ -865 +841 @@
-    sender=ImageFileUpload
-)
+
+
+class ArchiveFile(MediaFile):
+    trackfiles = models.ManyToManyField(TrackFile)
+    imagefiles = models.ManyToManyField(ImageFile)
+    
+    def get_absolute_url(self):
+        return reverse(
+            'djedna_downloadfile_detail',
+            kwargs={'downloadfile_id' : self.id}
+        )
+    
+    def get_models(self):
+        tracks = []
+        artists = []
+        albums = []
+        for trackfile in self.trackfiles.all():
+            track = trackfile.track
+            artist = trackfile.track.artist
+            album = trackfile.track.album
+            if track and track not in tracks:
+                tracks.append(track)
+            if artist and artist not in artists:
+                artists.append(artist)
+            if album and album not in albums:
+                albums.append(album)
+        return tracks, albums, artists
+        trackfiles = self.trackfiles.filter(TrackFile.objects.get_active_q())
+        tracks = Track.objects.filter(
+            id__in=[trackfile.track.id for trackfile in trackfiles]
+        )
+    
+    def remove_archive(self):
+        if self.file_exists():
+            mediaserver.remove_media(self.relative_path)
+        
+    def generate_archive(self):
+        self.remove_archive()
+        archive = None
+        try:
+            archive = zipfile.ZipFile(self.path, mode='w')
+            for imagefile in self.imagefiles.all():
+                arcname = smart_str(
+                    os.path.join(u'images', imagefile.filename),
+                    errors='ignore'
+                )
+                archive.write(imagefile.path, arcname=arcname)
+            tracks, albums, artists = self.get_models()
+            for trackfile in self.trackfiles.all():
+                track = trackfile.track
+                filename = u"%s" % track.number
+                if len(albums) > 1 and track.album:
+                    filename = "%s-%s" % (filename, track.album.slug)
+                if len(artists) > 1:
+                    filename = "%s-%s" % (filename, track.artist.slug)
+                arcname = smart_str(
+                    os.path.join(
+                        u'tracks', '%s-%s' % (filename, trackfile.filename)
+                    ),
+                    errors='ignore'
+                )
+                archive.write(trackfile.path, arcname=arcname)
+        finally:
+            if archive:
+                archive.close()
+    
+    def get_media_url(self, user=None, query_auth=None, expires_in=None):
+        if not self.file_exists():
+            self.generate_archive()
+        return super(DownloadFile, self).get_media_url(
+            user=user, query_auth=query_auth, expires_in=expires_in
+        )
+    
-
-
@@ -904 +953 @@
-                album.add_artist(artist)
-        return (track, track_created)
+    
+    def get_active_q(self, now=None):
+        if not now:
+            now = datetime.datetime.now()
+        super_active_q = super(TrackManager, self).get_active_q(now=now)
+        artist_published_q = \
+            models.Q(artist__publish__isnull=True) | \
+            models.Q(artist__publish__lte=now)
+        artist_not_expired_q = \
+            models.Q(artist__expire__isnull=True) | \
+            models.Q(artist__expire__gte=now)
+        artist_active_q = \
+            models.Q(artist__active=True) & \
+            artist_published_q & \
+            artist_not_expired_q
+        album_published_q = \
+            models.Q(album=None) | \
+            models.Q(album__publish__isnull=True) | \
+            models.Q(album__publish__lte=now)
+        album_not_expired_q = \
+            models.Q(album=None) | \
+            models.Q(album__expire__isnull=True) | \
+            models.Q(album__expire__gte=now)
+        album_active_q = \
+            (models.Q(album=None) | models.Q(album__active=True)) & \
+            album_published_q & \
+            album_not_expired_q
+        return super_active_q & artist_active_q & album_active_q
-    
-
@@ -968 +1045 @@
-    calculated_slug = property(_get_calculated_slug)
-    
+    def is_active(self, now=None):
+        active = super(Track, self).is_active(now=now)
+        if active:
+            active = self.artist.is_active(now=now)
+            if active and self.album:
+                active = self.album.is_active(now=now)
+        return active
+    
-    def update(self):
-        needs_update = False
@@ -989 +1074 @@
-class AlbumManager(PublishableManager):
-    pass
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-class AlbumCurrentSiteManager(CurrentSiteManager, AlbumManager):
-    pass
@@ -1080 +1229 @@
-            self.update()
-    
+    # def is_active(self, now=None):
+    #     active = super(Album, self).is_active(now=now)
+    #     if active:
+    #         for artist in self.artists.all():
+    #             active = artist.is_active(now=now)
+    #             if active:
+    #                 break
+    #     return active
+    # 
-    def update(self):
-        needs_update = False

trunk/djedna/catalog2/tests.py

@@ -250 +250 @@
-        )
-        self.failUnless(trackfile)
-
+
+
-        self.failUnlessEqual(trackfile.mimetype, 'audio/mpeg')
-        self.failUnlessEqual(trackfile.path, FILE1_MP3)
@@ -305 +306 @@
-        self.failUnlessEqual(track.year, u'2007')
-        self.failUnlessEqual(track.length, 23)
-
+
+
-        self.failUnlessEqual(track.image, trackfile.image)
-        # Album
@@ -320 +322 @@
-            album.latest_track_modified_on_site, track.updated
-        )
-
+
+
-        self.failUnlessEqual(album.image, trackfile.image)
-        # Artist
@@ -326 +329 @@
-        self.failUnlessEqual(artist.name, u'Artist One')
-        self.failUnlessEqual(artist.latest_track_modified, track.updated)
-
+
+
-        self.failUnlessEqual(artist.sort_name, u'artist one')
-        self.failUnlessEqual(artist.track_count, 1)
@@ -340 +344 @@
-            artist.latest_album_modified_on_site, album.updated
-        )
-
+
+
-        self.failUnlessEqual(artist.image, trackfile.image)
-    
@@ -421 +426 @@
-        trackfile, created = TrackFile.objects.get_or_create_from_path(relative_path)
-        self.failUnless(trackfile)
-
+
+
-        self.failUnless(created)
-        self.failUnlessEqual(trackfile.relative_dirpath, BOGUS_ALBUM_REL)
@@ -453 +459 @@
-                          TrackFile.objects.get,
-                          relative_path=relative_path,
-is_
+
-    
-    def test_get_in_path(self):
@@ -487 +493 @@
-            trackfiles = TrackFile.objects.filter(
-                group_hash=group_hash,
-is_
+
-            )
-            self.failUnlessEqual(
@@ -515 +521 @@
-            self.failUnlessEqual(trackfile, trackfiles[0])
-            trackfile = trackfiles[0]
-
+
+
-            # Touch a file
-            trackfiles = TrackFile.objects.filter(
-is_
+
-            )
-            trackfile = trackfiles[0]
@@ -567 +574 @@
-        self.failUnlessEqual(track.year, u'2007')
-        self.failUnlessEqual(track.length, 23)
-
+
+
-        # Try to add the previous file again
-        group_hash = TrackFile.objects.add_from_path(FILE1_MP3_REL)
@@ -595 +603 @@
-                self.failUnless(added_track)
-                self.failUnless(added_artist)
-
+
+
-                self.failUnless(added_image)
-                self.failUnlessEqual(added_artist, artist)
@@ -1125 +1134 @@
-        Artist.objects.get_or_create(name='Artist One* ')
-        artist, created = Artist.objects.get_or_create(name='Inactive Artist')
-is_
+
-        artist.save()
-    
@@ -1203 +1212 @@
-        album.add_artist(artist1)
-        album.add_artist(artist2)
+        album, created = Album.objects.get_or_create(title='Album Two')
+        album.add_artist(artist2)
-        album, created = Album.objects.get_or_create(title='Inactive Album')
-is_
+
-        album.save()
-    
@@ -1211 +1222 @@
-    
-    def test_setup(self):
-6
+7
-        album, created = Album.objects.get_or_create(title='Album One')
-        self.failUnlessEqual(album.track_count, 0)
@@ -1219 +1230 @@
-    
-    def test_active(self):
-5
+6
-    
-    def test_inactive(self):
+        self.failUnlessEqual(Album.objects.active.count(), 6)
-        self.failUnlessEqual(Album.objects.inactive.count(), 1)
-    
+    # def test_inactive_artist(self):
+    #     artist = Artist.objects.get(name='Artist One')
+    #     artist.active = False
+    #     artist.save()
+    #     self.failUnlessEqual(Album.objects.active.count(), 3)
+    #     self.failUnlessEqual(Album.objects.inactive.count(), 4)
+    #     count = 0
+    #     for album in Album.objects.all():
+    #         if album.is_active():
+    #             count += 1
+    #     self.failUnlessEqual(count, Album.objects.active.count())
+    # 
-    def test_slug(self):
-        album1, created = Album.objects.get_or_create(title='Album One')
@@ -1313 +1337 @@
-        track1.trackfiles.add(trackfile1)
-        track1.trackfiles.add(trackfile2)
-is_
+
-        track1.save()
-        track2, created = Track.objects.get_or_create(
@@ -1319 +1343 @@
-        )
-        track2.trackfiles.add(trackfile3)
-is_
+
-        track2.save()
-        track3, created = Track.objects.get_or_create(
@@ -1325 +1349 @@
-        )
-        track3.trackfiles.add(trackfile4)
-is_
+
-        track3.save()
-        track4, created = Track.objects.get_or_create(
-            title='Inactive Track', artist=artist1
-        )
-is_
+
-        track4.save()
+        delta = datetime.timedelta(minutes=10)
+        now = datetime.datetime.now()
+        past = now - delta
+        future = now + delta
+        track, created = Track.objects.get_or_create(
+            title='Unpublished Track', artist=artist1
+        )
+        track.active = True
+        track.publish = future
+        track.expire = None
+        track.save()
+        track, created = Track.objects.get_or_create(
+            title='Published Track1', artist=artist1
+        )
+        track.active = True
+        track.publish = past
+        track.expire = None
+        track.save()
+        track, created = Track.objects.get_or_create(
+            title='Published Track2', artist=artist1
+        )
+        track.active = True
+        track.publish = past
+        track.expire = future
+        track.save()
+        track, created = Track.objects.get_or_create(
+            title='Expired Track', artist=artist1
+        )
+        track.active = True
+        track.publish = None
+        track.expire = past
+        track.save()
+        track, created = Track.objects.get_or_create(
+            title='Unexpired Track', artist=artist1
+        )
+        track.active = True
+        track.publish = None
+        track.expire = future
+        track.save()
-    
-    def tearDown(self):
@@ -1339 +1402 @@
-    
-    def test_setup(self):
-4
+9
-        track = Track.objects.get(title='Track One')
-        self.failUnlessEqual(track.trackfiles.count(), 2)
-    
-    def test_active(self):
-
+
+
+
+
+
+
-    
-    def test_inactive(self):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def test_slug(self):
@@ -1378 +1475 @@
-        TrackFile.objects.add_from_path(ALBUM1_REL)
-        trackfile = TrackFile.objects.get(relative_path=FILE2_MP3_REL)
-is_
+
-        trackfile.track.save()
-    
@@ -1560 +1657 @@
-        self.failIf(imagefile.is_jpg())
-        self.failIf(imagefile.is_gif())
-
+
+
-        self.failUnlessEqual(imagefile.get_absolute_url(),
-            reverse('djedna_imagefile_detail',