move display functions in binary (f4932247) · Commits · Seblu / installsystems

bin/is

+78 −6

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ import re
		import fnmatch
		import warnings
		import argparse
		import json
		import installsystems
		import installsystems.printer
		import installsystems.tools as istools
		@@ -62,6 +63,39 @@ def split_repositories(repos, filter=None):
		filter = lambda x: x != ""
		return [r for r in re.split("[ ,\n\t\v]+", repos) if filter(r)]

		def show_repositories(repoman, pattern, local=None, online=None,
		url=False, state=True):
		'''
		Show repository inside manager
		if :param online: is true, list only online repositories
		if :param online: is false, list only offline repostiories
		if :param online: is None, list both online and offline repostiories.
		if :param local: is true, list only local repositories
		if :param local: is false, list only remote repostiories
		if :param local: is None, list both local and remote repostiories.
		'''
		for reponame in fnmatch.filter(repoman.names, pattern):
		repo = repoman[reponame]
		if repo.config.offline and online is True:
		continue
		if not repo.config.offline and online is False:
		continue
		if repo.local and local is False:
		continue
		if not repo.local and local is True:
		continue
		so = "#l##r#Off#R# " if repo.config.offline else "#l##g#On#R# "
		sl = "#l##y#Local#R# " if repo.local else "#l##c#Remote#R# "
		rc = "#l##r#" if repo.config.offline else "#l##g#"
		s = ""
		if state:
		s += "%s%s " % (so, sl)
		rc = "#l##b#"
		s += "%s%s#R#"% (rc, repo.config.name)
		if url:
		s += " (%s)" % repo.config.path
		out(s)

		def select_image(name, repoman, best=False):
		'''
		Select and load a package image from a standard naming type
		@@ -98,6 +132,43 @@ def select_image(name, repoman, best=False):
		else:
		return repoman[repo].get(image, version), repoman[repo]

		def show_images(repoman, pattern, all_version=True, search=None,
		o_json=False, o_long=False,
		o_md5=False, o_date=False, o_author=False, o_size=False,
		o_url=False, o_description=False):
		'''
		Show repository inside manager
		json: display output in json
		long: display output in long format
		all images parameter can be given in arguments to displayed
		'''
		# get image list
		images = repoman.images(pattern, all_version, search)
		# display result
		if o_json:
		s = json.dumps(images)
		else:
		l = []
		for imgp in sorted(images.keys()):
		img = images[imgp]
		l.append(u"%s#R#/#l##b#%s#R#:#p#%s#R#" % (
		img["repo"], img["name"], img["version"]))
		if o_md5 or o_long:
		l[-1] = l[-1] + u" (#y#%s#R#)" % img["md5"]
		if o_date or o_long:
		l.append(u" #l#date:#R# %s" % istools.time_rfc2822(img["date"]))
		if o_author or o_long:
		l.append(u" #l#author:#R# %s" % img["author"])
		if o_size or o_long:
		l.append(u" #l#size:#R# %s" % istools.human_size(img["size"]))
		if o_url or o_long:
		l.append(u" #l#url:#R# %s" % img["url"])
		if o_description or o_long:
		l.append(u" #l#description:#R# %s" % img["description"])
		s = os.linesep.join(l)
		if len(s) > 0:
		out(s)

		################################################################################
		# Commands functions
		################################################################################
		@@ -295,7 +366,8 @@ def c_list(parser, args):
		if args.search is not None:
		args.search = split_repositories(args.repo_search, lambda x: x in repoman.onlines)
		for pattern in args.image:
		repoman.show_images(pattern, all_version=args.all_version, search=args.search,
		show_images(repoman, pattern,
		all_version=args.all_version, search=args.search,
		o_long=args.long, o_json=args.json,
		o_md5=args.md5, o_date=args.date, o_author=args.author,
		o_size=args.size, o_url=args.url, o_description=args.description)
		@@ -342,7 +414,7 @@ def c_repo(parser, args):
		'''
		repoman = load_repositories(args)
		for pattern in args.repository:
		repoman.show_repos(pattern, online=args.online, local=args.local,
		show_repositories(repoman, pattern, online=args.online, local=args.local,
		url=args.url, state=args.state)

		def c_search(parser, args):

installsystems/repository.py

+0 −70

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ import time
		import shutil
		import pwd
		import grp
		import json
		import tempfile
		import fnmatch
		import cStringIO
		@@ -656,75 +655,6 @@ class RepositoryManager(object):
		raise Exception("No image %s v%s in %s" % (
		name, version, search))

		def show_repos(self, pattern, local=None, online=None, url=False, state=True):
		'''
		Show repository inside manager
		if :param online: is true, list only online repositories
		if :param online: is false, list only offline repostiories
		if :param online: is None, list both online and offline repostiories.
		if :param local: is true, list only local repositories
		if :param local: is false, list only remote repostiories
		if :param local: is None, list both local and remote repostiories.
		'''
		for reponame in fnmatch.filter(self.names, pattern):
		repo = self[reponame]
		if repo.config.offline and online is True:
		continue
		if not repo.config.offline and online is False:
		continue
		if repo.local and local is False:
		continue
		if not repo.local and local is True:
		continue
		so = "#l##r#Off#R# " if repo.config.offline else "#l##g#On#R# "
		sl = "#l##y#Local#R# " if repo.local else "#l##c#Remote#R# "
		rc = "#l##r#" if repo.config.offline else "#l##g#"
		s = ""
		if state:
		s += "%s%s " % (so, sl)
		rc = "#l##b#"
		s += "%s%s#R#"% (rc, repo.config.name)
		if url:
		s += " (%s)" % repo.config.path
		out(s)

		def show_images(self, pattern, all_version=True, search=None,
		o_json=False, o_long=False,
		o_md5=False, o_date=False, o_author=False, o_size=False,
		o_url=False, o_description=False):
		'''
		Show repository inside manager
		json: display output in json
		long: display output in long format
		all images parameter can be given in arguments to displayed
		'''
		# get image list
		images = self.images(pattern, all_version, search)
		# display result
		if o_json:
		s = json.dumps(images)
		else:
		l = []
		for imgp in sorted(images.keys()):
		img = images[imgp]
		l.append(u"%s#R#/#l##b#%s#R#:#p#%s#R#" % (
		img["repo"], img["name"], img["version"]))
		if o_md5 or o_long:
		l[-1] = l[-1] + u" (#y#%s#R#)" % img["md5"]
		if o_date or o_long:
		l.append(u" #l#date:#R# %s" % istools.time_rfc2822(img["date"]))
		if o_author or o_long:
		l.append(u" #l#author:#R# %s" % img["author"])
		if o_size or o_long:
		l.append(u" #l#size:#R# %s" % istools.human_size(img["size"]))
		if o_url or o_long:
		l.append(u" #l#url:#R# %s" % img["url"])
		if o_description or o_long:
		l.append(u" #l#description:#R# %s" % img["description"])
		s = os.linesep.join(l)
		if len(s) > 0:
		out(s)

		def search(self, pattern):
		'''
		Search pattern accross all registered repositories