Merge branch 'meeb:main' into main-delete-files-on-disk

tubesync/sync/models.py

@@ -119,7 +119,7 @@ class Source(models.Model):
         ('interaction', 'Interaction Reminder'),
         ('music_offtopic', 'Non-Music Section'),
     )
-    
+
     sponsorblock_categories = CommaSepChoiceField(
             _(''),
             possible_choices=SPONSORBLOCK_CATEGORIES_CHOICES,
@@ -1241,7 +1241,6 @@ class Media(models.Model):
             acodec = self.downloaded_audio_codec
             if acodec is None:
                 raise TypeError() # nothing here.
-            
             acodec = acodec.lower()
             if acodec == "mp4a":
                 return "audio/mp4"
@@ -1250,7 +1249,6 @@ class Media(models.Model):
             else:
                 # fall-fall-back.
                 return 'audio/ogg'
-
         vcodec = vcodec.lower()
         if vcodec == 'vp9':
             return 'video/webm'
@@ -1286,7 +1284,8 @@ class Media(models.Model):
         nfo.append(season)
         # episode = number of video in the year
         episode = nfo.makeelement('episode', {})
-        episode.text = str(self.calculate_episode_number())  # Remplacez par la logique de calcul
+        episode_number = self.calculate_episode_number()
+        episode.text = str(episode_number) if episode_number else ''
         episode.tail = '\n  '
         nfo.append(episode)
         # ratings = media metadata youtube rating
@@ -1420,7 +1419,6 @@ class Media(models.Model):
             self_year = self.upload_date.year if self.upload_date else self.created.year
             filtered_media = Media.objects.filter(source=self.source, published__year=self_year)
             sorted_media = sorted(filtered_media, key=lambda x: (x.upload_date, x.key))
-        
         position_counter = 1
         for media in sorted_media:
             if media == self:

tubesync/sync/tests.py

@@ -661,8 +661,8 @@ class MediaTestCase(TestCase):
             '<episodedetails>',
             '  <title>no fancy stuff title</title>',
             '  <showtitle>testname</showtitle>',
-            '  <season>2020</season>',
-            '  <episode>1</episode>',
+            '  <season>2017</season>',
+            '  <episode></episode>',
             '  <ratings>',
             '    <rating default="True" max="5" name="youtube">',
             '      <value>1.2345</value>',