1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Factor out logic for finding the default db/index.

Note: `if not x:` has changed to `if x is not None:`, changing the
semantics slightly.  Shouldn't be a big issue.
This commit is contained in:
a_magical_me 2010-05-13 10:33:07 -07:00
parent 5e52bef91a
commit ffc30bff8f
5 changed files with 74 additions and 58 deletions
pokedex/db

View file

@ -2,7 +2,6 @@
import csv
import fnmatch
import os.path
import pkg_resources
import sys
from sqlalchemy.orm.attributes import instrumentation_registry
@ -11,6 +10,7 @@ import sqlalchemy.types
from pokedex.db import metadata
import pokedex.db.tables as tables
from pokedex.defaults import get_default_csv_dir
def _get_table_names(metadata, patterns):
@ -121,8 +121,8 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False):
print_start, print_status, print_done = _get_verbose_prints(verbose)
if not directory:
directory = pkg_resources.resource_filename('pokedex', 'data/csv')
if directory is None:
directory = get_default_csv_dir()
table_names = _get_table_names(metadata, tables)
table_objs = [metadata.tables[name] for name in table_names]
@ -276,7 +276,7 @@ def dump(session, tables=[], directory=None, verbose=False):
if not directory:
directory = pkg_resources.resource_filename('pokedex', 'data/csv')
directory = get_default_csv_dir()
table_names = _get_table_names(metadata, tables)
table_names.sort()