--- a/src/ldtplatform/management/commands/replacedelete.py Mon Mar 20 11:59:33 2017 +0100
+++ b/src/ldtplatform/management/commands/replacedelete.py Mon Mar 20 17:14:04 2017 +0100
@@ -22,7 +22,7 @@
'''
to https
'''
- if source[len(source)-3:len(source)] == 'MP4' or source[len(source)-3:len(source)] == 'mp4':
+ if source[len(source)-3:len(source)] == 'MP4' or source[len(source)-3:len(source)] == 'mp4' or not re.match(r".*\..{3}$", source):
tomp4 = 0
if tomp4 == 1:
source = source[0:len(source)-3]+"mp4"
@@ -39,9 +39,13 @@
return "https://media.iri.centrepompidou.fr/video/regardssignes/"+source
elif source[0:4] == "mp4:":
if vidpath == 'rtmp://media.iri.centrepompidou.fr/ddc_player/':
- return "https://media.iri.centrepompidou.fr/" + source[4:]
+ if re.match(r".*\..{3}$", source):
+ return "https://media.iri.centrepompidou.fr/" + source[4:]
+ else:
+ return "https://media.iri.centrepompidou.fr/" + source[4:] + ".mp4"
return "https://media.iri.centrepompidou.fr/video/ldtplatform/"+source
+
def numberofcontents(source): #this counts the number of contents linked to a media
'''
numberofcontents
@@ -175,10 +179,12 @@
models.Media.objects.filter(src__iregex=r".*.flv$"),
models.Media.objects.filter(src__iregex=r".*.f4v$"),
models.Media.objects.filter(src__iregex=r".*.m4v$"),
- models.Media.objects.filter(src__iregex=r".*.mp4$").exclude(src__iregex=r"^https://.*")
+ models.Media.objects.filter(src__iregex=r".*.mp4$").exclude(src__iregex=r"^https://.*"),
+ models.Media.objects.filter(src__iregex=r"^mp4:.*").exclude(src__iregex=r".*\..{3}$")
))
for elem in files:
+ self.stdout.write("%s"%elem.src)
self.stdout.write(" \n%s/%s files done"%(i+1, len(files)), ending='')
i += 1
if numberofcontents(elem) == 0:
@@ -186,6 +192,7 @@
continue
mysrc = elem.src
newsource = tohttps(elem.src, elem.videopath)
+ self.stdout.write("%s"%newsource)
try:
res = requests.head(newsource, timeout=10).status_code
except requests.ConnectionError: