', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
).appendTo('#attachments_fields');
@@ -168,14 +189,15 @@ function addInputFiles(inputEl) {
if (inputEl.files) {
// upload files using ajax
uploadAndAttachFiles(inputEl.files, inputEl);
- // $(inputEl).remove();
+ // $(inputEl).remove();
} else {
// browser not supporting the file API, upload on form submission
var attachmentId;
var aFilename = inputEl.value.split(/\/|\\/);
attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
if (attachmentId) {
- $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId);
+ $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
+ $('#upload_file_count').html("已上传"+"
"+1+""+"个文件");
}
}
From 15accd7d9f019acfc25baf8387dfd4148e757f6b Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 10 Mar 2015 09:31:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E4=BC=98=E5=8C=96,=20=E5=8A=9F=E8=83=BD=E5=B7=B2=E5=AE=9E?=
=?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Gemfile | 2 -
app/controllers/attachments_controller.rb | 6 +-
app/controllers/zipdown_controller.rb | 63 +++++++++++++++++--
app/views/settings/_general.html.erb | 1 +
app/views/zipdown/assort.html.erb | 13 +++-
config/locales/en.yml | 1 +
config/locales/zh.yml | 1 +
config/routes.rb | 1 +
config/settings.yml | 5 +-
...dd_pack_attachment_max_size_to_settings.rb | 11 ++++
db/schema.rb | 2 +-
11 files changed, 95 insertions(+), 11 deletions(-)
create mode 100644 db/migrate/20150309090143_add_pack_attachment_max_size_to_settings.rb
diff --git a/Gemfile b/Gemfile
index 29b2716a9..362be8642 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..23d4c3a16 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
#更新资源文件类型
@@ -182,6 +182,8 @@ class AttachmentsController < ApplicationController
return
end
+
+ logger.debug "upload ..... "
@attachment = Attachment.new(:file => request.raw_post)
@attachment.author = User.current
if !params[:project].nil?
@@ -190,6 +192,8 @@ class AttachmentsController < ApplicationController
end
@attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
saved = @attachment.save
+ logger.debug "upload save ..... "
+ logger.debug @attchement
respond_to do |format|
format.js
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 6c5385115..75ffe75bd 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -7,6 +7,14 @@ class ZipdownController < ApplicationController
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"
@@ -21,8 +29,14 @@ class ZipdownController < ApplicationController
else
logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!"
end
- send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile) if zipfile
+ if zipfile
+ if zipfile.length > 1
+ @mut_down_files = zipfile.map{|x| File.basename(x)}
+ else
+ send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile)
+ end
+ end
#rescue Exception => e
# render file: 'public/no_file_found.html'
end
@@ -71,7 +85,14 @@ class ZipdownController < ApplicationController
bid_homework_path << zip_homework_by_user(homeattach)
end
end
- zipping "#{Time.now.to_i}_#{bid.name}.zip", bid_homework_path, OUTPUT_FOLDER
+
+ zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i)
+ x = 0
+
+ zips.map { |o|
+ x += 1
+ zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o, OUTPUT_FOLDER
+ }
end
def zip_homework_by_user(homeattach)
@@ -93,15 +114,21 @@ class ZipdownController < ApplicationController
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))
+ 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|
- input_filename.each do |filename|
+ files_paths.each do |filename|
flag = true
index = 1
rename_file = ic.iconv( (File.basename(filename)) ).to_s
@@ -128,6 +155,34 @@ class ZipdownController < ApplicationController
# 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 do |f|
+ if (max_size += File.size(f)) > pack_attachment_max_size
+ max_size = 0
+ if last_files.empty? #如果单个文件超过大小，也将此文件作为一组
+ ret_files << [f]
+ last_files.clear
+ else
+ ret_files << last_files
+ last_files.clear
+ redo
+ end
+ else
+ last_files << f
+ end
+ end
+
+ ret_files << last_files unless last_files.empty?
+ ret_files
+ end
+
def detect_content_type(name)
content_type = Redmine::MimeType.of(name)
content_type.to_s
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 %>个下载包
+
+ <% @mut_down_files.each_with_index do |file,i| %>
+ - <%= link_to "第#{i+1}个文件包", zipdown_download_path(file: File.basename(file)) %>
+ <% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 910eb0f98..1430e5df1 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 f3879421a..282218905 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -196,6 +196,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 3ec814839..1417231b2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -105,6 +105,7 @@ RedmineApp::Application.routes.draw do
namespace :zipdown do
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 bad1cf2ae..71d91560e 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 => 20150305081132) do
+ActiveRecord::Schema.define(:version => 20150309090143) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
From 4b636d8be6a0287d8ad0650b93f067f0ac87aef6 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 25 Mar 2015 13:13:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?#1801=20=E6=89=93=E5=8C=85=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E5=88=86=E4=B8=AA=E6=95=B0=E4=B8=8B=E8=BD=BD=E5=AE=8C?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/attachments_controller.rb | 4 ---
app/controllers/zipdown_controller.rb | 39 ++++++++++++++-------
app/views/bids/_homework_list.html.erb | 15 +++++++-
public/javascripts/application.js | 28 +++++++++++++++
public/stylesheets/css.css | 14 ++++++--
public/stylesheets/images/img_floatbox.png | Bin 0 -> 1012 bytes
6 files changed, 80 insertions(+), 20 deletions(-)
create mode 100644 public/stylesheets/images/img_floatbox.png
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 23d4c3a16..d458b73e4 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -182,8 +182,6 @@ class AttachmentsController < ApplicationController
return
end
-
- logger.debug "upload ..... "
@attachment = Attachment.new(:file => request.raw_post)
@attachment.author = User.current
if !params[:project].nil?
@@ -192,8 +190,6 @@ class AttachmentsController < ApplicationController
end
@attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
saved = @attachment.save
- logger.debug "upload save ..... "
- logger.debug @attchement
respond_to do |format|
format.js
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 75ffe75bd..9880a6382 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -25,17 +25,25 @@ class ZipdownController < ApplicationController
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.map{|x| File.basename(x)}
- else
- send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile)
- 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'
@@ -86,13 +94,18 @@ class ZipdownController < ApplicationController
end
end
- zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i)
+ zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024)
x = 0
- zips.map { |o|
+
+ zips.each { |o|
x += 1
- zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o, OUTPUT_FOLDER
+ 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)
@@ -163,14 +176,14 @@ class ZipdownController < ApplicationController
max_size = 0
last_files = []
ret_files = []
- files.each do |f|
+ 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 << [f]
+ ret_files << {files: [f], count: 1, index: ret_files.count+1}
last_files.clear
else
- ret_files << last_files
+ ret_files << {files:last_files, count: last_files.count, index: ret_files.count+1}
last_files.clear
redo
end
@@ -179,7 +192,7 @@ class ZipdownController < ApplicationController
end
end
- ret_files << last_files unless last_files.empty?
+ ret_files << {files:last_files, count: last_files.count, index: ret_files.count+1} unless last_files.empty?
ret_files
end
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 6572ee2c9..7ac686e09 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, format: :json), remote: true, class: "tb_all" unless @bid.homeworks.empty? %>
<% else %>
@@ -63,6 +63,19 @@