haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-02 07:47:32 +00:00
Code Issues Releases Wiki Activity

optimize code

Browse Source
This commit is contained in:
shanshuirenjia 2022-01-18 21:29:45 +08:00
parent cd44343b98
commit 2ae795b548
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/markdown-editor.js
View File

@ -26,7 +26,7 @@ const { siteRoot, serviceUrl, seafileCollabServer } = window.app.config;
const userInfo = window.app.userInfo;
const userName = userInfo.username;
let dirPath = Utils.getDirName(filePath);
const IMAGE_SUFFIXES = ['png', 'PNG', 'jpg', 'jpeg', 'JPG', 'gif', 'GIF'];
const IMAGE_SUFFIXES = ['png', 'PNG', 'jpg', 'JPG', 'jpeg', 'JPEG', 'gif', 'GIF'];
function getImageFileNameWithTimestamp() {
var d = Date.now();
@ -734,7 +734,7 @@ class MarkdownEditor extends React.Component {
const fileName = Utils.getFileName(filePath);
const suffix = fileName.slice(fileName.indexOf('.') + 1);
if (IMAGE_SUFFIXES.includes(suffix)) {
let innerURL = serviceUrl + '/lib/' + repoID + '/file' + filePath + '?raw=1';
let innerURL = serviceUrl + '/lib/' + repoID + '/file' + Utils.encodePath(filePath) + '?raw=1';
window.richMarkdownEditor.addLink(fileName, innerURL, true);
return;
}

1
frontend/src/shared-file-view-markdown.js
View File

@ -55,6 +55,7 @@ class FileContent extends React.Component {
let index2 = imagePath.indexOf('?');
imagePath = imagePath.substring(index + 5, index2);
// change image url
// the image path has been encoded when inserting the image
innerNode.data.src = serviceURL + '/view-image-via-share-link/?token=' + sharedToken + '&path=' + imagePath;
}
return innerNode;

4
seahub/views/file.py
View File

@ -5,6 +5,7 @@ File related views, including view_file, view_history_file, view_trash_file,
view_snapshot_file, view_shared_file, etc.
"""
from asyncio.proactor_events import constants
import os
import json
import time
@ -1972,8 +1973,9 @@ def view_media_file_via_share_link(request):
# Translation ‘(’ ')'
image_file_name = image_file_name.replace('(', '\(')
image_file_name = image_file_name.replace(')', '\)')
encoded_image_file_name = urllib.parse.quote(image_file_name)
p = re.compile('(%s)/lib/(%s)/file(.*?)%s\?raw=1' % (serviceURL, repo_id, image_file_name))
p = re.compile('(%s)/lib/(%s)/file(.*?)%s\?raw=1' % (serviceURL, repo_id, encoded_image_file_name))
result = re.search(p, file_content)
if not result:
return render_error(request, 'Image does not exist')