From 4118f5d7f644c623068818909997d7d353734223 Mon Sep 17 00:00:00 2001 From: Bohung Date: Thu, 18 Nov 2021 19:48:16 +0800 Subject: [PATCH] Fix bug. --- seminar.gemspec | 113 +++++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/seminar.gemspec b/seminar.gemspec index 2bf91c6..c68cb5a 100644 --- a/seminar.gemspec +++ b/seminar.gemspec @@ -8,67 +8,70 @@ begin rescue => e puts [e.to_s,e.backtrace] end -require "json" -env_pwd = ENV['PWD'] -app_path = File.expand_path(__dir__) -template_path = env_pwd + '/app/templates' -all_template = Dir.glob(template_path+'/*/') -default_seminar_widget_info = JSON.parse(File.read("#{app_path}/modules/seminar/info.json"))["widgets"].sort_by{|h| h["filename"].to_i} rescue [] -all_template.each do |folder| - if !folder.include?('mobile') - info_json_file = "#{folder}modules/seminar/info.json" - if File.exist?(info_json_file) - #Bundler.with_clean_env{system ('cp -f '+ app_path + '/modules/seminar/show.html.erb ' + "#{folder}modules/seminar/.")} - begin - file_text = File.read(info_json_file) rescue "" - encode_file_text = file_text.encode("UTF-8", "UTF-8", invalid: :replace, replace: "???") - next if (encode_file_text.include?("???") rescue true) - info = JSON.parse(encode_file_text) rescue {} - flag = (info.count != 0 rescue false) - if flag - puts "Checking seminar widgets" - widget_info = info["widgets"].sort_by{|h| h["filename"].to_i} rescue [] - update_flag = false - last_index = widget_info[-1]["filename"].match(/\d+/)[0].to_i rescue nil - if !last_index.nil? - idx_regex = /^(\d+[\. \t]*)|[ \t]+$/ - default_seminar_widget_info.each do |h| - name_without_index = h["name"]["zh_tw"].gsub(idx_regex,'') - widget_info_index = (widget_info.index{|hh| hh["name"]["zh_tw"].gsub(idx_regex,'') == name_without_index}||-1 rescue -1) - if widget_info_index == -1 - update_flag = true - copy_h = h.dup - h.delete("force_cover") - last_index = last_index + 1 - copy_h["filename"] = copy_h["filename"].sub(/\d+/){|ff| last_index.to_s} - copy_h["name"].keys.each do |locale| - copy_h["name"][locale] = copy_h["name"][locale].sub(/\d+/){|ff| last_index.to_s} +bundle_update_flag = ARGV[0]=='update' || ARGV[0]=='install' +if bundle_update_flag + require "json" + env_pwd = ENV['PWD'] + app_path = File.expand_path(__dir__) + template_path = env_pwd + '/app/templates' + all_template = Dir.glob(template_path+'/*/') + default_seminar_widget_info = JSON.parse(File.read("#{app_path}/modules/seminar/info.json"))["widgets"].sort_by{|h| h["filename"].to_i} rescue [] + all_template.each do |folder| + if !folder.include?('mobile') + info_json_file = "#{folder}modules/seminar/info.json" + if File.exist?(info_json_file) + #Bundler.with_clean_env{system ('cp -f '+ app_path + '/modules/seminar/show.html.erb ' + "#{folder}modules/seminar/.")} + begin + file_text = File.read(info_json_file) rescue "" + encode_file_text = file_text.encode("UTF-8", "UTF-8", invalid: :replace, replace: "???") + next if (encode_file_text.include?("???") rescue true) + info = JSON.parse(encode_file_text) rescue {} + flag = (info.count != 0 rescue false) + if flag + puts "Checking seminar widgets" + widget_info = info["widgets"].sort_by{|h| h["filename"].to_i} rescue [] + update_flag = false + last_index = widget_info[-1]["filename"].match(/\d+/)[0].to_i rescue nil + if !last_index.nil? + idx_regex = /^(\d+[\. \t]*)|[ \t]+$/ + default_seminar_widget_info.each do |h| + name_without_index = h["name"]["zh_tw"].gsub(idx_regex,'') + widget_info_index = (widget_info.index{|hh| hh["name"]["zh_tw"].gsub(idx_regex,'') == name_without_index}||-1 rescue -1) + if widget_info_index == -1 + update_flag = true + copy_h = h.dup + h.delete("force_cover") + last_index = last_index + 1 + copy_h["filename"] = copy_h["filename"].sub(/\d+/){|ff| last_index.to_s} + copy_h["name"].keys.each do |locale| + copy_h["name"][locale] = copy_h["name"][locale].sub(/\d+/){|ff| last_index.to_s} + end + widget_info << copy_h + Bundler.with_clean_env{%x[cp -f #{app_path}/modules/seminar/_#{h["filename"]}.html.erb #{folder}modules/seminar/_#{copy_h["filename"]}.html.erb]} + elsif h["force_cover"] == "true" + Bundler.with_clean_env{%x[cp -f #{app_path}/modules/seminar/_#{h["filename"]}.html.erb #{folder}modules/seminar/_#{widget_info[widget_info_index]["filename"]}.html.erb]} end - widget_info << copy_h - Bundler.with_clean_env{%x[cp -f #{app_path}/modules/seminar/_#{h["filename"]}.html.erb #{folder}modules/seminar/_#{copy_h["filename"]}.html.erb]} - elsif h["force_cover"] == "true" - Bundler.with_clean_env{%x[cp -f #{app_path}/modules/seminar/_#{h["filename"]}.html.erb #{folder}modules/seminar/_#{widget_info[widget_info_index]["filename"]}.html.erb]} end - end - if update_flag - info["widgets"] = widget_info - puts "Writing json #{info["widgets"].count} in #{info_json_file}" - begin - info_json = JSON.pretty_generate(info).gsub(":[",":[\n").gsub(":{",":{\n") - rescue - info_json = info.to_s.gsub("=>",": \n") + if update_flag + info["widgets"] = widget_info + puts "Writing json #{info["widgets"].count} in #{info_json_file}" + begin + info_json = JSON.pretty_generate(info).gsub(":[",":[\n").gsub(":{",":{\n") + rescue + info_json = info.to_s.gsub("=>",": \n") + end + File.open(info_json_file,"w+"){|f| f.write(info_json)} end - File.open(info_json_file,"w+"){|f| f.write(info_json)} end end + rescue => e + puts e + puts "There has some error when checking seminar widgets" + end + else + if !Dir.exist?(File.dirname(info_json_file)) && Dir.exist?(File.dirname(File.dirname(info_json_file))) + Bundler.with_clean_env{system ('cp -r '+ app_path + '/modules/ ' + folder)} end - rescue => e - puts e - puts "There has some error when checking seminar widgets" - end - else - if !Dir.exist?(File.dirname(info_json_file)) && Dir.exist?(File.dirname(File.dirname(info_json_file))) - Bundler.with_clean_env{system ('cp -r '+ app_path + '/modules/ ' + folder)} end end end