Merge branch 'windows' into contacts

master
Kevin Froman 2019-02-16 23:21:53 -06:00
commit e2e8513cf8
3 changed files with 13 additions and 20 deletions

View File

@ -20,8 +20,6 @@
import re, sys, time, traceback, os import re, sys, time, traceback, os
MAX_LOG_SIZE = 100000000
class colors: class colors:
''' '''
This class allows you to set the color if ANSI codes are supported This class allows you to set the color if ANSI codes are supported
@ -66,7 +64,10 @@ class colors:
''' '''
Use the bitwise operators to merge these settings Use the bitwise operators to merge these settings
''' '''
USE_ANSI = 0b100 if os.name == 'nt':
USE_ANSI = 0b000
else:
USE_ANSI = 0b100
OUTPUT_TO_CONSOLE = 0b010 OUTPUT_TO_CONSOLE = 0b010
OUTPUT_TO_FILE = 0b001 OUTPUT_TO_FILE = 0b001
@ -79,12 +80,8 @@ LEVEL_IMPORTANT = 6
_type = OUTPUT_TO_CONSOLE | USE_ANSI # the default settings for logging _type = OUTPUT_TO_CONSOLE | USE_ANSI # the default settings for logging
_level = LEVEL_DEBUG # the lowest level to log _level = LEVEL_DEBUG # the lowest level to log
dataFolder = os.getenv('ONIONR_HOME') _outputfile = './output.log' # the file to log to
if type(dataFolder) is type(None):
dataFolder = 'data/'
if not dataFolder.endswith('/'):
dataFolder += '/'
_outputfile = dataFolder + 'output.log' # the file to log to
def set_settings(type): def set_settings(type):
''' '''
Set the settings for the logger using bitwise operators Set the settings for the logger using bitwise operators
@ -138,11 +135,6 @@ def raw(data, fd = sys.stdout, sensitive = False):
if get_settings() & OUTPUT_TO_CONSOLE: if get_settings() & OUTPUT_TO_CONSOLE:
ts = fd.write('%s\n' % data) ts = fd.write('%s\n' % data)
if get_settings() & OUTPUT_TO_FILE and not sensitive: if get_settings() & OUTPUT_TO_FILE and not sensitive:
try:
if os.path.getsize(_outputfile) >= MAX_LOG_SIZE:
return
except FileNotFoundError:
pass
try: try:
with open(_outputfile, "a+") as f: with open(_outputfile, "a+") as f:
f.write(colors.filter(data) + '\n') f.write(colors.filter(data) + '\n')

View File

@ -1 +1 @@
lc4mw2es4se22xsjrccumna3ih53difx64q2t2mgk5ijjk7d6aiacbqd.onion n6bvl3azuqkzckfc6ny2ruxxn2yh56tfpnbgzb3cz6zvwj64blfxj6id.onion

View File

@ -1,3 +1,4 @@
@echo off @echo off
cd onionr setlocal
python3 onionr.py chdir onionr
python onionr.py %*