backend : show how many binaries out of how many we downloaded so far

4 files changed, 8 insertions, 8 deletions

diff --git a/src/backend/ebuildinstall.py b/src/backend/ebuildinstall.py
index 27062bf..12d5256 100644
--- a/src/backend/ebuildinstall.py
+++ b/src/backend/ebuildinstall.py
@@ -27,7 +27,7 @@ def start(pkgname):
                     print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
@@ -66,7 +66,7 @@ def start(pkgname):
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
diff --git a/src/backend/ebuildupgrade.py b/src/backend/ebuildupgrade.py
index 21add70..ebb803e 100644
--- a/src/backend/ebuildupgrade.py
+++ b/src/backend/ebuildupgrade.py
@@ -27,7 +27,7 @@ def start():
                     print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
@@ -66,7 +66,7 @@ def start():
                     print("\n" + "These are the source packages that would be merged, in order:" + "\n\n"  + "  ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
diff --git a/src/backend/install.py b/src/backend/install.py
index cf6d55c..8aeb6e1 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -29,7 +29,7 @@ def start(pkgname):
                     print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
@@ -76,7 +76,7 @@ def startqt(pkgname):
     os.chdir(sisyphus.filesystem.portageCacheDir)
     print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n")
     for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-        print(">>> Fetching" + " " + binhostURL + binary)
+        print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
         wget.download(binhostURL + binary)
         print("\n")
 
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index aaf47ce..695ce20 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -29,7 +29,7 @@ def start():
                     print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
                     if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
                         for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                            print(">>> Fetching" + " " + binhostURL + binary)
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                             wget.download(binhostURL + binary)
                             print("\n")
 
@@ -80,7 +80,7 @@ def startqt():
             os.chdir(sisyphus.filesystem.portageCacheDir)
             print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n")
             for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
-                print(">>> Fetching" + " " + binhostURL + binary)
+                print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
                 wget.download(binhostURL + binary)
                 print("\n")