Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Programming exercises: Fix image export in combination with tooltip text #10070

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+11 −1
Open

Programming exercises: Fix image export in combination with tooltip text #10070

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34bf0e8
Fix image export in combination with hover text
badkeyy Nov 27, 2024
6495bd3
Merge branch 'develop' into bugfix/excercise/fix-image-download-on-ex…
chrisknedl Dec 2, 2024
eca3429
Merge branch 'develop' into bugfix/excercise/fix-image-download-on-ex…
badkeyy Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...in/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public abstract class ExerciseWithSubmissionsExportService {

private static final String EMBEDDED_FILE_MARKDOWN_SYNTAX_REGEX = "\\[.*] *\\(/api/files/markdown/.*\\)";

private static final String EMBEDDED_FILE_MARKDOWN_WITH_HOVERTEXT = "\\(/api/files/markdown/.* \".*\"\\)";

private static final String EMBEDDED_FILE_HTML_SYNTAX_REGEX = "<img src=\"/api/files/markdown/.*\".*>";

private static final String API_MARKDOWN_FILE_PATH = "/api/files/markdown/";
Expand Down Expand Up @@ -129,7 +131,15 @@ private void copyFilesEmbeddedWithMarkdownSyntax(Exercise exercise, List<String>
for (String embeddedFile : embeddedFilesWithMarkdownSyntax) {
// avoid matching other closing ] or () in the squared brackets by getting the index of the last ]
String lastPartOfMatchedString = embeddedFile.substring(embeddedFile.lastIndexOf("]") + 1);
String filePath = lastPartOfMatchedString.substring(lastPartOfMatchedString.indexOf("(") + 1, lastPartOfMatchedString.indexOf(")"));
String filePath;

if (Pattern.compile(EMBEDDED_FILE_MARKDOWN_WITH_HOVERTEXT).matcher(lastPartOfMatchedString).matches()) {
filePath = lastPartOfMatchedString.substring(lastPartOfMatchedString.indexOf("(") + 1, lastPartOfMatchedString.indexOf(" "));
}
else {
filePath = lastPartOfMatchedString.substring(lastPartOfMatchedString.indexOf("(") + 1, lastPartOfMatchedString.indexOf(")"));
}

badkeyy marked this conversation as resolved.
Show resolved Hide resolved
constructFilenameAndCopyFile(exercise, exportErrors, embeddedFilesDir, filePath);
}
}
Expand Down
Loading