Archives
/
Comrad
mirror of https://github.com/ComradCollective/Comrad
2
0
Fork 0
Code Issues Releases Wiki Activity

updates

Browse Source
Comrad
quadrismegistus 4 years ago
parent e56ef03e65
commit c404e5cb56
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
comrad/app/main.py
Unescape Escape View File

@ -22,7 +22,7 @@ os.environ['KIVY_EVENTLOOP'] = 'asyncio'
# loop.set_debug(True)
# prefer experimental kivy if possible
# sys.path.insert(0,os.path.join(PATH_KOMRADE_LIB,'KivyMD'))
# sys.path.insert(0,os.path.join(PATH_COMRAD_LIB,'KivyMD'))
import kivymd
# print(kivymd.__file__)
# exit()

2
comrad/backend/mazes.py
Unescape Escape View File

@ -127,7 +127,7 @@ class MazeWalker(Handler):
def test_torpy():
hostname = KOMRADE_ONION
hostname = COMRAD_ONION
from torpy import TorClient
tor = TorClient()

8
comrad/backend/the_telephone.py
Unescape Escape View File

@ -28,12 +28,12 @@ class TheTelephone(Operator):
@property
def api_url(self):
#if 'KOMRADE_OPERATOR_API_URL' in os.environ and os.environ['KOMRADE_OPERATOR_API_URL']:
#if 'COMRAD_OPERATOR_API_URL' in os.environ and os.environ['COMRAD_OPERATOR_API_URL']:
# return os.environ
#os.environ['KOMRADE_OPERATOR_API_URL'] = OPERATOR_API_URL_TOR
if 'KOMRADE_USE_TOR' in os.environ and os.environ['KOMRADE_USE_TOR']=='1':
#os.environ['COMRAD_OPERATOR_API_URL'] = OPERATOR_API_URL_TOR
if 'COMRAD_USE_TOR' in os.environ and os.environ['COMRAD_USE_TOR']=='1':
return OPERATOR_API_URL_TOR
elif 'KOMRADE_USE_CLEARNET' in os.environ and os.environ['KOMRADE_USE_CLEARNET']=='1':
elif 'COMRAD_USE_CLEARNET' in os.environ and os.environ['COMRAD_USE_CLEARNET']=='1':
return OPERATOR_API_URL_CLEARNET
else:
return OPERATOR_API_URL

8
comrad/cli/cli.py
Unescape Escape View File

@ -170,11 +170,11 @@ class CLI(Logger):
)
def clearnet(self,_=''):
os.environ['KOMRADE_USE_CLEARNET'] = '1'
os.environ['KOMRADE_USE_TOR'] = '0'
os.environ['COMRAD_USE_CLEARNET'] = '1'
os.environ['COMRAD_USE_TOR'] = '0'
def tor(self,_=''):
os.environ['KOMRADE_USE_CLEARNET'] = '0'
os.environ['KOMRADE_USE_TOR'] = '1'
os.environ['COMRAD_USE_CLEARNET'] = '0'
os.environ['COMRAD_USE_TOR'] = '1'
def help(self,*x,**y):

54
comrad/constants.py
Unescape Escape View File

