Skip to content
This repository has been archived by the owner on Jan 12, 2021. It is now read-only.

Commit

Permalink
Merge branch 'search-command'
Browse files Browse the repository at this point in the history
  • Loading branch information
orsinium committed Apr 2, 2019
2 parents 47288d2 + 18e6a98 commit 8160fd7
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 1 deletion.
3 changes: 3 additions & 0 deletions dephell/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from .jail_remove import JailRemoveCommand
from .package_install import PackageInstallCommand
from .package_list import PackageListCommand
from .package_search import PackageSearchCommand
from .package_show import PackageShowCommand
from .venv_create import VenvCreateCommand
from .venv_destroy import VenvDestroyCommand
Expand All @@ -42,6 +43,7 @@
'JailRemoveCommand',
'PackageListCommand',
'PackageInstallCommand',
'PackageSearchCommand',
'PackageShowCommand',
'VenvCreateCommand',
'VenvDestroyCommand',
Expand Down Expand Up @@ -71,6 +73,7 @@
# 'jail update': ...,
'package install': PackageInstallCommand,
'package list': PackageListCommand,
'package search': PackageSearchCommand,
'package show': PackageShowCommand,
'venv create': VenvCreateCommand,
'venv destroy': VenvDestroyCommand,
Expand Down
2 changes: 2 additions & 0 deletions dephell/commands/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def _each(value):
'max()': lambda v: max(v),
'min()': lambda v: min(v),
'reverse()': lambda v: v[::-1],
'sort()': lambda v: sorted(v),
'type()': lambda v: type(v).__name__,
'zip()': lambda v: list(map(list, zip(*v))),

Expand All @@ -38,6 +39,7 @@ def _each(value):
'latest()': lambda v: v[-1],
'length()': lambda v: len(v),
'reversed()': lambda v: v[::-1],
'sorted()': lambda v: sorted(v),
}


Expand Down
27 changes: 27 additions & 0 deletions dephell/commands/package_search.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# built-in
from argparse import ArgumentParser, REMAINDER

# app
from ..config import builders
from ..repositories import WareHouseRepo
from .base import BaseCommand


class PackageSearchCommand(BaseCommand):
@classmethod
def get_parser(cls):
parser = ArgumentParser(
prog='dephell package search',
description='Search package on PyPI.org',
)
builders.build_config(parser)
builders.build_output(parser)
builders.build_api(parser)
builders.build_other(parser)
parser.add_argument('name', nargs=REMAINDER, help='package name or other search keywords')
return parser

def __call__(self):
repo = WareHouseRepo()
results = repo.search(self.args.name)
print(self.get_value(data=results, key=self.config.get('filter')))
43 changes: 42 additions & 1 deletion dephell/repositories/warehouse.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# built-in
import asyncio
import re
from logging import getLogger
from pathlib import Path
from tempfile import TemporaryDirectory
from typing import List, Optional, Tuple, Union
from typing import List, Optional, Tuple, Union, Dict, Iterable
from urllib.parse import urlparse
from xmlrpc.client import ServerProxy

# external
import attr
Expand All @@ -30,6 +32,22 @@


logger = getLogger('dephell.repositories')
rex_token = re.compile(r'^((?P<field>[a-z_]+)\:)?(?P<value>.+)$')
_fields = {
'author_email',
'author',
'description',
'download_url',
'home_page',
'keywords',
'license',
'maintainer_email',
'maintainer',
'name',
'platform',
'summary',
'version',
}


def _process_url(url: str) -> str:
Expand Down Expand Up @@ -140,6 +158,29 @@ async def get_dependencies(self, name: str, version: str,

return tuple(result)

def search(self, query: Iterable[str]) -> List[Dict[str, str]]:
fields = dict()
for token in query:
group = rex_token.fullmatch(token).groupdict()
fields[group['field'] or 'name'] = group['value']
logger.debug('search on PyPI', extra=dict(query=fields))
invalid_fields = set(fields) - _fields
if invalid_fields:
raise ValueError('Invalid fields: {}'.format(', '.join(invalid_fields)))

with ServerProxy('https://pypi.org/pypi') as client:
response = client.search(fields, 'and')

results = []
for info in response:
results.append(dict(
name=info['name'],
version=info['version'],
description=info['summary'],
url='https://pypi.org/project/{}/'.format(info['name']),
))
return results

# private methods

@classmethod
Expand Down

0 comments on commit 8160fd7

Please sign in to comment.