16 files changed, 22 insertions, 12 deletions

@@ -44,7 +44,7 @@ database::~database()
 
 achievement database::getRandomAchievement() const
 {
-  std::string queryString = "SELECT achievements.achievement_id, achievements.game_id, achievements.title, games.moon_image FROM achievements INNER JOIN games ON games.game_id = achievements.game_id ORDER BY RANDOM() LIMIT 1";
+  std::string queryString = "SELECT achievements.achievement_id, achievements.game_id, achievements.title, games.color FROM achievements INNER JOIN games ON games.game_id = achievements.game_id ORDER BY RANDOM() LIMIT 1";
 
   sqlite3_stmt* ppstmt;
   if (sqlite3_prepare_v2(
@@ -73,7 +73,7 @@ achievement database::getRandomAchievement() const
   result.achievementId = sqlite3_column_int(ppstmt, 0);
   result.gameId = sqlite3_column_int(ppstmt, 1);
   result.title = reinterpret_cast<const char*>(sqlite3_column_text(ppstmt, 2));
-  result.moonImage = reinterpret_cast<const char*>(sqlite3_column_text(ppstmt, 3));
+  result.color = reinterpret_cast<const char*>(sqlite3_column_text(ppstmt, 3));
 
   sqlite3_finalize(ppstmt);
 
@@ -9,7 +9,7 @@ struct achievement {
   int achievementId;
   int gameId;
   std::string title;
-  std::string moonImage;
+  std::string color;
 };
 
 class database {
@@ -8,7 +8,7 @@ CREATE UNIQUE INDEX `profile_by_path` ON `profiles`(`profile_path`);
 CREATE TABLE `games` (
   `game_id` INTEGER PRIMARY KEY,
   `steam_appid` INTEGER NOT NULL,
-  `moon_image` VARCHAR(255) NOT NULL
+  `color` VARCHAR(255) NOT NULL
 );
 
 CREATE UNIQUE INDEX `game_by_appid` ON `games`(`steam_appid`);
@@ -6,6 +6,20 @@ require 'rubygems'
 require 'bundler/setup'
 Bundler.require :default
 
+MOON_COLORS = [
+  :blue,
+  :brown,
+  :cyan,
+  :green,
+  :orange,
+  :pink,
+  :purple,
+  :red,
+  :star,
+  :white,
+  :yellow
+]
+
 @config = YAML.load(open(ARGV[0]))
 db_existed = File.exists?(@config["database"])
 db = Sequel.connect("sqlite://" + @config["database"])
@@ -47,10 +61,6 @@ class Did < Sequel::Model
   many_to_one :achievement
 end
 
-@moonimgs = Dir.entries(@config["moon_images"]).select do |img|
-  img.end_with? ".png"
-end
-
 def scrape_profile(profile, full)
   if full
     url = "https://steamcommunity.com/#{profile.profile_path}/games/?tab=all"
@@ -76,9 +86,9 @@ def scrape_profile(profile, full)
         if Game.where(steam_appid: id).count > 0
           game = Game.where(steam_appid: id).first
         else
-          moon_index = Random.rand(@moonimgs.size)
+          moon_index = Random.rand(MOON_COLORS.size)
 
-          game = Game.new(steam_appid: id, moon_image: @moonimgs[moon_index])
+          game = Game.new(steam_appid: id, color: MOON_COLORS[moon_index])
           game.save
 
           storepage = Nokogiri::HTML(
@@ -167,9 +177,9 @@ elsif ARGV[1] == "full"
   end
 elsif ARGV[1] == "recolor"
   Game.all.each do |game|
-    moon_index = Random.rand(@moonimgs.size)
+    moon_index = Random.rand(MOON_COLORS.size)
 
-    game.moon_image = @moonimgs[moon_index]
+    game.color = MOON_COLORS[moon_index]
     game.save
   end
 end