Rename mergedb.py -> merge_db.py.
This commit is contained in:
parent
d2220a3ced
commit
1fb281bf7f
2 changed files with 15 additions and 14 deletions
|
@ -34,7 +34,7 @@ Commands for processing:
|
||||||
{offline_reading}
|
{offline_reading}
|
||||||
{index}
|
{index}
|
||||||
{breakdown}
|
{breakdown}
|
||||||
{mergedb}
|
{merge_db}
|
||||||
|
|
||||||
TO SEE DETAILS ON EACH COMMAND, RUN
|
TO SEE DETAILS ON EACH COMMAND, RUN
|
||||||
> timesearch.py <command>
|
> timesearch.py <command>
|
||||||
|
@ -106,11 +106,11 @@ get_wiki:
|
||||||
> timesearch.py get_wiki -r subredditname
|
> timesearch.py get_wiki -r subredditname
|
||||||
''',
|
''',
|
||||||
|
|
||||||
'mergedb': '''
|
'merge_db': '''
|
||||||
mergedb:
|
merge_db:
|
||||||
Copy all new posts from one timesearch database into another.
|
Copy all new posts from one timesearch database into another.
|
||||||
|
|
||||||
> timesearch mergedb --from redditdev1.db --to redditdev2.db
|
> timesearch merge_db --from redditdev1.db --to redditdev2.db
|
||||||
|
|
||||||
flags:
|
flags:
|
||||||
--from:
|
--from:
|
||||||
|
@ -270,6 +270,7 @@ OLD_COMMAND_ALIASES = {
|
||||||
'commentaugment': 'get_comments',
|
'commentaugment': 'get_comments',
|
||||||
'getstyles': 'get_styles',
|
'getstyles': 'get_styles',
|
||||||
'getwiki': 'get_wiki',
|
'getwiki': 'get_wiki',
|
||||||
|
'mergedb': 'merge_db',
|
||||||
'redmash': 'index',
|
'redmash': 'index',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,9 +322,9 @@ def livestream_gateway(args):
|
||||||
from . import livestream
|
from . import livestream
|
||||||
livestream.livestream_argparse(args)
|
livestream.livestream_argparse(args)
|
||||||
|
|
||||||
def mergedb_gateway(args):
|
def merge_db_gateway(args):
|
||||||
from . import mergedb
|
from . import merge_db
|
||||||
mergedb.mergedb_argparse(args)
|
merge_db.merge_db_argparse(args)
|
||||||
|
|
||||||
def offline_reading_gateway(args):
|
def offline_reading_gateway(args):
|
||||||
from . import offline_reading
|
from . import offline_reading
|
||||||
|
@ -376,10 +377,10 @@ p_livestream.add_argument('-v', '--verbose', dest='verbose', action='store_true'
|
||||||
p_livestream.add_argument('-w', '--wait', dest='sleepy', default=30)
|
p_livestream.add_argument('-w', '--wait', dest='sleepy', default=30)
|
||||||
p_livestream.set_defaults(func=livestream_gateway)
|
p_livestream.set_defaults(func=livestream_gateway)
|
||||||
|
|
||||||
p_mergedb = subparsers.add_parser('mergedb')
|
p_merge_db = subparsers.add_parser('merge_db', aliases=['mergedb'])
|
||||||
p_mergedb.add_argument('--from', dest='from_db_path', required=True)
|
p_merge_db.add_argument('--from', dest='from_db_path', required=True)
|
||||||
p_mergedb.add_argument('--to', dest='to_db_path', required=True)
|
p_merge_db.add_argument('--to', dest='to_db_path', required=True)
|
||||||
p_mergedb.set_defaults(func=mergedb_gateway)
|
p_merge_db.set_defaults(func=merge_db_gateway)
|
||||||
|
|
||||||
p_offline_reading = subparsers.add_parser('offline_reading')
|
p_offline_reading = subparsers.add_parser('offline_reading')
|
||||||
p_offline_reading.add_argument('-r', '--subreddit', dest='subreddit', default=None)
|
p_offline_reading.add_argument('-r', '--subreddit', dest='subreddit', default=None)
|
||||||
|
|
|
@ -23,7 +23,7 @@ def _migrate_helper(db, tablename):
|
||||||
newcount = db.cur.execute('SELECT count(*) FROM %s' % tablename).fetchone()[0]
|
newcount = db.cur.execute('SELECT count(*) FROM %s' % tablename).fetchone()[0]
|
||||||
print('Gained %d items.' % (newcount - oldcount))
|
print('Gained %d items.' % (newcount - oldcount))
|
||||||
|
|
||||||
def mergedb(from_db_path, to_db_path):
|
def merge_db(from_db_path, to_db_path):
|
||||||
to_db = tsdb.TSDB(to_db_path)
|
to_db = tsdb.TSDB(to_db_path)
|
||||||
from_db = tsdb.TSDB(from_db_path)
|
from_db = tsdb.TSDB(from_db_path)
|
||||||
|
|
||||||
|
@ -31,5 +31,5 @@ def mergedb(from_db_path, to_db_path):
|
||||||
_migrate_helper(to_db, 'submissions')
|
_migrate_helper(to_db, 'submissions')
|
||||||
_migrate_helper(to_db, 'comments')
|
_migrate_helper(to_db, 'comments')
|
||||||
|
|
||||||
def mergedb_argparse(args):
|
def merge_db_argparse(args):
|
||||||
return mergedb(args.from_db_path, args.to_db_path)
|
return merge_db(args.from_db_path, args.to_db_path)
|
Loading…
Reference in a new issue