indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Duplicate function

merge-requests/30/head
Bob Mottram 2021-07-01 11:04:14 +01:00
parent 0627c10996
commit 96a58c4428
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -114,7 +114,6 @@ from threads import threadWithTrace
from threads import removeDormantThreads from threads import removeDormantThreads
from media import replaceYouTube from media import replaceYouTube
from media import attachMedia from media import attachMedia
from media import pathIsImage
from media import pathIsVideo from media import pathIsVideo
from media import pathIsAudio from media import pathIsAudio
from blocking import updateBlockedCache from blocking import updateBlockedCache
@ -5927,7 +5926,7 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings: {}) -> None: GETstartTime, GETtimings: {}) -> None:
"""Returns a media file """Returns a media file
""" """
if pathIsImage(path) or \ if isImageFile(path) or \
pathIsVideo(path) or \ pathIsVideo(path) or \
pathIsAudio(path): pathIsAudio(path):
mediaStr = path.split('/media/')[1] mediaStr = path.split('/media/')[1]
@ -5957,7 +5956,7 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings: {}) -> None: GETstartTime, GETtimings: {}) -> None:
"""Returns an emoji image """Returns an emoji image
""" """
if pathIsImage(path): if isImageFile(path):
emojiStr = path.split('/emoji/')[1] emojiStr = path.split('/emoji/')[1]
emojiFilename = baseDir + '/emoji/' + emojiStr emojiFilename = baseDir + '/emoji/' + emojiStr
if os.path.isfile(emojiFilename): if os.path.isfile(emojiFilename):
@ -10203,7 +10202,7 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings: {}) -> bool: GETstartTime, GETtimings: {}) -> bool:
"""Show a shared item image """Show a shared item image
""" """
if not pathIsImage(path): if not isImageFile(path):
self._404() self._404()
return True return True
@ -10253,7 +10252,7 @@ class PubServer(BaseHTTPRequestHandler):
if '/accounts/avatars/' not in path: if '/accounts/avatars/' not in path:
if '/accounts/headers/' not in path: if '/accounts/headers/' not in path:
return False return False
if not pathIsImage(path): if not isImageFile(path):
return False return False
if '/accounts/avatars/' in path: if '/accounts/avatars/' in path:
avatarStr = path.split('/accounts/avatars/')[1] avatarStr = path.split('/accounts/avatars/')[1]
@ -11475,7 +11474,7 @@ class PubServer(BaseHTTPRequestHandler):
# if not authorized then show the login screen # if not authorized then show the login screen
if htmlGET and self.path != '/login' and \ if htmlGET and self.path != '/login' and \
not pathIsImage(self.path) and \ not isImageFile(self.path) and \
self.path != '/' and \ self.path != '/' and \
self.path != '/users/news/linksmobile' and \ self.path != '/users/news/linksmobile' and \
self.path != '/users/news/newswiremobile': self.path != '/users/news/newswiremobile':
@ -13136,7 +13135,7 @@ class PubServer(BaseHTTPRequestHandler):
fileLength = -1 fileLength = -1
if '/media/' in self.path: if '/media/' in self.path:
if pathIsImage(self.path) or \ if isImageFile(self.path) or \
pathIsVideo(self.path) or \ pathIsVideo(self.path) or \
pathIsAudio(self.path): pathIsAudio(self.path):
mediaStr = self.path.split('/media/')[1] mediaStr = self.path.split('/media/')[1]

11
media.py
View File

@ -286,17 +286,6 @@ def archiveMedia(baseDir: str, archiveDirectory: str, maxWeeks=4) -> None:
break break
def pathIsImage(path: str) -> bool:
if path.endswith('.png') or \
path.endswith('.jpg') or \
path.endswith('.gif') or \
path.endswith('.svg') or \
path.endswith('.avif') or \
path.endswith('.webp'):
return True
return False
def pathIsVideo(path: str) -> bool: def pathIsVideo(path: str) -> bool:
if path.endswith('.ogv') or \ if path.endswith('.ogv') or \
path.endswith('.mp4'): path.endswith('.mp4'):