Page MenuHomeSoftware Heritage
Files F7163740

D2379.id8385.diff
No OneTemporary
Actions

D2379.id8385.diff
View Options

diff --git a/swh/graph/cli.py b/swh/graph/cli.py
--- a/swh/graph/cli.py
+++ b/swh/graph/cli.py
@@ -5,6 +5,7 @@
import aiohttp
import click
+import logging
import sys
from pathlib import Path
@@ -176,31 +177,65 @@
@map.command('lookup')
@click.option('--graph', '-g', required=True, metavar='GRAPH',
help='compressed graph basename')
-@click.argument('identifier', required=True)
-def map_lookup(graph, identifier):
- """Lookup an identifier using on-disk maps.
+@click.argument('identifiers', nargs=-1)
+def map_lookup(graph, identifiers):
+ """Lookup identifiers using on-disk maps.
Depending on the identifier type lookup either a PID into a PID->node (and
return the node integer identifier) or, vice-versa, lookup a node integer
identifier into a node->PID (and return the PID). The desired behavior is
- chosen depending on the syntax of the given identifier.
+ chosen depending on the syntax of each given identifier.
+
+ Identifiers can be passed either directly on the command line or on
+ standard input, separate by blanks. Logical lines (as returned by
+ readline()) in stdin will be preserved in stdout.
"""
- is_pid = None
- try:
- int(identifier)
- is_pid = False
- except ValueError:
+ success = True # no identifiers failed to be looked up
+
+ def lookup(identifier):
+ nonlocal success
+ is_pid = None
try:
- parse_persistent_identifier(identifier)
- is_pid = True
- except swh.model.exceptions.ValidationError:
- raise ValueError(f'invalid identifier: {identifier}')
+ int(identifier)
+ is_pid = False
+ except ValueError:
+ try:
+ parse_persistent_identifier(identifier)
+ is_pid = True
+ except swh.model.exceptions.ValidationError:
+ success = False
+ logging.error(f'invalid identifier: {identifier}')
+ raise ValueError
- if is_pid:
- print(PidToNodeMap(f'{graph}.{PID2NODE_EXT}')[identifier])
- else:
- print(NodeToPidMap(f'{graph}.{NODE2PID_EXT}')[int(identifier)])
+ try:
+ if is_pid:
+ return PidToNodeMap(f'{graph}.{PID2NODE_EXT}')[identifier]
+ else:
+ return NodeToPidMap(f'{graph}.{NODE2PID_EXT}')[int(identifier)]
+ except KeyError:
+ success = False
+ logging.error(f'identifier not found: {identifier}')
+ raise ValueError
+
+ if identifiers: # lookup identifiers passed via CLI
+ for identifier in identifiers:
+ try:
+ print(lookup(identifier))
+ except ValueError:
+ pass
+ else: # lookup identifiers passed via stdin, preserving logical lines
+ line = sys.stdin.readline() # walrus, we miss you !
+ while (line):
+ for identifier in line.rstrip().split():
+ try:
+ print('{} '.format(lookup(identifier)), end='')
+ except ValueError:
+ pass
+ print()
+ line = sys.stdin.readline()
+
+ sys.exit(0 if success else 1)
@cli.command(name='rpc-serve')

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 30, 2:30 PM (1 w, 11 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217371

Event Timeline

About · Developer information · Legal