Merge branch 'develop'

EXAMPLES.md

@@ -3,11 +3,16 @@
 
 ##### Usage
 
-First you need to run '`slpkg update`' to synchronize the lists of packages, also every time you add
+Before you start to use slpkg need to run '`slpkg update`' to synchronize the lists of packages,
-a new repository. To add or remove repositories must edit the file '`/etc/slpkg/repositories.conf`'
+also every time you add a new repository.
-or run '`slpkg repo-enable`' (python3-pythondialog required). Add custom repositories with the
+
-command '`slpkg add-repo <repository name> <URL>`' and after run '`slpkg update`' to update package
+To add or remove repositories you have to edit the file '`/etc/slpkg/repositories.conf`'
-list. View list of repositories with the command `slpkg repo-list` or get repository information
+or run '`slpkg repo-enable`' (python3-pythondialog required).
+
+Add custom repositories with the command '`slpkg add-repo <repository name> <URL>`' and
+after run '`slpkg update`' to update package list.
+
+View list of repositories with the command `slpkg repo-list` or get repository information
 with the command '`slpkg repo-info <repository>`'.
 
 Update slpkg itself simply run '`slpkg update slpkg`', and slpkg check from GitLab repository if the
@@ -16,7 +21,7 @@ new version is available.
 Checking packages health with the command '`slpkg health`' and slpkg check if the files missing
 from the package file list.
 
-Print the dependencies status with the command '`slpkg deps-status`' or draw image map dependencies
+View the dependencies status with the command '`slpkg deps-status`' or draw image map dependencies
 with the additional option '`--graph=[image]`'.
 
 Manage '`.new`' configuration files with the command '`slpkg new-config`', like remove, overwrite,
@@ -43,7 +48,7 @@ Use '`--checklist`' option to help you to choose easy the packages. For advanced
 option '`--skip`' give them more power (see manpage).
 
 The most famous command is '`slpkg -s <repository> <packages>`', this command downloads, build and
-installs packages with the resolve all the dependencies or switch off resolve with the  option
+installs packages and resolve all the dependencies or switch off resolve with the option
 '`--resolve-off`'. Also the additional option '`--case-ins`' help you find the packages with case
 insensitive. Two new arguments, help you to rebuild '`--rebuild`' or reinstall '`--reinstall`' packages.
 The last one argument '`--patches`' help you to switch in the '`patches/`' directory, only for the slack
@@ -60,7 +65,7 @@ change the color of the text with the additional flag '`--color=[]`'.
 View a SBo package page on your terminal with command `slpkg -n <package>` and then manage
 multiple choices such read, download, build, install etc.
 
-If you want to find a package of all the repositories, that command will solve your hands
+If you want to find a package of all the repositories, this command will solve your hands
 '`slpkg -F <packages>`', it will search in all the enable repositories and will print all the
 packages that match the description that you enter.
 
@@ -73,7 +78,7 @@ remove packages from your system events. Notable mention you must give in the co
 '`slpkg --removepkg <packages>`' which  you can remove the packages with all dependencies together
 after editing configuration file '`/etc/slpkg/slpkg.conf`' (default is disable) or add additional
 option '`--deps`'. Also you can check if the packages they are used as dependency with additional
-option '`--check-deps`'. Option '`--tag`' allow to remove packages with by TAG. Optional you can use
+option '`--check-deps`'. Option '`--tag`' allow to remove packages by TAG. Optional you can use
 the dialog utility with the additional option '`--checklist`' (require python3-pythondialog). Rmove
 third-party packages with the option '`--third-party`'.
 

README.md

@@ -13,6 +13,8 @@ What makes slpkg to distinguish it from the other tools; The user friendliness i
 target as well as easy to understand and use, also use colors to highlight packages and
 display warning messages, etc.
 
+[EXAMPLES.md](https://gitlab.com/dslackw/slpkg/blob/master/EXAMPLES.md) Explore some examples.
+
 
 #### Asciicast:
 

slpkg/checksum.py

@@ -30,25 +30,24 @@ from slpkg.__metadata__ import MetaData as _meta_
 def check_md5(pkg_md5, src_file):
     """MD5 Checksum
     """
+    red = _meta_.color["RED"]
+    green = _meta_.color["GREEN"]
+    endc = _meta_.color["ENDC"]
     if _meta_.checkmd5 in ["on", "ON"]:
         print()
         md5s = md5(src_file)
         if pkg_md5 != md5s:
             Msg().template(78)
-            print("| MD5SUM check for {0} [ {1}FAILED{2} ]".format(
+            print(f"| MD5SUM check for {src_file.split('/')[-1]} [ {red}FAILED{endc} ]")
-                src_file.split("/")[-1], _meta_.color["RED"],
-                _meta_.color["ENDC"]))
             Msg().template(78)
-            print("| Expected: {0}".format(pkg_md5))
+            print(f"| Expected: {pkg_md5}")
-            print("| Found: {0}".format(md5s))
+            print(f"| Found: {md5s}")
             Msg().template(78)
             print()
             if not Msg().answer() in ["y", "Y"]:
                 raise SystemExit()
         else:
             Msg().template(78)
-            print("| MD5SUM check for {0} [ {1}PASSED{2} ]".format(
+            print(f"| MD5SUM check for {src_file.split('/')[-1]} [ {green}PASSED{endc} ]")
-                src_file.split("/")[-1], _meta_.color["GREEN"],
-                _meta_.color["ENDC"]))
             Msg().template(78)
         print()   # new line after pass checksum

slpkg/sizes.py

@@ -25,7 +25,6 @@
 def units(comp_sum, uncomp_sum):
     """Calculate package size
     """
-    print(comp_sum, uncomp_sum)
     compressed = round((sum(map(float, comp_sum)) / 1024), 2)
     uncompressed = round((sum(map(float, uncomp_sum)) / 1024), 2)
     comp_unit = uncomp_unit = "Mb"
@@ -41,5 +40,4 @@ def units(comp_sum, uncomp_sum):
     if uncompressed < 1:
         uncompressed = sum(map(int, uncomp_sum))
         uncomp_unit = "Kb"
-    print(comp_unit, uncomp_unit, compressed, uncompressed)
     return [comp_unit, uncomp_unit], [compressed, uncompressed]

tests/test_utils.py

@@ -1,10 +1,6 @@
 from slpkg.utils import Utils
 
 
-def test_units():
-    assert ["Kb", "Kb"], ["100", "100"] == units(['100', ['100']])
-
-
 def test_dimensional_list():
     lists = [[1, 2, 3, 4, 5]]
     utils = Utils()