diff --git a/Gemfile b/Gemfile index 58373cb06..70281fedf 100644 --- a/Gemfile +++ b/Gemfile @@ -58,8 +58,6 @@ group :test do #end end - # gem 'rspec-rails' , '2.13.1' - # gem 'guard-rspec','2.5.0' # Gems used only for assets and not required # in production environments by default. group :assets do diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 23b080d94..d458b73e4 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -108,7 +108,7 @@ class AttachmentsController < ApplicationController end rescue => e - redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html" + redirect_to "http: //" + (Setting.host_name.to_s) +"/file_not_found.html" end #更新资源文件类型 diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index d775767cc..9880a6382 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -1,140 +1,208 @@ -# require 'zip' -# class ZipdownController < ApplicationController -# #查找项目（课程） -# before_filter :find_project_by_bid_id, :only => [:assort] -# #检查权限 -# #勿删 before_filter :authorize, :only => [:assort,:download_user_homework] -# SAVE_FOLDER = "#{Rails.root}/files" -# OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip" -# -# -# def assort -# if params[:obj_class] == "Bid" -# bid = Bid.find params[:obj_id] -# file_count = 0 -# bid.homeworks.map { |homework| file_count += homework.attachments.count} -# if file_count > 0 -# zipfile = zip_bid bid -# else -# render file: 'public/no_file_found.html' -# end -# else -# logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!" -# end -# send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile) if zipfile -# -# #rescue Exception => e -# # render file: 'public/no_file_found.html' -# end -# -# #下载某一学生的作业的所有文件 -# def download_user_homework -# homework = HomeworkAttach.find params[:homework] -# if User.current.admin? || User.current.member_of_course?(homework.bid.courses.first) -# if homework != nil -# unless homework.attachments.empty? -# zipfile = zip_homework_by_user homework -# send_file zipfile, :filename => ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) + -# "_" + (homework.user.lastname.nil? ? "" : homework.user.lastname) + (homework.user.firstname.nil? ? "" : homework.user.firstname) + -# "_" + homework.name + ".zip", :type => detect_content_type(zipfile) if(zipfile) -# else -# render file: 'public/no_file_found.html' -# end -# else -# render file: 'public/file_not_found.html' -# end -# else -# render_403 -# end -# #rescue => e -# # render file: 'public/file_not_found.html' -# end -# -# private -# -# #通过作业Id找到项目（课程） -# def find_project_by_bid_id -# obj_class = params[:obj_class] -# obj_id = params[:obj_id] -# obj = obj_class.constantize.find(obj_id) -# case obj.class.to_s.to_sym -# when :Bid -# @project = obj.courses[0] -# end -# end -# -# def zip_bid(bid) -# # Todo: User Access Controll -# bid_homework_path = [] -# bid.homeworks.each do |homeattach| -# unless homeattach.attachments.empty? -# bid_homework_path << zip_homework_by_user(homeattach) -# end -# end -# zipping "#{Time.now.to_i}_#{bid.name}.zip", bid_homework_path, OUTPUT_FOLDER -# end -# -# def zip_homework_by_user(homeattach) -# homeworks_attach_path = [] -# not_exist_file = [] -# # 需要将所有homework.attachments遍历加入zip -# # 并且返回zip路径 -# homeattach.attachments.each do |attach| -# if File.exist?(attach.diskfile) -# homeworks_attach_path << attach.diskfile -# else -# not_exist_file << attach.filename -# end -# end -# zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file) -# end -# -# -# def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[]) -# # 输入待打包的文件列表，已经打包文件定位到ouput_path -# ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE') -# input_filename = files_paths -# -# rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip" -# zipfile_name = "#{output_path}/#{rename_zipfile}" -# -# Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name)) -# -# Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile| -# input_filename.each do |filename| -# flag = true -# index = 1 -# rename_file = ic.iconv( (File.basename(filename)) ).to_s -# rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment -# -# begin -# zipfile.add(rename_file, filename) -# flag = false -# rescue Exception => e -# zipfile.get_output_stream('FILE_NOTICE.txt') do |os| -# os.write l(:label_file_exist) -# end -# next -# end -# end -# unless not_exist_file.empty? -# zipfile.get_output_stream('FILE_LOST.txt') do |os| -# os.write l(:label_file_lost) + not_exist_file.join(',').to_s -# end -# end -# end -# zipfile_name -# #rescue Errno => e -# # logger.error "[zipdown#zipping] ===> #{e}" -# # @error = e -# end -# def detect_content_type(name) -# content_type = Redmine::MimeType.of(name) -# content_type.to_s -# end -# -# def filename_to_real(name) -# attach = Attachment.find_by_disk_filename(name) -# attach.filename -# end -# end \ No newline at end of file +require 'zip' +class ZipdownController < ApplicationController + #查找项目（课程） + before_filter :find_project_by_bid_id, :only => [:assort] + #检查权限 + #勿删 before_filter :authorize, :only => [:assort,:download_user_homework] + SAVE_FOLDER = "#{Rails.root}/files" + OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip" + + #统一下载功能 + def download + begin + send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file]) + rescue => e + render file: 'public/no_file_found.html' + end + end + + def assort + if params[:obj_class] == "Bid" + bid = Bid.find params[:obj_id] + file_count = 0 + bid.homeworks.map { |homework| file_count += homework.attachments.count} + if file_count > 0 + zipfile = zip_bid bid + else + render file: 'public/no_file_found.html' + return + end + else + logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!" + end + + # if zipfile + # if zipfile.length > 1 + # @mut_down_files = zipfile #zipfile.each{|x| File.basename(x)} + # else + # send_file zipfile.first[:real_file], :filename => bid.name + ".zip", :type => detect_content_type(zipfile.first[:real_file]) + # return + # end + # end + + respond_to do |format| + format.json { + render json: zipfile.to_json + } + end + #rescue Exception => e + # render file: 'public/no_file_found.html' + end + + #下载某一学生的作业的所有文件 + def download_user_homework + homework = HomeworkAttach.find params[:homework] + if User.current.admin? || User.current.member_of_course?(homework.bid.courses.first) + if homework != nil + unless homework.attachments.empty? + zipfile = zip_homework_by_user homework + send_file zipfile, :filename => ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) + + "_" + (homework.user.lastname.nil? ? "" : homework.user.lastname) + (homework.user.firstname.nil? ? "" : homework.user.firstname) + + "_" + homework.name + ".zip", :type => detect_content_type(zipfile) if(zipfile) + else + render file: 'public/no_file_found.html' + end + else + render file: 'public/file_not_found.html' + end + else + render_403 + end + #rescue => e + # render file: 'public/file_not_found.html' + end + + private + + #通过作业Id找到项目（课程） + def find_project_by_bid_id + obj_class = params[:obj_class] + obj_id = params[:obj_id] + obj = obj_class.constantize.find(obj_id) + case obj.class.to_s.to_sym + when :Bid + @project = obj.courses[0] + end + end + + def zip_bid(bid) + # Todo: User Access Controll + bid_homework_path = [] + bid.homeworks.each do |homeattach| + unless homeattach.attachments.empty? + bid_homework_path << zip_homework_by_user(homeattach) + end + end + + zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024) + x = 0 + + + zips.each { |o| + x += 1 + file = zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o[:files], OUTPUT_FOLDER + o[:real_file] = file + o[:file] = File.basename(file) + o[:size] = (File.size(file) / 1024.0 / 1024.0).round(2) + } + + end + + def zip_homework_by_user(homeattach) + homeworks_attach_path = [] + not_exist_file = [] + # 需要将所有homework.attachments遍历加入zip + # 并且返回zip路径 + homeattach.attachments.each do |attach| + if File.exist?(attach.diskfile) + homeworks_attach_path << attach.diskfile + else + not_exist_file << attach.filename + end + end + zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file) + end + + + def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[]) + # 输入待打包的文件列表，已经打包文件定位到ouput_path + ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE') + + rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip" + zipfile_name = "#{output_path}/#{rename_zipfile}" + + Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name)) + + unless is_attachment + #都是zip合并，没必要再费力压缩了 + Zip.default_compression = Zlib::NO_COMPRESSION + else + Zip.default_compression = Zlib::DEFAULT_COMPRESSION + end + + Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile| + files_paths.each do |filename| + flag = true + index = 1 + rename_file = ic.iconv( (File.basename(filename)) ).to_s + rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment + + begin + zipfile.add(rename_file, filename) + flag = false + rescue Exception => e + zipfile.get_output_stream('FILE_NOTICE.txt') do |os| + os.write l(:label_file_exist) + end + next + end + end + unless not_exist_file.empty? + zipfile.get_output_stream('FILE_LOST.txt') do |os| + os.write l(:label_file_lost) + not_exist_file.join(',').to_s + end + end + end + zipfile_name + #rescue Errno => e + # logger.error "[zipdown#zipping] ===> #{e}" + # @error = e + end + + # 合理分配文件打包 + # 如果小于 pack_attachment_max_size, 则返回单个文件 + # 反之则切分为多个文件组返回 + def split_pack_files(files, pack_attachment_max_size) + max_size = 0 + last_files = [] + ret_files = [] + files.each_with_index do |f,i| + if (max_size += File.size(f)) > pack_attachment_max_size + max_size = 0 + if last_files.empty? #如果单个文件超过大小，也将此文件作为一组 + ret_files << {files: [f], count: 1, index: ret_files.count+1} + last_files.clear + else + ret_files << {files:last_files, count: last_files.count, index: ret_files.count+1} + last_files.clear + redo + end + else + last_files << f + end + end + + ret_files << {files:last_files, count: last_files.count, index: ret_files.count+1} unless last_files.empty? + ret_files + end + + def detect_content_type(name) + content_type = Redmine::MimeType.of(name) + content_type.to_s + end + + def filename_to_real(name) + attach = Attachment.find_by_disk_filename(name) + attach.filename + end +end \ No newline at end of file diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 86a58e494..a59997a62 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -23,7 +23,7 @@ (<%= @jours_count %>)
  • - <%#= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all" unless @bid.homeworks.empty? %> + <%#= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all" unless @bid.homeworks.empty? %>
    • <% else %> @@ -63,6 +63,19 @@ + +
    + + +
    +

    下载文件包太大，分成多个下载包

    + +
    +
    +
    +
    diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb index ebb3904da..763b65515 100644 --- a/app/views/settings/_general.html.erb +++ b/app/views/settings/_general.html.erb @@ -7,6 +7,7 @@ <%= wikitoolbar_for 'settings_welcome_text' %>

    <%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

    +

    <%= setting_text_field :pack_attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

    <%= setting_text_field :per_page_options, :size => 20 %> <%= l(:text_comma_separated) %>

    diff --git a/app/views/zipdown/assort.html.erb b/app/views/zipdown/assort.html.erb index c9056b4fa..3cf873226 100644 --- a/app/views/zipdown/assort.html.erb +++ b/app/views/zipdown/assort.html.erb @@ -1,2 +1,11 @@ -

    Download Status:

    -<%= @error.class %> \ No newline at end of file +<% unless @mut_down_files %> +

    Download Status:

    + <%= @error.class %> +<% else %> +

    下载文件包太大，分成<%= @mut_down_files.count %>个下载包

    + +<% end %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index dd4601685..6c5ab903c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -177,6 +177,7 @@ en: setting_login_required: Authentication required setting_self_registration: Self-registration setting_attachment_max_size: Maximum attachment size + setting_pack_attachment_max_size: Maximum pack attachment size setting_issues_export_limit: Issues export limit setting_mail_from: Emission email address setting_bcc_recipients: Blind carbon copy recipients (bcc) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index be68a1438..f1dbe7d3c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -188,6 +188,7 @@ zh: setting_login_required: 要求认证 setting_self_registration: 允许自注册 setting_attachment_max_size: 附件大小限制 + setting_pack_attachment_max_size: 附件打包最大限制 setting_issues_export_limit: 问题导出条目的限制 setting_mail_from: 邮件发件人地址 setting_bcc_recipients: 使用密件抄送 (bcc) diff --git a/config/routes.rb b/config/routes.rb index 0d3e2f827..27bc59ffc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,8 +103,9 @@ RedmineApp::Application.routes.draw do mount SeemsRateable::Engine => '/rateable', :as => :rateable # namespace :zipdown do - # match 'assort' - # match 'download_user_homework', :as => :download_user_homework + # match 'assort' + # match 'download_user_homework', :as => :download_user_homework + # match 'download' # end namespace :test do match 'courselist' diff --git a/config/settings.yml b/config/settings.yml index 381e8a302..56cb8ac6c 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -46,7 +46,10 @@ session_timeout: default: 2880 attachment_max_size: format: int - default: 5120 + default: 51200 +pack_attachment_max_size: + format: int + default: 51200 issues_export_limit: format: int default: 500 diff --git a/db/migrate/20150309090143_add_pack_attachment_max_size_to_settings.rb b/db/migrate/20150309090143_add_pack_attachment_max_size_to_settings.rb new file mode 100644 index 000000000..95887a3e2 --- /dev/null +++ b/db/migrate/20150309090143_add_pack_attachment_max_size_to_settings.rb @@ -0,0 +1,11 @@ +class AddPackAttachmentMaxSizeToSettings < ActiveRecord::Migration + def up + Setting.where(name: 'attachment_max_size').update_all(value: 51200) + Setting.create(name: 'pack_attachment_max_size', value: 51200 ) + end + + def down + Setting.delete(name: 'pack_attachment_max_size') + Setting.where(name: 'attachment_max_size').update_all(value: 204800) + end +end diff --git a/db/schema.rb b/db/schema.rb index b676abe7f..b149a870b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150324021043) do +ActiveRecord::Schema.define(:version => 20150309090143) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 5d2423238..a18a282e4 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -864,4 +864,32 @@ $(function(){ $(this).parent('p').remove(); console.log("delete complete."); }); + + $('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) { + if(status == 'success'){ + var res = JSON.parse(data.responseText); + if(res.length<1){ + return; + } + + if(res.length==1){ + location.href = '/zipdown/download?file='+res[0].file;return; + } + + document.getElementById('light').style.display='block'; + $container = $('#light .upload_box_ul'); + $container.empty(); + for(var i = 0; i 1){ + des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载'; + } else { + des = '第'+res[i].index+'个学生的作品下载'; + } + $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + + } + } + + }) }); diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 866d049a5..6f193f956 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -12,6 +12,17 @@ function postUpMsg(attachmentId) }) } + +function reload(fileSpan) { + fileSpan.remove(); + $('#upload_file_count').html("未上传文件"); + $old_file = $("#_file"); + $new_file = $old_file.clone(true); + $old_file.replaceWith($new_file); + $new_file.show(); + +} + function addFile(inputEl, file, eagerUpload) { if ($('#attachments_fields').children().length < 10) { @@ -22,10 +33,20 @@ function addFile(inputEl, file, eagerUpload) { fileSpan.append( $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), - $('', { 'type': 'text', 'class': 'description','style':'margin-left: 9px;', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload), - $(''+$(inputEl).data('fieldIsPublic')+':').attr({ 'class': 'ispublic-label','style':'margin-left: 15px;' }) , - $('', { 'type': 'checkbox','style':'margin-left: 5px;', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), - $('   ').attr({ 'href': "#", 'class': 'remove-upload','style':'margin-left: 3px;', 'data-confirm' : $(inputEl).data('areYouSure') }).click(removeFile).toggle(!eagerUpload), + $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload), + $(''+$(inputEl).data('fieldIsPublic')+':').attr({ 'class': 'ispublic-label' }) , + $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), + $(' ').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){ + if(confirm('您确定要删除吗？')){ + removeFile(); + if(!eagerUpload){ + (function(e){ + reload(e); + })(fileSpan); + } + } + + }).toggle(!eagerUpload), $('
    ', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) ).appendTo('#attachments_fields'); @@ -166,11 +187,9 @@ function addInputFiles(inputEl) { if (inputEl.files) { // upload files using ajax - //alert("11"); uploadAndAttachFiles(inputEl.files, inputEl); // $(inputEl).remove(); } else { - //alert("11"); // browser not supporting the file API, upload on form submission var attachmentId; var aFilename = inputEl.value.split(/\/|\\/); diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 360b580ad..9829d286e 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -151,8 +151,18 @@ a:hover.tijiao{ background:#0f99a9 !important;} .ni_con p{ color:#808181;} .ni_con a:hover{ text-decoration:none;} - - +/*弹框*/ +.black_overlay{display:none;position:absolute;top:0%;left:0%;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.3;opacity:.30;filter:alpha(opacity=30);} +.upload_box{display:none;position:absolute;top:25%;left:35%;width:30%;height: auto;padding:5px;border:3px solid #15bccf; background:#fff;z-index:1002;overflow:auto;} +.close{background:url(images/img_floatbox.png) 0 0 no-repeat; width:16px; height:16px; display:block; float:right;} +.close:hover{background:url(images/img_floatbox.png) -22px 0 no-repeat; width:16px; height:16px; display:block; float:right;} +.upload_box_tit{ font-size:16px; color:#15bccf; text-align:center; } +.upload_box_{ margin-left:10%; margin-bottom:5px; margin-right:10%;} +.upload_box_ul{ margin-bottom:10px;} +.upload_box_ul a{ color:#09658c;} +.upload_box_ul a:hover{ color:#15bccf;} +.upload_box_span{ color: #333; font-weight: bold;} +.c_grey{ color:#A7A7A7;} diff --git a/public/stylesheets/images/img_floatbox.png b/public/stylesheets/images/img_floatbox.png new file mode 100644 index 000000000..b2167f5ff Binary files /dev/null and b/public/stylesheets/images/img_floatbox.png differ