Improves repo dir specification to avoid issues.
This commit is contained in:
parent
dbb73d6f8e
commit
b46f8c543d
@ -7,6 +7,7 @@ def parser(subparsers, config):
|
||||
parser.add_argument('bibfile', help='bibtex, bibtexml or bibyaml file')
|
||||
return parser
|
||||
|
||||
|
||||
def command(config, pdffile, bibfile):
|
||||
"""
|
||||
:param pdffilepath path (no url yet) to a pdf or ps file
|
||||
|
@ -18,8 +18,8 @@ def command(config):
|
||||
if not os.path.exists(papersdir):
|
||||
print('{}initializing papers in {}{}{}'.format(
|
||||
color.grey, color.cyan, papersdir, color.end))
|
||||
repo = Repository(papersdir=papersdir)
|
||||
repo.init() # Creates directories
|
||||
repo = Repository()
|
||||
repo.init(papersdir) # Creates directories
|
||||
repo.save() # Saves empty repository description
|
||||
else:
|
||||
print('{}error {} : papers already present in {}{}{}'.format(
|
||||
|
@ -13,11 +13,8 @@ META_DIR = 'meta'
|
||||
|
||||
class Repository(object):
|
||||
|
||||
def __init__(self, papersdir=None):
|
||||
if papersdir:
|
||||
self.papersdir = papersdir
|
||||
else:
|
||||
self.papersdir = files.find_papersdir()
|
||||
def __init__(self):
|
||||
self.papersdir = None
|
||||
self.citekeys = []
|
||||
|
||||
# loading existing papers
|
||||
@ -125,7 +122,8 @@ class Repository(object):
|
||||
papers_config = files.read_yamlfile(self.base_file_path())
|
||||
self.citekeys = papers_config['citekeys']
|
||||
|
||||
def init(self):
|
||||
def init(self, papersdir):
|
||||
self.papersdir = papersdir
|
||||
os.makedirs(os.path.join(self.papersdir, BIB_DIR))
|
||||
os.makedirs(os.path.join(self.papersdir, META_DIR))
|
||||
self.save()
|
||||
@ -140,7 +138,10 @@ class Repository(object):
|
||||
|
||||
@classmethod
|
||||
def from_directory(cls, papersdir=None):
|
||||
repo = cls(papersdir=papersdir)
|
||||
repo = cls()
|
||||
if papersdir is None:
|
||||
papersdir = files.find_papersdir()
|
||||
repo.papersdir = papersdir
|
||||
repo.load()
|
||||
return repo
|
||||
|
||||
|
@ -33,8 +33,8 @@ class TestAddPaper(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.tmpdir = tempfile.mkdtemp()
|
||||
self.repo = Repository(papersdir=self.tmpdir)
|
||||
self.repo.init()
|
||||
self.repo = Repository()
|
||||
self.repo.init(self.tmpdir)
|
||||
self.repo.add_paper(fixtures.turing1950)
|
||||
|
||||
def test_raises_value_error_on_existing_key(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user