commit 2a730247dafd033ea4401223bb2c5e4ab58926aa
parent eb377440668351fb2a706ae62ba47f27225ccd6b
Author: rob <rob@tarina.org>
Date: Wed, 12 Aug 2026 04:01:23 +0300
better
Diffstat:
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/server.py b/server.py
@@ -1476,7 +1476,7 @@ class editor:
savejson('u/'+session.user+'/posts/'+session.postid+'/meta',thedict)
#session.postid = hashlib.sha256(str(random.getrandbits(256)).encode('utf-8')).hexdigest()[9:36]
os.system('cp -r -P '+basedir+'u/'+session.user+'/posts/'+session.postid+' '+basedir+'p/posts/')
- symlinkthis()
+ symlinkthis(session.postid, session.user)
#also zippit here!
#os.system('zip -r '+basedir+'p/zipped/'+session.postid+'.zip '+basedir+'p/posts/'+session.postid )
os.system('cd '+basedir+'p/posts/ && zip -o -r '+session.postid+'.zip '+session.postid )
@@ -1618,18 +1618,18 @@ def getallmedia(media_dir, extensions):
print(files)
return files
-def symlinkmedia(mediafile,postid):
+def symlinkmedia(mediafile,postid,user):
fixstatic = mediafile.split('/posts/'+postid+'/')[1]
- symlinkfile = staticdir + 'users/' + session.user + '/'+fixstatic
+ symlinkfile = staticdir + 'users/' + user + '/'+fixstatic
symlinkdir=symlinkfile.rsplit('/',1)[0]
os.makedirs(symlinkdir, exist_ok=True)
os.system('ln -s '+mediafile+' '+symlinkfile)
-def symlinkthis():
+def symlinkthis(postid,user):
extensions=['zip','pdf','txt','md','mp4','jpeg','jpg','png','gif','wav','flac','mp3','ogg']
- mediafiles = getallmedia(basedir+'u/'+session.user+'/posts/'+session.postid,extensions)
+ mediafiles = getallmedia(basedir+'u/'+user+'/posts/'+postid,extensions)
for m in mediafiles:
- symlinkmedia(m,session.postid)
+ symlinkmedia(m,postid,user)
print(mediafiles)
#symlinkthis('cd449464ec08fc7aa967d9b2795')
@@ -1676,24 +1676,24 @@ class upload:
print(basedir+'p/posts/'+soundfile.split('.zip')[0])
print(mediafiles)
for m in mediafiles:
- symlinkmedia(m,soundfile.split('.zip')[0])
+ symlinkmedia(m,soundfile.split('.zip')[0],session.user)
elif filetype == 'pdf' or filetype == 'txt' or filetype == 'md':
usersound = basedir + 'u/' + session.user + '/posts/'+session.postid+'/docs/'
os.system('mkdir -p ' + usersound)
os.system('mv ' + imgdir + soundfile + ' ' + usersound + soundfile)
- symlinkmedia(usersound + soundfile,session.postid)
+ symlinkmedia(usersound + soundfile,session.postid,session.user)
elif filetype == 'mp4':
usersound = basedir + 'u/' + session.user + '/posts/'+session.postid+'/films/'
os.system('mkdir -p ' + usersound)
os.system('mv ' + imgdir + soundfile + ' ' + usersound + soundfile)
- symlinkmedia(usersound + soundfile,session.postid)
+ symlinkmedia(usersound + soundfile,session.postid,session.user)
elif filetype == 'jpeg' or filetype == 'jpg' or filetype == 'png' or filetype == 'gif':
usersound = basedir + 'u/' + session.user + '/posts/'+session.postid+'/images/'
os.system('mkdir -p ' + usersound)
os.makedirs(usersound + 'web/', exist_ok=True)
os.makedirs(usersound + 'thumb/', exist_ok=True)
os.system('mv ' + imgdir + soundfile + ' ' + usersound + soundfile)
- symlinkmedia(usersound + soundfile,session.postid)
+ symlinkmedia(usersound + soundfile,session.postid,session.user)
if filetype == 'gif':
scale_gif(usersound+soundfile, [900,900], usersound+'web/'+soundfile)
scale_gif(usersound+soundfile, [300,300], usersound+'thumb/'+soundfile)
@@ -1703,10 +1703,10 @@ class upload:
##---------- RESIZE IMAGE -----------
image.thumbnail((900,900), Image.Resampling.LANCZOS)
image.save(usersound + 'web/' + soundfile)
- symlinkmedia(usersound + 'web/' + soundfile,session.postid)
+ symlinkmedia(usersound + 'web/' + soundfile,session.postid,session.user)
image.thumbnail((300,300), Image.Resampling.LANCZOS)
image.save(usersound + 'thumb/' + soundfile)
- symlinkmedia(usersound + 'thumb/' + soundfile,session.postid)
+ symlinkmedia(usersound + 'thumb/' + soundfile,session.postid,session.user)
print('images resized images')
elif filetype == 'wav' or filetype == 'flac' or filetype == 'mp3' or filetype == 'ogg':
usersound = basedir + 'u/' + session.user + '/posts/'+session.postid+'/sounds/'