From 971484792650f3c9ae5ed834a424051224eaf4b2 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 24 Dec 2019 19:32:36 +0800
Subject: [PATCH] =?UTF-8?q?Jupyter=E5=AE=9E=E8=AE=ADfork=E4=B8=8E=E4=BA=91?=
 =?UTF-8?q?=E4=B8=8A=E5=AE=9E=E9=AA=8C=E5=AE=A4=E9=80=89=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb         | 12 +++++++++++
 app/services/subjects/copy_subject_service.rb | 21 ++++++++++++++++++-
 .../result.json.jbuilder                      |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 190892730..940955e93 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -266,8 +266,20 @@ class ShixunsController < ApplicationController
 				# 如果是jupyter，先创建一个目录,为了挂载(因为后续数据集，开启Pod后环境在没销毁前，你上传数据集是挂载不上目录的，因此要先创建目录，方便中间层挂载)
 				if @new_shixun.is_jupyter?
 					folder = EduSetting.get('shixun_folder')
+					raise "存储目录未定义" unless folder.present?
 					path = "#{folder}/#{@new_shixun.identifier}"
 					FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(path)
+					# 复制数据集
+					save_path = File.join(folder, @shixun.identifier)
+					@shixun.data_sets.each do |set|
+						new_date_set = Attachment.new
+						new_date_set.attributes = set.attributes.dup.except("id", "container_id", "disk_directory")
+						new_date_set.container_id = @new_shixun.id
+						new_date_set.disk_directory = @new_shixun.identifier
+						new_date_set.save!
+						FileUtils.cp("#{save_path}/#{set.relative_path_filename}", path)
+					end
+
 				end
 				# 同步复制关卡
 				if @shixun.challenges.present?
diff --git a/app/services/subjects/copy_subject_service.rb b/app/services/subjects/copy_subject_service.rb
index f44191fda..4715a8bad 100644
--- a/app/services/subjects/copy_subject_service.rb
+++ b/app/services/subjects/copy_subject_service.rb
@@ -79,7 +79,7 @@ class Subjects::CopySubjectService < ApplicationService
     copy_shixun_service_configs_data!(shixun, to_shixun)
     copy_challenges_data!(shixun, to_shixun)
     copy_shixun_members_data!(to_shixun)
-
+    copy_jupyter_data_sets(shixun, to_shixun) if shixun.is_jupyter?
     # 云上实验室
    if laboratory
      laboratory.laboratory_shixuns.create(shixun: to_shixun)
@@ -87,6 +87,25 @@ class Subjects::CopySubjectService < ApplicationService
     to_shixun
   end
 
+  # 复制jupyter的数据集
+  def copy_jupyter_data_sets(shixun, to_shixun)
+    return unless shixun.is_jupyter?
+    folder = EduSetting.get('shixun_folder')
+    raise "存储目录未定义" unless folder.present?
+    path = "#{folder}/#{to_shixun.identifier}"
+    FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(path)
+    # 复制数据集
+    save_path = File.join(folder, shixun.identifier)
+    shixun.data_sets.each do |set|
+      new_date_set = Attachment.new
+      new_date_set.attributes = set.attributes.dup.except("id", "container_id", "disk_directory")
+      new_date_set.container_id = to_shixun.id
+      new_date_set.disk_directory = to_shixun.identifier
+      new_date_set.save!
+      FileUtils.cp("#{save_path}/#{set.relative_path_filename}", path)
+    end
+  end
+
   # 创建实训长字段内容
   def copy_shixun_info_data!(shixun, to_shixun)
     to_shixun_info = ShixunInfo.new
diff --git a/app/views/hack_user_lastest_codes/result.json.jbuilder b/app/views/hack_user_lastest_codes/result.json.jbuilder
index 2561d4ecd..d8f010cc3 100644
--- a/app/views/hack_user_lastest_codes/result.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/result.json.jbuilder
@@ -1,5 +1,5 @@
 json.status 0
-json.message "评测成功"
+json.message "评测完成"
 json.data do
   json.(@result, :id, :status, :error_line, :error_msg,
       :input, :output, :execute_time, :execute_memory)