From 8e890fbaa655eba58ba38d022cf29b6a76cade0c Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 27 Jun 2015 00:15:32 +0200 Subject: [PATCH] Actually updating package data. Added debug printing which regexp matched. --- lib/tasks/import_debian.rake | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lib/tasks/import_debian.rake b/lib/tasks/import_debian.rake index 946eaf5..d55720d 100644 --- a/lib/tasks/import_debian.rake +++ b/lib/tasks/import_debian.rake @@ -50,8 +50,8 @@ namespace :debshots do repositories = Rails.configuration.package_sources Rails.logger = Logger.new(STDOUT) - Rails.logger.level = Logger::INFO - #Rails.logger.level = Logger::DEBUG + # Rails.logger.level = Logger::INFO + Rails.logger.level = Logger::DEBUG Rails.logger.info "Importing Debian package information" @@ -95,7 +95,7 @@ namespace :debshots do if db_package Rails.logger.info "Removing blacklisted package '#{package[:Package]}' from database" db_package.destroy - stats_removed +=1 + stats_removed +=1 end end @@ -236,29 +236,39 @@ def update_data(package, db_package) if new_version != package[:Version] Rails.logger.debug "- Version changed: #{db_package.version} -> #{new_version}" db_package.version = new_version + db_package.description = package[:Description] + db_package.homepage = package[:Homepage] + db_package.section = package[:Section] + db_package.origin = package[:Origin] + package[:Maintainer]=~/^(.+) <(.+)?>/ + db_package.maintainer = $1 + db_package.maintainer_email = $2 end db_package.save + Rails.logger.debug "Saved package data: #{db_package}" end # Check if a package name is blacklisted and should not be imported. # This prevents importing boring software that likely does not get a useful screenshot. def package_name_blacklisted?(name) - if BLACKLIST_NAME_PATTERN.find { |pattern| name=~pattern} - Rails.logger.debug " > Blacklisted by name ('#{name}')" - return true - else - return false + BLACKLIST_NAME_PATTERN.each do |pattern| + if name=~pattern + Rails.logger.debug " > Blacklisted by name ('#{name}' matches '#{pattern}'')" + return true + end end + return false end # Check if a package's section is blacklisted and should not be imported. # This prevents importing boring software that likely does not get a useful screenshot. def package_section_blacklisted?(section) - if BLACKLIST_SECTION_PATTERN.find { |pattern| section=~pattern} - Rails.logger.debug " > Blacklisted by section ('#{section}')" - return true - else - return false + BLACKLIST_SECTION_PATTERN.each do |pattern| + if section=~pattern + Rails.logger.debug " > Blacklisted by section ('#{section}' matches '#{pattern.to_s}')" + return true + end end + return false end