fix

.dockerignore

 Dockerfile
-#.git
-#.gitattributes
-#.gitignore
-#.gitmodules
-#.gitkeep
+.git
+.gitattributes
+.gitignore
+.gitmodules
+.gitkeep
 .dockerignore

Commands.rb

@@ -23,19 +23,19 @@ module Commands
 		MSETranslator.export_mse_all
 	end
 
-	def generate_delta(languages = nil)
+	def generate_delta(languages = nil, export = true)
 		Log.logger.info "Generate delta card image(s) with parameter: #{languages.inspect}"
 		if languages == nil
-			process_generate_delta
+			process_generate_delta(export)
 		else
 			for language in languages
 				Global.language = language
-				process_generate_delta
+				process_generate_delta(export)
 			end
 		end
 	end
 
-	def process_generate_delta
+	def process_generate_delta(export = true)
 		Log.logger.info "Generate delta card image with language #{Global.language}"
 		self.clear_mse
 		data = Sqlite.load # Language effected here
@@ -49,7 +49,7 @@ module Commands
 			File.delete path if File.exist? path
 		end
 		MSETranslator.generate_mse_all(data)
-		MSETranslator.export_mse_all
+		MSETranslator.export_mse_all if export
 	end
 
 	def generate_single(id)

Dockerfile

@@ -2,7 +2,7 @@ FROM ruby
 
 RUN dpkg --add-architecture i386
 RUN apt-get update
-RUN apt-get install -y wine wine32 xvfb
+RUN apt-get install -y wine wine32 xvfb imagemagick
 
 RUN bundle config --global frozen 1
 RUN mkdir -p /usr/src/app
@@ -10,13 +10,16 @@ WORKDIR /usr/src/app
 COPY Gemfile /usr/src/app/
 COPY Gemfile.lock /usr/src/app/
 RUN bundle install
-COPY . /usr/src/app
 
-RUN cp -r /usr/src/app/ygopro-database/* /usr/src/app/ygopro-images-raw/ #TODO: implement in ruby
+RUN git config --global user.email "zh99998+mycard@gmail.com"
+RUN git config --global user.name "mycard"
+RUN git config --global push.default simple
 
 ENV DISPLAY=:0.0
 ENV WINEARCH=win32
 ENV RACK_ENV=production
 RUN wineboot -i
 COPY magicseteditor/fonts /root/.wine/drive_c/windows/Fonts
+
+COPY . /usr/src/app
 CMD ["./entrypoint.sh"]

Global.rb

@@ -23,7 +23,7 @@ module Global
 	self.database_name = '%s.cdb'
 	self.temp_database_name = "working-cards.cdb"
 	self.image_type = '.jpg'
-	self.records_name = "records.json"
+	self.records_name = "ygopro-images/records.json"
 	self.answer_path = "ygopro-images-%s"
 	self.answer_uri = "https://github.com/mycard/ygo-images.git"
 	self.mse_path = "magicseteditor"

Server.rb

@@ -9,8 +9,5 @@ post '/command' do
 end
 
 post '/hook' do
-	Git.pull
-	Commands.generate_delta(Commands.get_languages)
-	Git.commit
-	Git.push
+	system('./generate.sh')
 end

entrypoint.sh

 #!/bin/bash
 
+echo "machine github.com login ${GITHUB_USERNAME} password ${GITHUB_PASSWORD}" > ~/.netrc
+chmod 600 ~/.netrc
+
 Xvfb -screen 0 1x0x24 &
 ruby Server.rb

generator.rb → generate.rb

@@ -2,4 +2,4 @@
 
 #usage: ./generator.rb zh-CN
 require_relative 'Commands.rb'
-Commands.generate_delta(ARGV)
+Commands.generate_delta(ARGV, false)

generate.sh

+#!/bin/bash
+
+git_pull () {
+   cd $1
+   git add -f .
+   git reset --hard
+   git checkout $2
+   git reset --hard origin/$2
+   git pull
+   cd ..
+}
+
+git_push () {
+    cd $1
+    git add .
+    git commit -am 'Update card images by https://github.com/mycard/ygopro-images-generator'
+    git push
+    cd ..
+}
+
+rm -rf mse-set
+git_pull ygopro-database build
+git_pull ygopro-images-raw master
+
+for locale in locales/*.yml; do
+    locale=$(basename "${locale}" .yml)
+    git_pull ygopro-images ${locale}
+    rm -rf ygopro-images-${locale}
+    ./generate.rb ${locale}
+    for set in mse-sets/data*-${locale}.mse-set; do
+        echo ${set}
+        wine32 magicseteditor/mse.com --export "${set}" "ygopro-images-${locale}/{card.gamecode}.png"
+    done
+    for image in ygopro-images-${locale}/*.png; do
+        output=$(basename "${image}" .png | sed 's/^0*//')
+        convert "${image}" -colorspace RGB -resize 177x254 -colorspace sRGB "ygopro-images/${output}.jpg"
+        convert "${image}" -colorspace RGB -resize 44x64 -colorspace sRGB "ygopro-images/thumbnail/${output}.jpg"
+    done
+    git_push ygopro-images
+done
+

web.sh

-#!/bin/bash
-
-git_update () {
-   cd $1
-   git add -f .
-   git reset --hard
-   git checkout $2
-   git reset --hard origin/$2
-   git pull
-   cd ..
-}
-
-git_update ygopro-database build
-git_update ygopro-images-raw master
-
-for filename in locales/*.yml; do
-    locale=$(basename "$filename" .yml)
-    git_update ygopro-images ${locale}
-    ruby generator.rb ${locale}
-    cd ygopro-images
-    git commit -am 'Update card images'
-    #git push
-    cd ..
-done