aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142 from pubs/feat/dialogedit

Browse Source 
Dialog after editing paper
This commit is contained in:
Olivier Mangin 2018-07-25 17:36:28 +02:00 committed by GitHub
commit 99dfcd1691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pubs/commands/edit_cmd.py
View File

@ -54,10 +54,17 @@ def command(conf, args):
new_paper = Paper(paper.citekey, paper.bibdata, new_paper = Paper(paper.citekey, paper.bibdata,
metadata=content) metadata=content)
rp.push_paper(new_paper, overwrite=True, event=False) rp.push_paper(new_paper, overwrite=True, event=False)
ui.info(('The metadata of paper `{}` was successfully '
'edited.'.format(citekey)))
else: else:
new_paper = Paper.from_bibentry(content, new_paper = Paper.from_bibentry(content,
metadata=paper.metadata) metadata=paper.metadata)
rp.rename_paper(new_paper, old_citekey=paper.citekey) if rp.rename_paper(new_paper, old_citekey=paper.citekey):
ui.info(('Paper `{}` was successfully edited and renamed '
'as `{}`.'.format(citekey, new_paper.citekey)))
else:
ui.info(('Paper `{}` was successfully edited.'.format(
citekey)))
break break
except repo.CiteKeyCollision: except repo.CiteKeyCollision:
@ -71,6 +78,7 @@ def command(conf, args):
break break
elif choice == 'overwrite': elif choice == 'overwrite':
paper = rp.push_paper(paper, overwrite=True) paper = rp.push_paper(paper, overwrite=True)
ui.info(('Paper `{}` was overwritten.'.format(citekey)))
break break
# else edit again # else edit again
# Also handle malformed bibtex and metadata # Also handle malformed bibtex and metadata

9
pubs/repo.py
View File

@ -141,6 +141,13 @@ class Repository(object):
pass pass
def rename_paper(self, paper, new_citekey=None, old_citekey=None): def rename_paper(self, paper, new_citekey=None, old_citekey=None):
"""Move a paper from a citekey to another one.
Even if the new and old citekey are the same, the paper instance is
pushed to disk.
:return: True if a rename happened, False if not.
"""
if old_citekey is None: if old_citekey is None:
old_citekey = paper.citekey old_citekey = paper.citekey
if new_citekey is None: if new_citekey is None:
@ -149,6 +156,7 @@ class Repository(object):
# check if new_citekey is not the same as paper.citekey # check if new_citekey is not the same as paper.citekey
if old_citekey == new_citekey: if old_citekey == new_citekey:
self.push_paper(paper, overwrite=True, event=False) self.push_paper(paper, overwrite=True, event=False)
return False
else: else:
# check if new_citekey does not exists # check if new_citekey does not exists
if new_citekey in self: if new_citekey in self:
@ -171,6 +179,7 @@ class Repository(object):
self.remove_paper(old_citekey, event=False) self.remove_paper(old_citekey, event=False)
# send event # send event
events.RenameEvent(paper, old_citekey).send() events.RenameEvent(paper, old_citekey).send()
return True
def push_doc(self, citekey, docfile, copy=None): def push_doc(self, citekey, docfile, copy=None):
p = self.pull_paper(citekey) p = self.pull_paper(citekey)