amd/brain
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of /srv/git/brain

Browse source
This commit is contained in:
Andrew Davidson 2012-05-23 11:37:41 -07:00
commit 22efbe5929
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
brain.py
View file

@ -37,17 +37,21 @@ conf['ext_render'] = ['.md','.txt','.jpg','.gif','.png']
conf['ext_edit'] = ['.md','.txt','.rb','.py','.pl','.sh'] conf['ext_edit'] = ['.md','.txt','.rb','.py','.pl','.sh']
def get_secrets(url = False): def get_secrets(url = False):
if url: def generate_query():
query = 'SELECT base_url,username,password,id FROM `secrets` WHERE base_url LIKE "%' + url + '";' if url:
else: query = 'SELECT base_url,username,password,id FROM `secrets` WHERE base_url LIKE "%' + url + '";'
query = 'SELECT base_url,username,password,id FROM `secrets`;' else:
query = 'SELECT base_url,username,password,id FROM `secrets`;'
return query
cursor.execute(query) cursor.execute(generate_query())
secrets = cursor.fetchall() secrets = cursor.fetchall()
if not len(secrets) > 0: if not len(secrets) > 0:
print 'No secrets for ' + url + ' expanding search.'
url = get_domain(url) url = get_domain(url)
cursor.execute(query) print 'Trying ' + url + '.'
cursor.execute(generate_query())
secrets = cursor.fetchall() secrets = cursor.fetchall()
return secrets return secrets

9
serve.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
while [ 1 ]
do
echo "Starting server."
python brain.py
echo "Server died.\nSleeping for 5 seconds."
sleep 5
done