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

added read file.pkg instead [package...]

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-02-04 04:50:26 +02:00
parent 46ec3e8300
commit c1dd7751fc
4 changed files with 53 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -3,6 +3,7 @@ Version 2.2.1
[Feature] - Added support multipackages.
- Added passing variables to the script.
- Added read file.pkg instead [package...]
[Updated] - Fix [key error] when you enter wrong name repository as default.
- Rename BUILD variable to BUILD_PATH in configuration file slpkg.conf.

42
slpkg/main.py
View file

@ -24,6 +24,7 @@
import sys
import getpass
from utils import Utils
from messages import Msg
from desc import PkgDesc
from config import Config
@ -92,11 +93,25 @@ def main():
# '-n', '-i', '-u', '-o', '-r', '-d'
# ]
if (args[0] in ['-f', '-i', '-u', '-o', '-r', '-d'] and
args[1].endswith('.pkg')):
packages = Utils().read_file_pkg(args[1])
elif args[0] in ['-s'] and args[2].endswith('.pkg'):
packages = Utils().read_file_pkg(args[2])
else:
packages = args[1:]
if args[0] in ['-q', '-b'] and args[1].endswith('.pkg'):
packages = Utils().read_file_pkg(args[1])
else:
packages = args[1:-1]
without_repos = [
'-h', '--help', '-v', '-a', '-b',
'-q', '-g', '-f', '-n', '-i', '-u',
'-o', '-r', '-d'
]
""" COMMANDS """
if len(args) == 1 and args[0] == 'update':
Update().repository()
@ -136,6 +151,9 @@ def main():
elif (len(args) == 2 and args[0] == 'repo-info' and
args[1] not in RepoList().all_repos):
usage(args[1])
""" ARGUMENTS """
if len(args) == 3 and args[0] == '-a':
BuildPackage(args[1], args[2:], _m.path).build()
elif (len(args) == 3 and args[0] == '-l' and args[1] in _m.repositories):
@ -160,9 +178,9 @@ def main():
usage(args[1])
elif len(args) >= 3 and args[0] == '-s':
if args[1] in _m.repositories and args[1] not in ['sbo']:
Case(args[2:]).binary_install(args[1])
Case(packages).binary_install(args[1])
elif args[1] == 'sbo':
Case(args[2:]).sbo_install()
Case(packages).sbo_install()
else:
usage(args[1])
elif (len(args) == 3 and args[0] == '-t' and args[1] in _m.repositories):
@ -172,15 +190,15 @@ def main():
elif len(args) == 2 and args[0] == '-b' and args[1] == '--list':
blacklist.listed()
elif len(args) > 2 and args[0] == '-b' and args[-1] == '--add':
blacklist.add(args[1:-1])
blacklist.add(packages)
elif len(args) > 2 and args[0] == '-b' and args[-1] == '--remove':
blacklist.remove(args[1:-1])
blacklist.remove(packages)
elif len(args) == 2 and args[0] == '-q' and args[1] == '--list':
queue.listed()
elif len(args) > 2 and args[0] == '-q' and args[-1] == '--add':
queue.add(args[1:-1])
queue.add(packages)
elif len(args) > 2 and args[0] == '-q' and args[-1] == '--remove':
queue.remove(args[1:-1])
queue.remove(packages)
elif len(args) == 2 and args[0] == '-q' and args[1] == '--build':
queue.build()
elif len(args) == 2 and args[0] == '-q' and args[1] == '--install':
@ -189,15 +207,15 @@ def main():
queue.build()
queue.install()
elif len(args) > 1 and args[0] == '-i':
PackageManager(args[1:]).install()
PackageManager(packages).install()
elif len(args) > 1 and args[0] == '-u':
PackageManager(args[1:]).upgrade()
PackageManager(packages).upgrade()
elif len(args) > 1 and args[0] == '-o':
PackageManager(args[1:]).reinstall()
PackageManager(packages).reinstall()
elif len(args) > 1 and args[0] == '-r':
PackageManager(args[1:]).remove()
PackageManager(packages).remove()
elif len(args) > 1 and args[0] == '-f':
PackageManager(args[1:]).find()
PackageManager(packages).find()
elif len(args) == 3 and args[0] == '-p' and args[1] in _m.repositories:
PkgDesc(args[2], args[1], '').view()
elif len(args) == 4 and args[0] == '-p' and args[3].startswith('--color='):
@ -208,7 +226,7 @@ def main():
else:
usage(args[1])
elif len(args) > 1 and args[0] == '-d':
PackageManager(args[1:]).display()
PackageManager(packages).display()
elif len(args) == 2 and args[0] == '-g' and args[1].startswith('--config'):
editor = args[1][len('--config='):]
if args[1] == '--config':

14
slpkg/pkg/manager.py
View file

@ -52,7 +52,7 @@ class PackageManager(object):
pkg), shell=True))
print("Completed!\n")
except subprocess.CalledProcessError:
self.not_found("Can't install", self.binary, pkg)
self._not_found("Can't install", self.binary, pkg)
def upgrade(self):
'''
@ -64,7 +64,7 @@ class PackageManager(object):
"{0}".format(pkg), shell=True))
print("Completed!\n")
except subprocess.CalledProcessError:
self.not_found("Can't upgrade", self.binary, pkg)
self._not_found("Can't upgrade", self.binary, pkg)
def reinstall(self):
'''
@ -76,7 +76,7 @@ class PackageManager(object):
"upgradepkg --reinstall {0}".format(pkg), shell=True))
print("Completed!\n")
except subprocess.CalledProcessError:
self.not_found("Can't reinstall", self.binary, pkg)
self._not_found("Can't reinstall", self.binary, pkg)
def _not_found(self, message, binary, pkg):
if len(binary) > 1:
@ -91,7 +91,7 @@ class PackageManager(object):
'''
dep_path = _m.log_path + "dep/"
dependencies, rmv_list = [], []
removed = self._view_removed(self.binary)
removed = self._view_removed()
if not removed:
print("") # new line at end
else:
@ -143,14 +143,14 @@ class PackageManager(object):
sys.exit(0)
return remove_dep
def _view_removed(self, binary):
def _view_removed(self):
'''
View packages before removed
'''
removed = []
print("\nPackages with name matching [ {0}{1}{2} ]\n".format(
_m.color['CYAN'], ", ".join(binary), _m.color['ENDC']))
for pkg in binary:
_m.color['CYAN'], ", ".join(self.binary), _m.color['ENDC']))
for pkg in self.binary:
pkgs = find_package(pkg + _m.sp, _m.pkg_path)
if pkgs:
print("[ {0}delete{1} ] --> {2}".format(

15
slpkg/utils.py
View file

@ -71,3 +71,18 @@ class Utils(object):
if os.path.isfile(path + pkg):
downloaded.append(pkg)
return downloaded
def read_file_pkg(self, file_pkg):
'''
Return packages from file
'''
packages = []
if os.path.isfile(file_pkg):
packages = []
r_file = self.read_file(file_pkg)
for pkg in r_file.splitlines():
packages.append(pkg)
else:
print("\nThe '{0}' file not found\n".format(
file_pkg.split('/')[-1]))
return filter(lambda x: x != '', packages)