papers-cli 2.10__tar.gz → 2.11__tar.gz

{papers_cli-2.10 → papers_cli-2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: papers-cli
-Version: 2.10
+Version: 2.11
 Summary: utilities to keep your PDF library organized
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT

{papers_cli-2.10 → papers_cli-2.11}/papers/__main__.py

@@ -19,7 +19,7 @@ from papers.extract import fetch_bibtex_by_doi
 from papers.encoding import parse_file, format_file, family_names, format_entries, standard_name, format_entry, parse_keywords, format_key
 from papers.config import bcolors, Config, search_config, CONFIG_FILE, CONFIG_FILE_LOCAL, DATA_DIR, CONFIG_FILE_LEGACY, BACKUP_DIR
 from papers.duplicate import list_duplicates, list_uniques, edit_entries
-from papers.bib import Biblio, FUZZY_RATIO, DEFAULT_SIMILARITY, entry_filecheck, backupfile as backupfile_func, isvalidkey
+from papers.bib import Biblio, FUZZY_RATIO, DEFAULT_SIMILARITY, entry_filecheck, backupfile as backupfile_func, isvalidkey, DuplicateKeyError
 from papers.utils import move, checksum, view_pdf, open_folder
 from papers import __version__
 
@@ -538,30 +538,45 @@ def addcmd(parser, o, config):
 
     biblio = get_biblio(config)
 
-    kw = {'on_conflict':o.mode, 'check_duplicate':not o.no_check_duplicate,
-            'mergefiles':not o.no_merge_files, 'update_key':o.update_key}
-
     entries = []
 
+    metadata = {k: v for k, v in o.metadata or []}
+    if o.doi: metadata['doi'] = o.doi
+    if o.key: metadata['ID'] = o.key
+    if o.title: metadata['title'] = o.title
+    if o.author: metadata['author'] = o.author
+    if o.journal: metadata['journal'] = o.journal
+    if o.year: metadata['year'] = o.year
+    if o.type: metadata['ENTRYTYPE'] = o.type
+    if "author" in metadata:
+        metadata["author"] = standard_name(metadata["author"])
+    if o.attachment:
+        metadata['file'] = format_file(biblio.get_files(metadata) + o.attachment, relative_to=biblio.relative_to)
+
     if len(o.file) > 1:
-        if o.attachment:
-            logger.error('--attachment is only valid for one PDF / BIBTEX entry')
+        if metadata:
+            logger.error('--doi, --metadata, --key, --attachment and other metadata keys are only valid for one PDF / BIBTEX entry')
             raise PapersExit()
-        if o.doi:
-            logger.error('--doi is only valid for one added file')
+
+    kw = {'on_conflict':o.mode, 'check_duplicate':not o.no_check_duplicate,
+            'mergefiles':not o.no_merge_files, 'update_key':o.update_key, 'metadata':metadata}
+
+    if len(o.file) == 0 and o.doi and not o.no_query_doi:
+        entries.extend( biblio.fetch_doi(o.doi, attachments=o.attachment, rename=o.rename, copy=o.copy, **kw) )
+
+    elif len(o.file) == 0:
+        if not o.edit and not o.metadata and not o.key and not o.doi and not o.attachment and not o.title and not o.author and not o.journal and not o.year:
+            logger.error("No entry added: use --doi, --metadata, --key, --attachment, --title, --author, --journal, --year to add a new entry")
             raise PapersExit()
 
-    if len(o.file) == 0:
+        metadata.setdefault('ID', biblio.generate_key(metadata))
+        metadata.setdefault('ENTRYTYPE', 'article')
         if o.edit:
-            pass
-        elif not o.doi:
-            logger.error('Please provide either a PDF file or BIBTEX entry or specify `--doi DOI` or `--edit`')
-            raise PapersExit()
-        elif o.no_query_doi:
-            logger.error('If no file is present, --no-query-doi is not compatible with --doi')
-            raise PapersExit()
-        else:
-            entries.extend( biblio.fetch_doi(o.doi, attachments=o.attachment, rename=o.rename, copy=o.copy, **kw) )
+            metadata = edit_entries(metadata)
+            o.edit = False
+
+        entries.extend( biblio.insert_entry(metadata, **kw) )
+
 
     for file in o.file:
         try:
@@ -601,30 +616,18 @@ def addcmd(parser, o, config):
         entries = [e for e in biblio.entries if biblio.key(e) in unique_keys]
 
     if o.edit:
-        if len(entries) == 0:
-            entries = [{
-                "ID": "EDIT-NEW-KEY",
-                "ENTRYTYPE": "article",
-                "author": standard_name("John Doe and Jane Roe"),
-                "title": "",
-                "journal": "",
-                "year": "",
-                "doi": o.doi or "",
-                "file": format_file(o.attachment or [], relative_to=biblio.relative_to),
-                }]
+        entry_keys = [biblio.key(e) for e in entries]
+        otherentries = [e for e in biblio.entries if biblio.key(e) not in entry_keys]
 
         try:
-            otherentries = [e for e in biblio.entries if e not in entries]
             entries = edit_entries(entries)
-            entries = [{k:v for k,v in e.items() if v != ""} for e in entries]
-            biblio.db.entries = otherentries
-            for e in entries:
-                biblio.insert_entry(e, **kw)
-
         except Exception as error:
             logger.error(str(error))
             return
 
+        entries = [{k:v for k,v in e.items() if v != ""} for e in entries]
+        biblio.db.entries = otherentries + entries
+
     savebib(biblio, config)
 
     if o.open:
@@ -888,7 +891,6 @@ def statuscmd(parser, o, config):
     print(config.status(check_files=not o.no_check_files, verbose=o.verbose))
 
 
-
 def get_parser(config=None):
     if config is None:
         config = papers.config.Config()
@@ -1022,8 +1024,15 @@ def get_parser(config=None):
     grp.add_argument('--ignore-errors', action='store_true',
         help='ignore errors when adding multiple files')
 
-    grp = addp.add_argument_group('pdf metadata')
+    grp = addp.add_argument_group('metadata')
     grp.add_argument('--doi', help='provide DOI -- skip parsing PDF')
+    grp.add_argument('--key', help='manually set the key')
+    grp.add_argument('--type', help='document type')
+    grp.add_argument('--title', help='manually set the title')
+    grp.add_argument('--author', help='manually set the author')
+    grp.add_argument('--journal', help='manually set the journal')
+    grp.add_argument('--year', help='manually set the year')
+    grp.add_argument('--metadata', nargs="+", metavar="KEY=VALUE", type=lambda meta: meta.split('=', 1), help='the metadata fields manually')
     grp.add_argument('--no-query-doi', action='store_true', help='do not attempt to parse and query doi')
     grp.add_argument('--no-query-fulltext', action='store_true', help='do not attempt to query fulltext in case doi query fails')
     grp.add_argument('--scholar', action='store_true', help='use google scholar instead of crossref')
@@ -1298,7 +1307,7 @@ class PapersExit(Exception):
 def main_clean_exit(args=None):
     try:
         main(args)
-    except PapersExit as error:
+    except (PapersExit, DuplicateKeyError) as error:
         if logger.getEffectiveLevel() == logging.DEBUG:
             raise
         if error.args:

{papers_cli-2.10 → papers_cli-2.11}/papers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.10'
-__version_tuple__ = version_tuple = (2, 10)
+__version__ = version = '2.11'
+__version_tuple__ = version_tuple = (2, 11)

{papers_cli-2.10 → papers_cli-2.11}/papers/bib.py

@@ -279,9 +279,16 @@ class Biblio:
         return bisect.bisect_left(keys, self.key(entry))
 
 
-    def insert_entry(self, entry, update_key=False, check_duplicate=False, rename=False, copy=False, **checkopt):
+    def insert_entry(self, entry, update_key=False, check_duplicate=False, rename=False, copy=False, metadata={}, **checkopt):
         """
         """
+        if metadata:
+            files = self.get_files(entry) + self.get_files(metadata)
+            self.set_files(metadata, files)
+
+        if update_key:
+            entry['ID'] = self.generate_key(entry)
+
         # additional checks on DOI etc...
         if check_duplicate:
             logger.debug('check duplicates : TRUE')
@@ -298,15 +305,16 @@ class Biblio:
                 newkey = self.append_abc_to_key(entry)  # add abc
                 logger.info('update key: {} => {}'.format(entry['ID'], newkey))
                 entry['ID'] = newkey
-                print(format_entry(self, entry, prefix="Updated"))
 
             else:
-                raise DuplicateKeyError('this error can be avoided if update_key is True')
+                print(format_entry(self, entry, prefix="New entry"))
+                print(format_entry(self, self.entries[i], prefix="Conflicts with"))
+                raise DuplicateKeyError('Key conflict. Try update_key is True?')
 
         else:
             logger.info('new entry: '+self.key(entry))
-            print(format_entry(self, entry, prefix="Added"))
 
+        print(format_entry(self, entry, prefix="Added"))
         self.entries.insert(i, entry)
 
         if rename: self.rename_entry_files(entry, copy=copy)
@@ -413,8 +421,10 @@ class Biblio:
 
     def fetch_doi(self, doi, **kw):
         bibtex = fetch_bibtex_by_doi(doi)
+        kw["update_key"] = True  # fetched key is always updated
         return self.add_bibtex(bibtex, **kw)
 
+
     def add_pdf(self, pdf, attachments=None, search_doi=True, search_fulltext=True, scholar=False, doi=None, **kw):
 
         if doi:
@@ -436,9 +446,8 @@ class Biblio:
         entry['ID'] = self.generate_key(entry)
         logger.debug('generated PDF key: '+entry['ID'])
 
-        kw.pop('update_key', True)
-            # logger.warning('fetched key is always updated when adding PDF to existing bib')
-        return self.insert_entry(entry, update_key=True, **kw)
+        kw["update_key"] = False  # already updated
+        return self.insert_entry(entry, **kw)
 
 
     def scan_dir_iter(self, direc, search_doi=True, search_fulltext=True, **kw):

{papers_cli-2.10 → papers_cli-2.11}/papers/duplicate.py

@@ -341,7 +341,6 @@ def choose_entry_interactive(entries, extra=[], msg='', select=False, best=None)
     return _ask_pick_loop(entries, extra, select)
 
 
-
 def edit_entries(entries, diff=False, ndiff=False, editor=None):
     '''edit entries and insert result in database
     '''
@@ -367,12 +366,18 @@ def edit_entries(entries, diff=False, ndiff=False, editor=None):
 
     if res == 0:
         logger.info('sucessfully edited file, insert edited entries')
-        db = bibtexparser.loads(open(filename).read())
-        return db.entries
-
-        raise ValueError('error when editing entries file: '+filename)
-
+        db_updated = bibtexparser.loads(open(filename).read())
+        keys_before = [e.get('ID') for e in entries]
+        keys_after = [e.get('ID') for e in db_updated.entries]
+        if set(keys_before) != set(keys_after):
+            print(f"{bcolors.WARNING}Keys edited ->", bcolors.OKBLUE ," ".join(sorted(set(keys_before).difference(keys_after))), bcolors.ENDC,
+                  "=>", bcolors.OKBLUE,
+                  " ".join(sorted(set(keys_after).difference(keys_before))), bcolors.ENDC) if keys_after else '(deleted)'
+        return db_updated.entries
 
+    else:
+        logger.info('failed to edit file')
+        return db
 
 
 def score(e):

{papers_cli-2.10 → papers_cli-2.11}/papers/extract.py

@@ -221,7 +221,7 @@ def fetch_crossref_by_doi(doi):
 # @cached('crossref-bibtex.json')
 def fetch_bibtex_by_doi(doi):
     json_data = fetch_crossref_by_doi(doi)
-    return crossref_to_bibtex(json_data)
+    return crossref_to_bibtex(json_data['message'])
 
 @cached('crossref-json.json')
 def fetch_json_by_doi(doi):
@@ -308,8 +308,7 @@ def format_authors(authors):
     return " and ".join(author_list)
 
 
-def crossref_to_bibtex(json_data):
-    message = json_data['message']
+def crossref_to_bibtex(message):
     entry_type = message.get('type', 'misc')  # Default to 'misc' if type is not specified
 
     # Common fields
@@ -413,7 +412,6 @@ def fetch_bibtex_by_fulltext_crossref(txt, **kw):
     return crossref_to_bibtex(result).strip()
 
 
-
 def fetch_entry(e):
     if 'doi' in e and isvaliddoi(e['doi']):
         bibtex = fetch_bibtex_by_doi(e['doi'])

{papers_cli-2.10 → papers_cli-2.11}/papers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: papers-cli
-Version: 2.10
+Version: 2.11
 Summary: utilities to keep your PDF library organized
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT

{papers_cli-2.10 → papers_cli-2.11}/tests/test_add.py

@@ -305,7 +305,7 @@ class TestAddConflict(BibTest):
  title = {Something else entirely}
 }"""
 
-    bibtex_conflict_key_fixed = """@article{Perrette_2011b,
+    bibtex_conflict_key_fixed = """@article{perrette_author0000,
  author = {M. Perrette and Another author},
  doi = {10.5194/bg-8-515-2011XXX},
  title = {Something else entirely}

{papers_cli-2.10 → papers_cli-2.11}/tests/test_duplicates.py

@@ -266,7 +266,7 @@ class TestAddResolveDuplicate(BibTest):
 
     def test_conflict_updated_from_original_but_originalkey(self):
 
-        expected = """@article{Perrette_2011,
+        expected = """@article{fieldRareYear,
  author = {New Author Field},
  doi = {10.5194/bg-8-515-2011},
  journal = {ConflictJournal},