Added list of uploaded rpm

This commit is contained in:
Alexey Berezhok
2026-04-18 00:11:36 +03:00
parent 6139670677
commit 0828293f36
9 changed files with 171 additions and 2 deletions

View File

@@ -120,4 +120,12 @@ class IniConfig
"repoview"
end
end
def get_time_zone
unless @config["timezone"]["zone"].nil?
@config["timezone"]["zone"].to_s
else
"Europe/Moscow"
end
end
end

View File

@@ -1,6 +1,12 @@
require "sequel"
cfg_internal = IniConfig.new()
# Настройте Sequel для использования нужного часового пояса
Sequel.extension :named_timezones
Sequel.database_timezone = :utc
Sequel.application_timezone = cfg_internal.get_time_zone
$DDB = Sequel.connect(cfg_internal.get_db)
class Repos < Sequel::Model(:repos)
@@ -33,6 +39,9 @@ end
class BuildRpms < Sequel::Model(:build_rpm)
end
class RpmUploaded < Sequel::Model(:rpm_uploaded)
end
class DBase
attr :error, :last_id, :cfg
@@ -360,6 +369,7 @@ class DBase
count = count + 1
end
return 1 if count > 0
RpmUploaded.where(proj_id: prj_id.to_i).delete
ReposProjects.where(proj_id: prj_id.to_i).delete
ProjectsReposSpec.where(proj_id: prj_id.to_i).delete
builds = BuildTask.where(proj_id: prj_id.to_i)
@@ -412,4 +422,13 @@ class DBase
def update_build_task_end_time(build_id)
BuildTask.where(id: build_id.to_i).update(buildstop: DateTime.now)
end
def add_custom_rpm_to_proj(proj_id, rpm_name, rpm_path)
id = RpmUploaded.insert(rpm: rpm_name, rpm_path: rpm_path, proj_id: proj_id.to_i)
@last_id = id
end
def get_project_uploaded_rpms(proj_id)
RpmUploaded.where(proj_id: proj_id.to_i)
end
end

View File

@@ -572,6 +572,17 @@ class ProjectsActions
return "Ошибка при создании файла: #{e.message}"
end
@db.add_custom_rpm_to_proj(id, File.basename(rpm_file[:filename]), target_file)
nil
end
def get_project_uploaded_rpms(id)
list = []
rpm_list = @db.get_project_uploaded_rpms(id)
rpm_list.each do |item|
list << item if File.exist?(item[:rpm_path])
end
list
end
end