From effa267b73c439f5f276fcf94729d461b5a974a8 Mon Sep 17 00:00:00 2001
From: HelloZeroNet <hello@noloop.me>
Date: Mon, 12 Jan 2015 19:11:35 +0100
Subject: [PATCH] ignore hidden files, ignore data dir, dont close on startup
 error, create necessary files and dirs on first start, start function to
 main.py, bad file solved log to info

---
 .gitignore       | 10 +++++++++-
 data/sites.json  |  2 --
 log/empty.txt    |  1 -
 src/Site/Site.py |  2 +-
 src/main.py      | 12 ++++++++++++
 zeronet.py       | 14 ++++++++------
 6 files changed, 30 insertions(+), 11 deletions(-)
 delete mode 100644 data/sites.json
 delete mode 100644 log/empty.txt

diff --git a/.gitignore b/.gitignore
index 0216c2ed..907e511f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,12 @@ __pycache__/
 *.py[cod]
 
 # Log files
-*.log
\ No newline at end of file
+*.log
+
+# Hidden files
+.*
+!/.gitignore
+
+
+# Data dir
+data/*
diff --git a/data/sites.json b/data/sites.json
deleted file mode 100644
index e02aef27..00000000
--- a/data/sites.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/log/empty.txt b/log/empty.txt
deleted file mode 100644
index 63f6d20a..00000000
--- a/log/empty.txt
+++ /dev/null
@@ -1 +0,0 @@
-Place for log files.
\ No newline at end of file
diff --git a/src/Site/Site.py b/src/Site/Site.py
index 396e6cdd..1bbbc637 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -297,7 +297,7 @@ class Site:
 	def fileDone(self, inner_path):
 		# File downloaded, remove it from bad files
 		if inner_path in self.bad_files:
-			self.log.debug("Bad file solved: %s" % inner_path)
+			self.log.info("Bad file solved: %s" % inner_path)
 			del(self.bad_files[inner_path])
 
 		# Update content.json last downlad time
diff --git a/src/main.py b/src/main.py
index 34466373..2cd22b60 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,6 +1,11 @@
 import os, sys
 sys.path.append(os.path.dirname(__file__)) # Imports relative to main.py
 
+# Create necessary files and dirs
+if not os.path.isdir("log"): os.mkdir("log")
+if not os.path.isdir("data"): os.mkdir("data")
+if not os.path.isfile("data/sites.json"): open("data/sites.json", "w").write("{}")
+
 # Load config
 from Config import config
 
@@ -34,6 +39,13 @@ import time
 
 logging.debug("Starting... %s" % config)
 
+# Starts here when running zeronet.py
+def start():
+	action_func = globals()[config.action] # Function reference
+	action_kwargs = config.getActionArguments() # non-config arguments when calling zeronet.py
+
+	action_func(**action_kwargs)
+
 
 # Start serving UiServer and PeerServer
 def main():
diff --git a/zeronet.py b/zeronet.py
index d0b0cf79..2872555b 100644
--- a/zeronet.py
+++ b/zeronet.py
@@ -1,7 +1,9 @@
-from src import main
-
-action_func = getattr(main, main.config.action)
-action_kwargs = main.config.getActionArguments()
-
-action_func(**action_kwargs)
+#!/usr/bin/env python
 
+try:
+	from src import main
+	main.start()
+except Exception, err: # Prevent closing
+	import traceback
+	traceback.print_exc()
+	raw_input("-- Error happend, press enter to close --")