Semi-working version of directories

This commit is contained in:
Ari Timonen 2020-03-31 06:36:19 +03:00
parent 79533b19a3
commit b79220466b
2 changed files with 117 additions and 7 deletions

View file

@ -5,9 +5,10 @@
#
# id :integer not null, primary key
# description :string(255)
# hidden :boolean default("0"), not null
# hidden :boolean default(FALSE), not null
# name :string(255)
# path :string(255)
# title :string(255)
# created_at :datetime
# updated_at :datetime
# parent_id :integer
@ -17,6 +18,19 @@
# index_directories_on_parent_id (parent_id)
#
ENV['FILES_ROOT'] ||= File.join(Rails.root, 'public', 'files')
# class SteamIdValidator < ActiveModel::Validator
# def validate(record)
# record.errors.add :steamid unless \
# record.steamid.nil? ||
# (m = record.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) &&
# (id = m[3].to_i) &&
# id >= 1 && id <= 2147483647
# end
# end
class Directory < ActiveRecord::Base
include Extra
@ -41,6 +55,7 @@ class Directory < ActiveRecord::Base
validates_format_of :name, :with => /\A[A-Za-z0-9]{1,20}\z/, :on => :create
validates_length_of :name, :in => 1..25
validates_inclusion_of :hidden, :in => [true, false]
# TODO: add validation for path
before_validation :init_variables
after_create :make_path
@ -53,16 +68,24 @@ class Directory < ActiveRecord::Base
end
def init_variables
self.path = File.join(parent.path, name.downcase)
self.path = full_path if parent
self.hidden = false if hidden.nil?
end
def path_exists?
File.directory?(full_path)
end
def full_path
parent ? File.join(parent.full_path, name.downcase) : path
end
def make_path
Dir.mkdir(path) unless File.exists?(path)
Dir.mkdir(full_path) unless File.exists?(full_path)
end
def update_timestamp
self.created_at = File.mtime(path) if File.exists?(path)
self.created_at = File.mtime(full_path) if File.exists?(full_path)
end
def remove_files
@ -75,12 +98,87 @@ class Directory < ActiveRecord::Base
end
def remove_path
Dir.unlink(path) if File.exists?(path)
Dir.unlink(full_path) if File.exists?(full_path)
end
# TODO: make tests for this, moving etc.
# TODO: mutate instead of return.
def recreate_transaction(root = ENV['FILES_ROOT'])
logger = Rails.logger
logger.info 'Starting recreate on %d, root: %s' % [id, root]
ActiveRecord::Base.transaction do
# We use destroy lists so technically there can be seperate roots
destroy_list = Hash.new
update_attribute :path, root
destroy_list = recreate(destroy_list)
destroy_list.each do |key, dir|
logger.info 'Removed dir: %s' % dir.full_path
# dir.destroy!
end
end
logger.info 'Finish recreate'
return nil
# TODO: check items that weren't checked.
end
# QUESTION Symlinks?
def recreate(destroy_list, path = self.full_path)
# Convert all subdirs into a hash and mark them to be deleted
# FIXME: better oneliner
destroy_list.merge!(subdirs.all.map{ |s| [s.id,s] }.to_h)
# Go through all subdirectories (no recursion)
Dir.glob("%s/*" % path).each do |subdir_path|
if File.directory? subdir_path
subdir_name = File.basename(subdir_path)
# We find by name only, ignore path
# Find existing subdirs from current path. Keep those we find
if (subdir = find_existing(subdir_name))
if subdir.parent_id != self.id
old_path = subdir.full_path
subdir.parent = self
subdir.save!
logger.info 'Renamed dir: %s -> %s' % [old_path, subdir.full_path]
end
destroy_list.delete subdir.id
# In case its a new directory
else
# Attempt to find it in existing directories
subdir = subdirs.build(name: subdir_name)
# FIXME: find a better solution
subdir.save!(validate: false)
logger.info 'New dir: %s' % subdir.full_path
end
# Recreate the directory
destroy_list = subdir.recreate(destroy_list)
end
end
return destroy_list
end
def find_existing(subdir_name)
# Find by name
if (dir = subdirs.where(name: subdir_name)).exists?
return dir.first
# Problem is we can't find it if haven't got that far
else
Directory.where(name: subdir_name).all.each do |dir|
unless dir.path_exists?
return dir
end
end
# TODO: Find by number of files + hash of files
end
return false
end
# TODO check that you can download files
def process_dir
ActiveRecord::Base.transaction do
Dir.glob("#{path}/*").each do |file|
Dir.glob("#{full_path}/*").each do |file|
if File.directory?(file)
if dir = Directory.find_by_path(file)
dir.save!

View file

@ -0,0 +1,12 @@
class AddTitleToDirectories < ActiveRecord::Migration[6.0]
def change
change_table :directories do |m|
m.string :title
end
Directory.all.each do |dir|
dir.title = dir.name
dir.name = File.basename(dir.path)
dir.save!
end
end
end