harry
/
feeds
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare to support ruby 3.3.

This commit is contained in:
邱博亞 2024-02-24 21:12:32 +08:00
parent 5a47481072
commit a790cc0c72
3 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/feeds_controller.rb
View File

@ -136,7 +136,7 @@ class FeedsController < ApplicationController
end end
elsif params[:type] == 'update_all' elsif params[:type] == 'update_all'
feed_data = params[:data] feed_data = params[:data]
FileUtils.mkdir_p(feed_directory) if !File.exists?(feed_directory) FileUtils.mkdir_p(feed_directory) if !File.exist?(feed_directory)
File.open(File.join(feed_directory.to_s,feed.feed_uid + ".json"),"w") do |file| File.open(File.join(feed_directory.to_s,feed.feed_uid + ".json"),"w") do |file|
feed_data.force_encoding("utf-8") feed_data.force_encoding("utf-8")
file.write(feed_data) file.write(feed_data)
@ -151,7 +151,7 @@ class FeedsController < ApplicationController
end end
if need_write if need_write
feed_data = feed_data.to_json feed_data = feed_data.to_json
FileUtils.mkdir_p(feed_directory) if !File.exists?(feed_directory) FileUtils.mkdir_p(feed_directory) if !File.exist?(feed_directory)
File.open(File.join(feed_directory.to_s,feed.feed_uid + ".json"),"w") do |file| File.open(File.join(feed_directory.to_s,feed.feed_uid + ".json"),"w") do |file|
feed_data.force_encoding("utf-8") feed_data.force_encoding("utf-8")
file.write(feed_data) file.write(feed_data)

4
app/models/site_feed.rb
View File

@ -95,7 +95,7 @@ class SiteFeed
end end
main_directory = File.join("#{Rails.root}","public","site_feeds") main_directory = File.join("#{Rails.root}","public","site_feeds")
feed_directory = File.join(main_directory.to_s, self.id.to_s) feed_directory = File.join(main_directory.to_s, self.id.to_s)
if !force_refresh && File.exists?(feed_directory) if !force_refresh && File.exist?(feed_directory)
anns = JSON.parse(File.read(File.join(feed_directory.to_s, self.feed_uid + ".json")))[self.channel_key.pluralize] rescue [] anns = JSON.parse(File.read(File.join(feed_directory.to_s, self.feed_uid + ".json")))[self.channel_key.pluralize] rescue []
else else
uri = URI(self.feed_url) uri = URI(self.feed_url)
@ -143,7 +143,7 @@ class SiteFeed
end end
res = JSON.dump({"announcements" => res_to_json}) res = JSON.dump({"announcements" => res_to_json})
end end
FileUtils.mkdir_p(feed_directory) if !File.exists?(feed_directory) FileUtils.mkdir_p(feed_directory) if !File.exist?(feed_directory)
File.open(File.join(feed_directory.to_s,self.feed_uid + ".json"),"w") do |file| File.open(File.join(feed_directory.to_s,self.feed_uid + ".json"),"w") do |file|
res.force_encoding("utf-8") res.force_encoding("utf-8")
file.write(res) file.write(res)

11
lib/feeds/engine.rb
View File

@ -1,6 +1,7 @@
module Feeds module Feeds
class Engine < ::Rails::Engine class Engine < ::Rails::Engine
initializer "feeds" do initializer "feeds" do
Rails.application.config.to_prepare do
if ENV['worker_num']=='0' && File.basename($0) != 'rake' && !Rails.const_defined?('Console') if ENV['worker_num']=='0' && File.basename($0) != 'rake' && !Rails.const_defined?('Console')
require File.expand_path('../../../app/models/site_feed_setting', __FILE__) require File.expand_path('../../../app/models/site_feed_setting', __FILE__)
if defined?(SiteFeedSetting) if defined?(SiteFeedSetting)
@ -51,12 +52,10 @@ module Feeds
end end
end end
spec = Gem::Specification.find_by_name("feeds") rescue nil gem_root = Feeds::Engine.root
if !spec.nil? gem_tmp = File.join(gem_root, 'tmp')
gem_root = spec.gem_dir f = File.join(gem_tmp, "install_bash")
gem_tmp = gem_root + "/tmp/" if File.exist?(f)
f = File.join(gem_tmp + "install_bash")
if File.exists?(f)
File.delete(f) File.delete(f)
%x(cp "#{gem_root}/config/schedule.rb" config/schedule.rb) %x(cp "#{gem_root}/config/schedule.rb" config/schedule.rb)
%x(whenever --update-crontab feeds --set environment="#{ENV["RAILS_ENV"]}") %x(whenever --update-crontab feeds --set environment="#{ENV["RAILS_ENV"]}")