From 72df03f40872e45173730adfd42671f3f3dd2f20 Mon Sep 17 00:00:00 2001 From: Bohung Date: Wed, 9 Jun 2021 15:05:42 +0800 Subject: [PATCH] Fix bug. --- event_news_mod.gemspec | 131 +++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/event_news_mod.gemspec b/event_news_mod.gemspec index e70dc62..a227c98 100644 --- a/event_news_mod.gemspec +++ b/event_news_mod.gemspec @@ -10,75 +10,76 @@ if bundle_update_flag template_path = env_pwd + '/app/templates' all_template = Dir.glob(template_path+'/*/') default_event_news_widget_info = JSON.parse(File.read("#{app_path}/modules/event_news/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/event_news/info.json" - # if File.exist?(info_json_file) - # 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 event_news 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? - # default_event_news_widget_info.each do |h| - # name_without_index = h["name"]["zh_tw"].sub(/\d+/,'') - # widget_info_index = (widget_info.index{|hh| hh["name"]["zh_tw"].include?(name_without_index)} 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/event_news/_#{h["filename"]}.html.erb #{folder}modules/event_news/_#{copy_h["filename"]}.html.erb]} - # elsif h["force_cover"] == "true" - # Bundler.with_clean_env{%x[cp -f #{app_path}/modules/event_news/_#{h["filename"]}.html.erb #{folder}modules/event_news/_#{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") - # end - # File.open(info_json_file,"w+"){|f| f.write(info_json)} - # end - # end - # end - # rescue => e - # puts e - # puts "There has some error when checking event_news 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 - # end all_template.each do |folder| if !folder.include?('mobile') - moudle_path = "#{folder}modules/universal_table/" - begin - if Dir.exist?(File.dirname(moudle_path)) - Bundler.with_clean_env{system ('cp -r '+ app_path + '/modules/ ' + folder)} - end - rescue => e - puts "There was some error when updating event_news widget." - end + info_json_file = "#{folder}modules/event_news/info.json" + if File.exist?(info_json_file) + 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 event_news 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? + default_event_news_widget_info.each do |h| + name_without_index = h["name"]["zh_tw"].sub(/\d+/,'') + widget_info_index = (widget_info.index{|hh| hh["name"]["zh_tw"].include?(name_without_index)} 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/event_news/_#{h["filename"]}.html.erb #{folder}modules/event_news/_#{copy_h["filename"]}.html.erb]} + elsif h["force_cover"] == "true" + Bundler.with_clean_env{%x[cp -f #{app_path}/modules/event_news/_#{h["filename"]}.html.erb #{folder}modules/event_news/_#{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") + end + File.open(info_json_file,"w+"){|f| f.write(info_json)} + end + end + end + rescue => e + puts e + puts "There has some error when checking event_news 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 end + + # all_template.each do |folder| + # if !folder.include?('mobile') + # moudle_path = "#{folder}modules/universal_table/" + # begin + # if Dir.exist?(File.dirname(moudle_path)) + # Bundler.with_clean_env{system ('cp -r '+ app_path + '/modules/ ' + folder)} + # end + # rescue => e + # puts "There was some error when updating event_news widget." + # end + # end + # end end # Describe your gem and declare its dependencies: Gem::Specification.new do |s|