From d9e79f87c333b524c278bf99d06f20f5db5e9108 Mon Sep 17 00:00:00 2001 From: "Liana.Bakradze" Date: Tue, 25 Oct 2016 19:30:46 +0300 Subject: [PATCH] support src folder in archive --- .../edu/coursecreator/actions/CCCreateCourseArchive.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java index 45f8d8ba8b81..64182506bcbb 100644 --- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java +++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java @@ -116,12 +116,17 @@ public class CCCreateCourseArchive extends DumbAwareAction { final VirtualFile lessonDir = baseDir.findChild(EduNames.LESSON + String.valueOf(lesson.getIndex())); if (lessonDir == null) continue; for (Task task : lesson.getTaskList()) { - final VirtualFile taskDir = lessonDir.findChild(EduNames.TASK + String.valueOf(task.getIndex())); + final VirtualFile taskDir = task.getTaskDir(project); if (taskDir == null) continue; - VirtualFile studentFileDir = VfsUtil.findRelativeFile(archiveFolder, lessonDir.getName(), taskDir.getName()); + String taskDirName = EduNames.TASK + String.valueOf(task.getIndex()); + VirtualFile studentFileDir = VfsUtil.findRelativeFile(archiveFolder, lessonDir.getName(), taskDirName); if (studentFileDir == null) { continue; } + VirtualFile srcDir = studentFileDir.findChild(EduNames.SRC); + if (srcDir != null) { + studentFileDir = srcDir; + } for (String taskFile : task.getTaskFiles().keySet()) { VirtualFile answerFile = taskDir.findChild(taskFile); if (answerFile == null) { -- 2.23.3