From 66b37908f062eef46594d52a905cd2bde55dd505 Mon Sep 17 00:00:00 2001
From: Adam Mathes <adam@trenchant.org>
Date: Thu, 26 Jan 2017 20:17:55 -0800
Subject: fix cmds
---
Makefile | 1 -
cmd/nekocrawl.go | 10 ++++++++++
cmd/nekoweb.go | 10 ++++++++++
cmd/util.go | 18 ++++++++++++++++++
util/util.go | 18 ++++++++++++++++++
5 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 cmd/nekocrawl.go
create mode 100644 cmd/nekoweb.go
create mode 100644 cmd/util.go
create mode 100644 util/util.go
diff --git a/Makefile b/Makefile
index baef138..57c4c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ $(BINARIES): $(SOURCES)
.PHONY: deps run
-
.PHONY: run
deps:
go get $(DEPS)
diff --git a/cmd/nekocrawl.go b/cmd/nekocrawl.go
new file mode 100644
index 0000000..e1dd6d0
--- /dev/null
+++ b/cmd/nekocrawl.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+ "neko/crawler"
+ _ "neko/util"
+)
+
+func main() {
+ crawler.Crawl()
+}
diff --git a/cmd/nekoweb.go b/cmd/nekoweb.go
new file mode 100644
index 0000000..bebfebf
--- /dev/null
+++ b/cmd/nekoweb.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+ "neko/web"
+ _ "neko/util"
+)
+
+func main() {
+ web.Serve()
+}
diff --git a/cmd/util.go b/cmd/util.go
new file mode 100644
index 0000000..ca12fdb
--- /dev/null
+++ b/cmd/util.go
@@ -0,0 +1,18 @@
+package util
+
+import (
+ "neko/config"
+ "neko/models"
+ "os"
+)
+
+var DEFAULT_CONFIG = "config.json"
+
+func init() {
+ var configFile = DEFAULT_CONFIG
+ if len(os.Args) > 1 {
+ configFile = os.Args[1]
+ }
+ config.Read(configFile)
+ models.InitDB(config.Config.DBServer)
+}
diff --git a/util/util.go b/util/util.go
new file mode 100644
index 0000000..ca12fdb
--- /dev/null
+++ b/util/util.go
@@ -0,0 +1,18 @@
+package util
+
+import (
+ "neko/config"
+ "neko/models"
+ "os"
+)
+
+var DEFAULT_CONFIG = "config.json"
+
+func init() {
+ var configFile = DEFAULT_CONFIG
+ if len(os.Args) > 1 {
+ configFile = os.Args[1]
+ }
+ config.Read(configFile)
+ models.InitDB(config.Config.DBServer)
+}
--
cgit v1.2.3