make build scripts

sfragrance · Dec 4, 2017 · 59708a0 · 59708a0
1 parent 4ffd8be
commit 59708a0
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 14 deletions.
diff --git a/BuildArea/autobuild.sh b/BuildArea/autobuild.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+cd $(dirname $0)
+echo "\033[34;1m=== START TO BUILD CAPTUOCR ===\033[0m"
+xcodebuild -workspace ../Captuocr.xcworkspace  -scheme Captuocr -configuration Release -derivedDataPath build
+now=`date +%Y%m%d_%H%M%S`
+mv -f build/Build/Products/Release/Captuocr.app ~/Documents/Captuocr_$now.app
+if [ $? -eq 0 ];then
+./success.sh
+echo "\033[34;1mCaptuocr has been released into ~/Documents/Captuocr_$now\033[0m"
+else
+./failed.sh
+exit 1
+fi
diff --git a/BuildArea/failed.sh b/BuildArea/failed.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m     \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m     \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m     \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m     \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m    \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m     \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m               "
+echo "             \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m   \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m  \033[41;1m \033[0m\033[41;1m \033[0m\033[41;1m \033[0m             "
+echo "                                                                                "
diff --git a/BuildArea/success.sh b/BuildArea/success.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+echo "                                                                                "
+echo "                                                                                "
+echo "                                                                                "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m        \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m              "
+echo "    \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m     \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m  \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m   \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m       "
+echo "                                             \033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m\033[42;1m \033[0m                              "
+echo "                                                                                "
+echo "                                                                                "
diff --git a/Captuocr/HistoryCenter.swift b/Captuocr/HistoryCenter.swift
@@ -64,13 +64,13 @@ class HistoryCenter {
             return hr
         }
     }
-    
-    func getImgBase64(id:Int) -> String?{
-        let query = HISTORY_TABLE.filter(self.HISTORY_COLUMN_ID == id)
-        if let matchRecord = try? db.prepare(query), let match = (matchRecord.first{_ in true} ){
+
+    func getImgBase64(id: Int) -> String? {
+        let query = HISTORY_TABLE.filter(HISTORY_COLUMN_ID == id)
+        if let matchRecord = try? db.prepare(query), let match = (matchRecord.first { _ in true }) {
             return match[self.HISTORY_COLUMN_IMGBASE64]
         }
-        
+
         return nil
     }
 }
diff --git a/Captuocr/HistoryViewModel.swift b/Captuocr/HistoryViewModel.swift
@@ -26,23 +26,22 @@ extension HistoryWindowController {
             cell.type = model.type
             return cell
         }.dispose(in: tableView.bag)
-        
+
         tableView.reactive.selectionDidChange.observeNext {
-            guard self.tableView.selectedRow >= 0 && self.tableView.selectedRow < self.viewmodel.itemsource.count else{
+            guard self.tableView.selectedRow >= 0 && self.tableView.selectedRow < self.viewmodel.itemsource.count else {
                 return
             }
             let model = self.viewmodel.itemsource.array[self.tableView.selectedRow]
-            if let base64 = self.historyCenter.getImgBase64(id: model.id){
+            if let base64 = self.historyCenter.getImgBase64(id: model.id) {
                 let recognizeVc = RecognizeBoxViewController(nibName: NSNib.Name("RecognizeBox"), bundle: Bundle.main)
-                //recognizeVc.view.frame = NSRect(x: 0, y: 0, width: 834, height: 474)
+                // recognizeVc.view.frame = NSRect(x: 0, y: 0, width: 834, height: 474)
                 recognizeVc.viewmodel.image.value = base64
                 recognizeVc.viewmodel.recognizedText.value = model.txt
                 self.contentView.subviews.removeAll()
                 self.contentView.addSubview(recognizeVc.view)
                 self.contentView.reactive.keyPath("frame", ofExpectedType: NSRect.self, context: .immediateOnMain)
                     .observeNext {
-                        self.contentView.subviews.first?.frame = NSRect.init(x: 0, y: 0, width: $0.width, height: $0.height)
-
+                        self.contentView.subviews.first?.frame = NSRect(x: 0, y: 0, width: $0.width, height: $0.height)
                     }
                     .dispose(in: self.contentView.bag)
             }
@@ -51,8 +50,8 @@ extension HistoryWindowController {
 
     func initialize() {
         historyCenter.getRecordList()
-            .forEach { (record) in
+            .forEach { record in
                 viewmodel.itemsource.append(record)
-        }
+            }
     }
 }
diff --git a/Captuocr/HistoryWindowController.swift b/Captuocr/HistoryWindowController.swift
@@ -11,7 +11,7 @@ import Cocoa
 class HistoryWindowController: NSWindowController {
 
     @IBOutlet var tableView: NSTableView!
-    @IBOutlet weak var contentView: NSView!
+    @IBOutlet var contentView: NSView!
     let viewmodel = HistoryViewModel()
     var setting: Settings!
     var historyCenter: HistoryCenter!