MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring edu/built-in-server utils

Browse Source
This commit is contained in:
meanmail
2017-04-11 14:42:36 +07:00
parent d0b08b2d67
commit 48f89ccc7a
4 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/src/com/jetbrains/edu/learning/builtInServer/Utils.java → python/educational-core/src/com/jetbrains/edu/learning/builtInServer/BuiltInServerUtils.java
+35 -27
View File
@@ -15,20 +15,24 @@
*/
package com.jetbrains.edu.learning.builtInServer;
import com.intellij.ide.RecentProjectsManager;
import com.intellij.ide.RecentProjectsManagerBase;
import com.intellij.ide.impl.ProjectUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.util.Consumer;
import com.intellij.util.xmlb.XmlSerializationException;
import com.jetbrains.edu.learning.StudySettings;
import com.jetbrains.edu.learning.StudyTaskManager;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseFormat.Lesson;
import com.jetbrains.edu.learning.courseFormat.RemoteCourse;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import com.jetbrains.edu.learning.intellij.generation.EduProjectGenerator;
import com.jetbrains.edu.learning.stepic.EduStepicConnector;
import com.jetbrains.edu.learning.stepic.StepicUser;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -38,17 +42,17 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import static com.jetbrains.edu.learning.StudyUtils.execCancelable;
import static com.jetbrains.edu.learning.core.EduNames.STUDY_PROJECT_XML_PATH;
import static com.jetbrains.edu.learning.navigation.StudyNavigator.navigateToTask;
/**
* @author meanmail
*/
public class Utils {
public static final String STUDY_PROJECT_XML_PATH = "/.idea/study_project.xml";
public class BuiltInServerUtils {
private static final Logger LOG = Logger.getInstance(BuiltInServerUtils.class);
public static boolean focusOpenProject(int courseId, int stepId) {
Project[] openProjects = ProjectManager.getInstance().getOpenProjects();
@@ -87,8 +91,7 @@ public class Utils {
}
public static boolean openRecentProject(int targetCourseId, int stepId) {
RecentProjectsManagerBase recentProjectsManager;
recentProjectsManager = (RecentProjectsManagerBase)RecentProjectsManager.getInstance();
RecentProjectsManagerBase recentProjectsManager = RecentProjectsManagerBase.getInstanceEx();
if (recentProjectsManager == null) {
return false;
@@ -153,22 +156,31 @@ public class Utils {
return ((RemoteCourse)course).getId();
}
}
catch (IllegalStateException ignored) {
catch (IllegalStateException | XmlSerializationException ignored) {
}
return 0;
}
public static boolean createProject(int courseId, int stepId) {
EduProjectGenerator generator = new EduProjectGenerator();
final Course[] course = new Course[1];
Project defaultProject = ProjectManager.getInstance().getDefaultProject();
String title = "Getting Available Courses";
List<Course> availableCourses = new ArrayList<>();
ApplicationManager.getApplication().invokeAndWait(() -> {
List<Course> courses = generator.getCoursesUnderProgress(true, title, defaultProject);
availableCourses.addAll(courses);
});
for (Course course : availableCourses) {
if (course instanceof RemoteCourse && ((RemoteCourse)course).getId() == courseId) {
StepicUser user = StudySettings.getInstance().getUser();
ApplicationManager.getApplication().invokeAndWait(() ->
course[0] = ProgressManager.getInstance()
.runProcessWithProgressSynchronously(() -> {
ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
return execCancelable(() -> {
try {
return EduStepicConnector.getCourseFromStepik(user, courseId);
}
catch (IOException e) {
LOG.warn("Tried to create a project for course with id=" + courseId, e);
return null;
}
});
}, "Getting Available Courses", true, defaultProject));
if (course[0] != null) {
Consumer<Project> onCreated = project ->
ApplicationManager.getApplication().invokeLater(() -> {
StudyTaskManager taskManager = StudyTaskManager.getInstance(project);
@@ -177,9 +189,8 @@ public class Utils {
navigateToStep(project, targetCourse, stepId);
}
});
return EduProjectCreator.createProject(course, onCreated);
return EduProjectCreator.createProject(course[0], onCreated);
}
}
return false;
}
@@ -195,13 +206,10 @@ public class Utils {
@Nullable
private static Task getTask(@NotNull Course course, int stepId) {
List<Lesson> lessons = course.getLessons();
for (Lesson lesson : lessons) {
Optional<Task> optionalTask = lesson.getTaskList().stream()
.filter(task -> task.getStepId() == stepId)
.findFirst();
if (optionalTask.isPresent()) {
return optionalTask.get();
for (Lesson lesson : course.getLessons()) {
Task task = lesson.getTask(stepId);
if (task != null) {
return task;
}
}
return null;
python/educational-core/src/com/jetbrains/edu/learning/builtInServer/StepikRestService.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.jetbrains.edu.learning.builtInServer.Utils.*;
import static com.jetbrains.edu.learning.builtInServer.BuiltInServerUtils.*;
/**
* @author meanmail
python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
+2
View File
@@ -50,6 +50,8 @@ public class EduNames {
public static final String SUBTASK_MARKER = "_subtask";
public static final String SUBTASK = "subtask";
public static final String STUDY_PROJECT_XML_PATH = "/.idea/study_project.xml";
private EduNames() {
}
python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
+32 -7
View File
@@ -127,6 +127,17 @@ public class EduStepicConnector {
return null;
}
private static StepicWrappers.CoursesContainer getCoursesFromStepik(@Nullable StepicUser user, URI url) throws IOException {
final StepicWrappers.CoursesContainer coursesContainer;
if (user != null) {
coursesContainer = EduStepicAuthorizedClient.getFromStepic(url.toString(), StepicWrappers.CoursesContainer.class, user);
}
else {
coursesContainer = EduStepicClient.getFromStepic(url.toString(), StepicWrappers.CoursesContainer.class);
}
return coursesContainer;
}
private static boolean addCoursesFromStepic(@Nullable StepicUser user, List<Course> result, int pageNumber) throws IOException {
final URI url;
try {
@@ -137,17 +148,31 @@ public class EduStepicConnector {
LOG.error(e.getMessage());
return false;
}
final StepicWrappers.CoursesContainer coursesContainer;
if (user != null) {
coursesContainer = EduStepicAuthorizedClient.getFromStepic(url.toString(), StepicWrappers.CoursesContainer.class, user);
}
else {
coursesContainer = EduStepicClient.getFromStepic(url.toString(), StepicWrappers.CoursesContainer.class);
}
final StepicWrappers.CoursesContainer coursesContainer = getCoursesFromStepik(user, url);
addAvailableCourses(result, coursesContainer);
return coursesContainer.meta.containsKey("has_next") && coursesContainer.meta.get("has_next") == Boolean.TRUE;
}
@Nullable
public static Course getCourseFromStepik(@Nullable StepicUser user, int courseId) throws IOException {
final URI url;
try {
url = new URIBuilder(EduStepicNames.COURSES + "/" + courseId).addParameter("is_idea_compatible", "true")
.build();
}
catch (URISyntaxException e) {
LOG.error(e.getMessage());
return null;
}
final StepicWrappers.CoursesContainer coursesContainer = getCoursesFromStepik(user, url);
if (coursesContainer!= null && !coursesContainer.courses.isEmpty()) {
return coursesContainer.courses.get(0);
} else {
return null;
}
}
static void addAvailableCourses(List<Course> result, StepicWrappers.CoursesContainer coursesContainer) throws IOException {
final List<RemoteCourse> courses = coursesContainer.courses;
for (RemoteCourse info : courses) {