merging in relevant work from #59

This commit is contained in:
Micah Lee 2014-06-24 15:08:39 -04:00
parent 756fc99d3c
commit fc13ef5707
2 changed files with 14 additions and 4 deletions

View file

@ -26,7 +26,17 @@ import logging
log_handler = logging.FileHandler('{0}/onionshare.web.log'.format(temp_dir))
log_handler.setLevel(logging.WARNING)
app = Flask(__name__, template_folder='./templates')
template_folder = './templates'
if platform.system() == 'Windows':
# pyinstaller sets sys.frozen=1 on run
application_path = ""
if getattr(sys, "frozen", False):
application_path = os.path.dirname(sys.executable)
elif __file__:
application_path = os.path.dirname(__file__)
template_path = os.path.join(application_path, "templates")
app = Flask(__name__, template_folder=template_path)
app.logger.addHandler(log_handler)
@app.route("/")