Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-18 10:26:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix find packages

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-01-21 20:59:03 +02:00
parent 2b9c9edd34
commit d91349039f
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
slpkg/others/install.py
View file

@ -50,6 +50,7 @@ from slpkg.pkg.manager import PackageManager
from slpkg.slack.slack_version import slack_ver
from greps import repo_data
from search import search_pkg
from repo_init import RepoInit
from dependency import Dependencies
@ -67,7 +68,6 @@ class OthersInstall(object):
self.uncomp_sum, self.dep_uncomp_sum = [], []
self.dependencies = []
self.deps_dict = {}
self.deps_pass = False
self.answer = ''
print("\nPackages with name matching [ {0}{1}{2} ]\n".format(
color['CYAN'], ', '.join(self.packages), color['ENDC']))
@ -77,7 +77,7 @@ class OthersInstall(object):
self.PACKAGES_TXT, self.mirror = RepoInit(self.repo).fetch()
num_lines = sum(1 for line in self.PACKAGES_TXT)
self.step = num_lines / 1000
self.step = (num_lines / 700)
def start(self):
'''
@ -85,15 +85,15 @@ class OthersInstall(object):
'''
try:
mas_sum = dep_sum = sums = [0, 0, 0]
self.packages = self.clear_masters()
(self.dwn, self.install, self.comp_sum,
self.uncomp_sum) = self.store(self.packages)
self.pkg_exist()
sys.stdout.write("{0}Done{1}\n".format(color['GREY'],
color['ENDC']))
self.dependencies = self.resolving_deps()
self.deps_pass = True
(self.dep_dwn, self.dep_install, self.dep_comp_sum,
self.dep_uncomp_sum) = self.store(self.dependencies)
self.packages = self.clear_masters()
(self.dwn, self.install, self.comp_sum,
self.uncomp_sum) = self.store(self.packages)
sys.stdout.write("{0}Done{1}\n".format(color['GREY'],
color['ENDC']))
print("") # new line at start
@ -135,6 +135,21 @@ class OthersInstall(object):
print("") # new line at exit
sys.exit(0)
def pkg_exist(self):
'''
Search if package exist
'''
pkg_found, pkg_not_found = [], []
for pkg in self.packages:
if search_pkg(pkg, self.repo):
pkg_found.append(pkg)
else:
pkg_not_found.append(pkg)
if pkg_found:
self.packages = pkg_found
else:
self.packages = pkg_not_found
def clear_masters(self):
'''
Clear master packages if already exist in dependencies
@ -294,7 +309,7 @@ class OthersInstall(object):
for pkg in packages:
for name, loc, comp, uncomp in zip(data[0], data[1], data[2],
data[3]):
if pkg in split_package(name)[0] and not self.deps_pass:
if pkg in split_package(name)[0]:
dwn.append("{0}{1}/{2}".format(self.mirror, loc, name))
install.append(name)
comp_sum.append(comp)

4
slpkg/others/search.py
View file

@ -23,6 +23,7 @@
import sys
from slpkg.toolbar import status
from slpkg.blacklist import BlackList
from slpkg.splitting import split_package
from slpkg.__metadata__ import (
@ -37,9 +38,12 @@ def search_pkg(name, repo):
'''
try:
blacklist = BlackList().packages()
toolbar_width, index = 2, 0
with open(lib_path + '{0}_repo/PACKAGES.TXT'.format(
repo), "r") as PACKAGES_TXT:
for line in PACKAGES_TXT:
index += 1
toolbar_width = status(index, toolbar_width, 1400)
if line.startswith("PACKAGE NAME: ") and len(line) > 16:
if repo == 'slackr':
pkg_name = line[15:].strip()