Remove onlineFetch

Removes onlineFetch.
Adds a new function to initiate the download of
images from the internet.

Fixes NITDgpOS#303

Author: nemani

uiplib/gui/mainGui.py

@@ -5,12 +5,14 @@
 from tkinter import *
 from tkinter.ttk import *
 from tkinter import messagebox
+from threading import Thread, active_count
+from shutil import copy
 
 from uiplib.gui import generalTab, settingsTab
 from uiplib.scheduler import scheduler
 from uiplib.utils.utils import flush_wallpapers
-from shutil import copy
 from uiplib.settings import DEFAULT_FAVOURITE_PICS_FOLDER
+from uiplib.scrape import download
 
 
 class MainWindow:
@@ -98,6 +100,14 @@ def flush(self):
                                 icon='warning')
         if ask == 'yes':
             flush_wallpapers(self.settings['pics-folder'])
+            if active_count() < 2:
+                download_thread = Thread(
+                                target=download,
+                                args=(self.settings['website'],
+                                      self.settings['pics-folder'],
+                                      self.settings['no-of-images']),
+                                daemon=True)
+                download_thread.start()
             self.update_images()
         else:
             print("Not Flushing!")

uiplib/scheduler.py

@@ -7,15 +7,14 @@
 import random
 
 from uiplib.utils.utils import get_percentage
-from uiplib.scrape.onlineFetch import onlineFetch
-from uiplib.scrape.scrape import get_images
+from uiplib.scrape import download
 
 try:
     import msvcrt
 except ImportError:
     # not on windows
     pass
-from threading import Thread
+from threading import Thread, active_count
 
 
 class scheduler(Thread):
@@ -90,26 +89,13 @@ def deltaTime(self):
 
     def run(self):
         """Begin Scheduling Wallpapers."""
-        if not self.offline:
-            try:
-                thread_nos = len(self.website)
-                for i in range(thread_nos):
-                    # Init the thread
-                    fetch_thread = onlineFetch(self.website[i],
-                                               self.directory, self.count)
-                    # die upon main thread exit
-                    fetch_thread.setDaemon(True)
-
-                    # Start new Threads
-                    fetch_thread.start()
-
-            except ValueError as e:
-                print("File could not be retrieved.", e)
-
-            while not ((os.path.isdir(self.directory) and
-                        os.listdir(self.directory) != [])):
-                print('Downloading images..')
-                time.sleep(60)
+        if not self.offline and active_count() < 2:
+            self.download_thread = Thread(
+                            target=download,
+                            args=(self.website, self.directory, self.count),
+                            daemon=True)
+            self.download_thread.start()
+
         elif not os.path.exists(self.directory):
             os.makedirs(self.directory)
 

uiplib/scrape/scrape.py renamed to uiplib/scrape.py

@@ -157,3 +157,14 @@ def get_images(url, directory, count):
     image_links = get_image_links(url, no_of_images)
     for image in image_links:
         download_store_images(os.path.join(directory, image[0]), image[1])
+
+
+def download(website, directory, count):
+    """Download images from the Internet."""
+    print('Downloading images..')
+    try:
+        for site in website:
+            get_images(site, directory, count)
+
+    except ValueError as e:
+        print("File could not be retrieved.", e)