Merge pull request #592 from EsupPortail/dev

remove control characters in video title which are not supported in X…
EsupPortail · Feb 21, 2022 · f8d0d17 · f8d0d17
2 parents fef269c + d55a4e4
commit f8d0d17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pod/video/feeds.py b/pod/video/feeds.py
@@ -172,7 +172,8 @@ def items(self, obj):
         return obj.order_by("-date_added")[:30]
 
     def item_title(self, item):
-        return "%s | %s" % (item.owner, item.title)
+        sub = re.sub(r"[\x00-\x08\x0B-\x0C\x0E-\x1F]", "", item.title)
+        return "%s | %s" % (item.owner.get_full_name(), sub)
 
     def item_link(self, item):
         return "".join([self.author_link, item.get_absolute_url()])

diff --git a/pod/video/models.py b/pod/video/models.py
@@ -1,6 +1,7 @@
 """Esup-Pod Video models."""
 
 import os
+import re
 import time
 import unicodedata
 import json
@@ -881,6 +882,8 @@ def get_thumbnail_url(self):
     @property
     def get_thumbnail_admin(self):
         thumbnail_url = ""
+        # fix title for xml description
+        title = re.sub(r"[\x00-\x08\x0B-\x0C\x0E-\x1F]", "", self.title)
         if self.thumbnail and self.thumbnail.file_exist():
             im = get_thumbnail(self.thumbnail.file, "100x100", crop="center", quality=72)
             thumbnail_url = im.url
@@ -893,7 +896,7 @@ def get_thumbnail_admin(self):
             'src="%s" alt="%s" loading="lazy"/>'
             % (
                 thumbnail_url,
-                self.title.replace("{", "").replace("}", "").replace('"', "'"),
+                title.replace("{", "").replace("}", "").replace('"', "'"),
             )
         )