dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes in board, refactoring core databases to not use core anymore

Browse source
This commit is contained in:
Kevin Froman 2019-07-17 11:25:29 -05:00
parent 1ced21f40c
commit 000538ddc8
17 changed files with 43 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
onionr/coredb/blockmetadb/__init__.py
View file

@ -19,14 +19,15 @@
'''
import sqlite3
from . import expiredblocks, updateblockinfo, add
def get_block_list(core_inst, dateRec = None, unsaved = False):
from .. import dbfiles
def get_block_list(dateRec = None, unsaved = False):
'''
Get list of our blocks
'''
if dateRec == None:
dateRec = 0
conn = sqlite3.connect(core_inst.blockDB, timeout=30)
conn = sqlite3.connect(dbfiles.block_meta_db, timeout=30)
c = conn.cursor()
execute = 'SELECT hash FROM hashes WHERE dateReceived >= ? ORDER BY dateReceived ASC;'
@ -38,12 +39,12 @@ def get_block_list(core_inst, dateRec = None, unsaved = False):
conn.close()
return rows
def get_block_date(core_inst, blockHash):
def get_block_date(blockHash):
'''
Returns the date a block was received
'''
conn = sqlite3.connect(core_inst.blockDB, timeout=30)
conn = sqlite3.connect(dbfiles.block_meta_db, timeout=30)
c = conn.cursor()
execute = 'SELECT dateReceived FROM hashes WHERE hash=?;'
@ -54,12 +55,12 @@ def get_block_date(core_inst, blockHash):
conn.close()
return None
def get_blocks_by_type(core_inst, blockType, orderDate=True):
def get_blocks_by_type(blockType, orderDate=True):
'''
Returns a list of blocks by the type
'''
conn = sqlite3.connect(core_inst.blockDB, timeout=30)
conn = sqlite3.connect(dbfiles.block_meta_db, timeout=30)
c = conn.cursor()
if orderDate:

5
onionr/coredb/dbfiles.py Normal file
View file

@ -0,0 +1,5 @@
from utils import identifyhome
home = identifyhome.identify_home()
if not home.endswith('/'): home += '/'
block_meta_db = '%sblock-metadata.db'