From 53d001a40e455beed988483715e0d8d99bb1a786 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 30 Mar 2017 21:20:02 +0300
Subject: [PATCH] fixed course archive generation

---
 .../src/com/jetbrains/edu/coursecreator/CCUtils.java         | 2 +-
 .../jetbrains/edu/coursecreator/CCVirtualFileListener.java   | 2 +-
 .../edu/coursecreator/actions/CCCreateCourseArchive.java     | 1 +
 .../src/com/jetbrains/edu/learning/courseFormat/Course.java  | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCUtils.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCUtils.java
index 7ec7d188972b..ef533348f071 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCUtils.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCUtils.java
@@ -307,7 +307,7 @@ public class CCUtils {
     });
     if (task.getTestsText().isEmpty()) return null;
     lesson.addTask(task);
-    lesson.setIndex(1);
+    lesson.setIndex(course.getLessons().size());
     return lesson;
   }
 }
diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
index 52b81d8f222c..2136ccfba647 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/CCVirtualFileListener.java
@@ -68,7 +68,7 @@ public class CCVirtualFileListener implements VirtualFileListener {
       return;
     }
 
-    task.addTaskFile(taskRelativePath, 1);
+    task.addTaskFile(taskRelativePath, task.getTaskFiles().size()+1);
   }
 
   @Override
diff --git a/python/educational-core/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java b/python/educational-core/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
index cd09f521b621..5494bcea077d 100644
--- a/python/educational-core/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
+++ b/python/educational-core/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
@@ -97,6 +97,7 @@ public class CCCreateCourseArchive extends DumbAwareAction {
         archiveFolder.refresh(false, true);
         Course courseCopy = course.copy();
         replaceAnswerFilesWithTaskFiles(courseCopy);
+        courseCopy.sortLessons();
         additionalFiles(courseCopy);
         generateJson(archiveFolder, courseCopy);
         VirtualFileManager.getInstance().refreshWithoutFileWatcher(false);
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java
index de5a18fd26f2..26466145a7c4 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/courseFormat/Course.java
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -200,6 +201,10 @@ public class Course {
     return false;
   }
 
+  public void sortLessons() {
+    Collections.sort(lessons, EduUtils.INDEX_COMPARATOR);
+  }
+
   @Override
   public String toString() {
     return getName();