Fix handling user's platforms

This commit is contained in:
Ivan Kravets
2015-04-20 18:48:38 +01:00
2 changed files with 25 additions and 19 deletions

View File

@ -90,7 +90,7 @@ def platforms_search(query, json_output):
for item in data:
click.secho(item['type'], fg="cyan", nl=False)
click.echo(" (available packages: %s)" % ", ".join(
p.get_packages().keys()))
item.get("packages").keys()))
click.echo("-" * terminal_width)
click.echo(item['description'])
click.echo()

View File

@ -119,7 +119,7 @@ class PlatformFactory(object):
@staticmethod
def get_clsname(type_):
return "%sPlatform" % type_.title()
return "%s%sPlatform" % (type_.upper()[0], type_.lower()[1:])
@staticmethod
def load_module(type_, path):
@ -134,24 +134,30 @@ class PlatformFactory(object):
@classmethod
def get_platforms(cls, installed=False):
platforms = {}
for d in (util.get_home_dir(), util.get_source_dir()):
pdir = join(d, "platforms")
if not isdir(pdir):
continue
for p in listdir(pdir):
if p in ("__init__.py", "base.py") or not p.endswith(".py"):
try:
platforms = cls.get_platforms_cache
except AttributeError:
for d in (util.get_home_dir(), util.get_source_dir()):
pdir = join(d, "platforms")
if not isdir(pdir):
continue
type_ = p[:-3]
path = join(pdir, p)
try:
isplatform = hasattr(
cls.load_module(type_, path),
cls.get_clsname(type_)
)
if isplatform:
platforms[type_] = path
except exception.UnknownPlatform:
pass
for p in listdir(pdir):
if (p in ("__init__.py", "base.py") or not
p.endswith(".py")):
continue
type_ = p[:-3]
path = join(pdir, p)
try:
isplatform = hasattr(
cls.load_module(type_, path),
cls.get_clsname(type_)
)
if isplatform:
platforms[type_] = path
except exception.UnknownPlatform:
pass
cls.get_platforms_cache = platforms
if not installed:
return platforms