| 1 |
commit: c322c8a555e4297f5c841feabfe0326031889471 |
| 2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 1 15:33:10 2013 +0000 |
| 4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Aug 1 15:33:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=c322c8a5 |
| 7 |
|
| 8 |
g_sorcery/package_db: different fixes |
| 9 |
|
| 10 |
--- |
| 11 |
g_sorcery/package_db.py | 28 +++++++++++++++++----------- |
| 12 |
1 file changed, 17 insertions(+), 11 deletions(-) |
| 13 |
|
| 14 |
diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py |
| 15 |
index 3f2993a..e97ee15 100644 |
| 16 |
--- a/g_sorcery/package_db.py |
| 17 |
+++ b/g_sorcery/package_db.py |
| 18 |
@@ -251,6 +251,7 @@ class PackageDB(object): |
| 19 |
|
| 20 |
number_of_packages = len(list(self.database)) |
| 21 |
written_number = 0 |
| 22 |
+ length = 20 |
| 23 |
|
| 24 |
for pkgname, versions in self.database.items(): |
| 25 |
category, name = pkgname.split('/') |
| 26 |
@@ -273,14 +274,14 @@ class PackageDB(object): |
| 27 |
pkgs.append(name) |
| 28 |
f.write(pkgs) |
| 29 |
|
| 30 |
- chars = ['-','\\','|','/'] |
| 31 |
+ chars = ['-', '\\', '|', '/'] |
| 32 |
show = chars[written_number % 4] |
| 33 |
percent = (written_number * 100)//number_of_packages |
| 34 |
- length = 20 |
| 35 |
- progress = (percent * 20)//100 |
| 36 |
- blank = 20 - progress |
| 37 |
+ progress = (percent * length)//100 |
| 38 |
+ blank = length - progress |
| 39 |
|
| 40 |
- sys.stdout.write("\r %s [%s%s] %s%%" % (show, "#" * progress, " " * blank, percent)) |
| 41 |
+ sys.stdout.write("\r %s [%s%s] %s%%" % \ |
| 42 |
+ (show, "#" * progress, " " * blank, percent)) |
| 43 |
sys.stdout.flush() |
| 44 |
written_number += 1 |
| 45 |
|
| 46 |
@@ -292,7 +293,7 @@ class PackageDB(object): |
| 47 |
self.additional_write() |
| 48 |
|
| 49 |
if self.database: |
| 50 |
- sys.stdout.write("\r %s [%s] %s%%" % ("-", "#" * 20, 100)) |
| 51 |
+ sys.stdout.write("\r %s [%s] %s%%" % ("-", "#" * length, 100)) |
| 52 |
sys.stdout.flush() |
| 53 |
print("") |
| 54 |
|
| 55 |
@@ -454,7 +455,8 @@ class PackageDB(object): |
| 56 |
""" |
| 57 |
if not category or (not category in self.categories): |
| 58 |
raise InvalidKeyError('No such category: ' + category) |
| 59 |
- res = [x.split('/')[1] for x in self.database if x.split('/')[0] == category] |
| 60 |
+ res = [x.split('/')[1] for x in self.database |
| 61 |
+ if x.split('/')[0] == category] |
| 62 |
return res |
| 63 |
|
| 64 |
def list_catpkg_names(self): |
| 65 |
@@ -509,7 +511,8 @@ class PackageDB(object): |
| 66 |
Dictionary with package ebuild data. |
| 67 |
""" |
| 68 |
#a possible exception should be catched in the caller |
| 69 |
- return self.database[package.category + '/' + package.name][package.version] |
| 70 |
+ return self.database[package.category \ |
| 71 |
+ + '/' + package.name][package.version] |
| 72 |
|
| 73 |
def get_max_version(self, category, name): |
| 74 |
""" |
| 75 |
@@ -545,7 +548,8 @@ class DBGenerator(object): |
| 76 |
def __init__(self, package_db_class=PackageDB): |
| 77 |
self.package_db_class = package_db_class |
| 78 |
|
| 79 |
- def __call__(self, directory, repository, common_config=None, config=None, generate=True): |
| 80 |
+ def __call__(self, directory, repository, |
| 81 |
+ common_config=None, config=None, generate=True): |
| 82 |
""" |
| 83 |
Get a package database. |
| 84 |
|
| 85 |
@@ -572,7 +576,8 @@ class DBGenerator(object): |
| 86 |
db_path = os.path.join(directory, repository, "db") |
| 87 |
pkg_db = self.package_db_class(db_path) |
| 88 |
|
| 89 |
- config_f = FileJSON(os.path.join(directory, repository), "config.json", []) |
| 90 |
+ config_f = FileJSON(os.path.join(directory, repository), |
| 91 |
+ "config.json", []) |
| 92 |
if config: |
| 93 |
config_f.write(config) |
| 94 |
else: |
| 95 |
@@ -587,7 +592,8 @@ class DBGenerator(object): |
| 96 |
if generate: |
| 97 |
pkg_db.clean() |
| 98 |
self.generate_tree(pkg_db, common_config, config) |
| 99 |
- pkg_db.write() #todo: make db write on every add_package and only necessary info |
| 100 |
+ #todo: make db write on every add_package and only necessary info |
| 101 |
+ pkg_db.write() |
| 102 |
pkg_db.manifest() |
| 103 |
return pkg_db |
Archives