@ -1,40 +1,40 @@
# addresses
KOMRADE_ONION = 'u7spnj3dmwumzoa4.onion'
KOMRADE_ONION2 = 'rwg4zcnpwshv4laq.onion'
KOMRADE_URL = '68.66.241.111' #KOMRADE_ONION
COMRAD_ONION = 'u7spnj3dmwumzoa4.onion'
COMRAD_ONION2 = 'rwg4zcnpwshv4laq.onion'
COMRAD_URL = '68.66.241.111' #COMRAD_ONION
OPERATOR_API_URL_TOR = f'http://{KOMRADE_ONION}/op/'
OPERATOR_API_URL_CLEARNET = f'http://{KOMRADE_URL}/op/'
OPERATOR_API_URL_TOR = f'http://{COMRAD_ONION}/op/'
OPERATOR_API_URL_CLEARNET = f'http://{COMRAD_URL}/op/'
OPERATOR_API_URL = OPERATOR_API_URL_TOR
# paths
import os
PATH_USER_HOME = os.path.join(os.path.expanduser('~'))
PATH_KOMRADE = os.path.abspath(os.path.join(os.path.expanduser('~'),'comrad','data'))
PATH_KOMRADE_KEYS = os.path.join(PATH_KOMRADE,'.keys')
PATH_KOMRADE_DATA = os.path.join(PATH_KOMRADE,'.data')
PATH_KOMRADE_LIB = os.path.abspath(os.path.join(os.path.expanduser('~'),'comrad','lib'))
PATH_COMRAD = os.path.abspath(os.path.join(os.path.expanduser('~'),'comrad','data'))
PATH_COMRAD_KEYS = os.path.join(PATH_COMRAD,'.keys')
PATH_COMRAD_DATA = os.path.join(PATH_COMRAD,'.data')
PATH_COMRAD_LIB = os.path.abspath(os.path.join(os.path.expanduser('~'),'comrad','lib'))
PATH_CRYPT_OP_KEYS = os.path.join(PATH_KOMRADE_KEYS,'.op.db.keys.crypt')
PATH_CRYPT_OP_DATA = os.path.join(PATH_KOMRADE_DATA,'.op.db.data.crypt')
PATH_CRYPT_OP_KEYS = os.path.join(PATH_COMRAD_KEYS,'.op.db.keys.crypt')
PATH_CRYPT_OP_DATA = os.path.join(PATH_COMRAD_DATA,'.op.db.data.crypt')
# PATH_CRYPT_CA_KEYS = os.path.join(PATH_KOMRADE_KEYS,'.ca.db.keys.crypt')
# PATH_CRYPT_CA_DATA = os.path.join(PATH_KOMRADE_DATA,'.ca.db.data.encr')
# PATH_CRYPT_CA_KEYS = os.path.join(PATH_COMRAD_KEYS,'.ca.db.keys.crypt')
# PATH_CRYPT_CA_DATA = os.path.join(PATH_COMRAD_DATA,'.ca.db.data.encr')
PATH_CRYPT_CA_KEYS = PATH_CRYPT_OP_KEYS
PATH_CRYPT_CA_DATA = PATH_CRYPT_OP_DATA
PATH_QRCODES = os.path.join(PATH_KOMRADE,'contacts')
# PATH_SECRETS = os.path.join(PATH_KOMRADE,'.secrets')
PATH_QRCODES = os.path.join(PATH_COMRAD,'contacts')
# PATH_SECRETS = os.path.join(PATH_COMRAD,'.secrets')
PATH_SECRETS = PATH_SUPER_SECRETS = os.path.join(PATH_USER_HOME,'.secrets')
PATH_SUPER_SECRET_OP_KEY = os.path.join(PATH_SUPER_SECRETS,'.comrad.op.key')
PATH_MAPS = os.path.join(PATH_KOMRADE,'maps')
PATH_MAPS = os.path.join(PATH_COMRAD,'maps')
PATH_LOG_OUTPUT = os.path.join(PATH_KOMRADE,'logs')
PATH_LOG_OUTPUT = os.path.join(PATH_COMRAD,'logs')
for x in [PATH_KOMRADE,PATH_KOMRADE_DATA,PATH_KOMRADE_KEYS,PATH_QRCODES,PATH_SECRETS,PATH_SUPER_SECRETS,PATH_LOG_OUTPUT]:
for x in [PATH_COMRAD,PATH_COMRAD_DATA,PATH_COMRAD_KEYS,PATH_QRCODES,PATH_SECRETS,PATH_SUPER_SECRETS,PATH_LOG_OUTPUT]:
if not os.path.exists(x):
os.makedirs(x)
@ -144,10 +144,10 @@ TELEPHONE = None
PATH_OPERATOR_WEB_KEYS_FILE = f'/home/ryan/www/website-comrad/pub'
PATH_OPERATOR_WEB_KEYS_URL = f'http://{KOMRADE_URL}/pub'
PATH_OPERATOR_WEB_KEYS_URL = f'http://{COMRAD_URL}/pub'
# PATH_OPERATOR_WEB_CONTACTS_DIR = '/home/ryan/www/website-comrad/.contacts'
# PATH_OPERATOR_WEB_CONTACT_OP_URL = f'http://{KOMRADE_URL}/.contacts/TheOperator.png'
# PATH_OPERATOR_WEB_CONTACT_PH_URL = f'http://{KOMRADE_URL}/.contacts/TheTelephone.png'
# PATH_OPERATOR_WEB_CONTACT_OP_URL = f'http://{COMRAD_URL}/.contacts/TheOperator.png'
# PATH_OPERATOR_WEB_CONTACT_PH_URL = f'http://{COMRAD_URL}/.contacts/TheTelephone.png'
# dangerous! leave on only if absolutely necessary for initial dev
@ -181,7 +181,7 @@ CLEAR_LOGGER = 0
SAVE_LOGS = 1
CLI_TITLE = 'KOMRADE'
CLI_TITLE = 'COMRAD'
CLI_FONT = 'clr5x6'#'colossal'
CLI_WIDTH = STATUS_LINE_WIDTH = 60
CLI_HEIGHT = 30
@ -192,14 +192,14 @@ MAX_MSG_LEN = 1000
import os,logging
if not 'KOMRADE_SHOW_LOG' in os.environ or not os.environ['KOMRADE_SHOW_LOG'] or os.environ['KOMRADE_SHOW_LOG']=='0':
if not 'COMRAD_SHOW_LOG' in os.environ or not os.environ['COMRAD_SHOW_LOG'] or os.environ['COMRAD_SHOW_LOG']=='0':
logger = logging.getLogger()
logger.propagate = False
if not 'KOMRADE_USE_TOR' in os.environ or not os.environ['KOMRADE_USE_TOR']:
KOMRADE_USE_TOR = os.environ['KOMRADE_USE_TOR'] = '1'
if not 'KOMRADE_USE_CLEARNET' in os.environ or not os.environ['KOMRADE_USE_CLEARNET']:
KOMRADE_USE_CLEARNET = os.environ['KOMRADE_USE_CLEARNET'] = '0'
if not 'COMRAD_USE_TOR' in os.environ or not os.environ['COMRAD_USE_TOR']:
COMRAD_USE_TOR = os.environ['COMRAD_USE_TOR'] = '1'
if not 'COMRAD_USE_CLEARNET' in os.environ or not os.environ['COMRAD_USE_CLEARNET']:
COMRAD_USE_CLEARNET = os.environ['COMRAD_USE_CLEARNET'] = '0'

6
comrad/utils.py
Unescape Escape View File

@ -119,16 +119,16 @@ class Logger(object):
@property
def off(self):
x=os.environ.get('KOMRADE_SHOW_LOG')
x=os.environ.get('COMRAD_SHOW_LOG')
if x is not None:
x=x.strip().lower()
return x in {'n','0','false'}
return not SHOW_LOG
def hide_log(self):
os.environ['KOMRADE_SHOW_LOG']='0'
os.environ['COMRAD_SHOW_LOG']='0'
def show_log(self):
os.environ['KOMRADE_SHOW_LOG']='1'
os.environ['COMRAD_SHOW_LOG']='1'
def toggle_log(self):
self.show_log() if self.off else self.hide_log()

6
script/install
Unescape Escape View File

@ -93,17 +93,17 @@ then
if [ "$git_method" = "ssh" ]
then
echo "using ssh..."
git clone git@github.com:Komrade/Komrade.git
git clone git@github.com:ComradCollective/Comrad.git
git checkout installer
else
git clone https://github.com/Komrade/Komrade.git
git clone https://github.com/ComradCollective/Comrad.git
git checkout installer
fi
mv Comrad code
fi
else
cd $path_comrad
curl -s -LO https://github.com/Komrade/Komrade/archive/installer.zip
curl -s -LO https://github.com/ComradCollective/Comrad/archive/installer.zip
unzip installer.zip
rm installer.zip
cp -rT Comrad-installer code

Write Preview
Loading…
Cancel
Save