From 4c03bad7b7b0458a002e3d81f5808a0c3ef7ab60 Mon Sep 17 00:00:00 2001
From: tobimori <tobi.mori92@gmail.com>
Date: Mon, 22 Oct 2018 17:52:58 +0200
Subject: [PATCH] Added exceptions.

---
 main.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/main.py b/main.py
index 048d9b8..443ab8a 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,5 @@
 # Unsplash Wallpaper
-__version__ = "1.0"
+__version__ = "1.1"
 # last edited @ 22.10.2018
 # by tobimori
 
@@ -8,35 +8,37 @@
 import urllib.request
 import time
 import ctypes
+import traceback
 
-
-def get_screensize(int):
+def get_screensize(multiplier):
     try:
         user32 = ctypes.windll.user32
-        screensize = f"{user32.GetSystemMetrics(78)*int}x{user32.GetSystemMetrics(79)*int}"
-        print(f"Detected screen size {user32.GetSystemMetrics(78)}x{user32.GetSystemMetrics(79)}.")
-        if int == 2:
-            print(f"Doubling to {screensize} for better quality.")
+        screensize = f"{user32.GetSystemMetrics(78)*multiplier}x{user32.GetSystemMetrics(79)*multiplier}"
+        print(f"Detected virtual monitor size {user32.GetSystemMetrics(78)}x{user32.GetSystemMetrics(79)}.")
+        if multiplier > 1:
+            print(f"Multiplying to {screensize} for better quality.")
         return screensize
     except:
-        print("Something failed while trying to get your display size.")
+        print(f"Encountered some problems while detecting your display size.")
+        traceback.print_exc()
         exit()
 
 
-def get_image():
+def get_image(multiplier):
     directory = os.getcwd() + "/.unsplash"
     if not os.path.exists(directory):
         os.makedirs(directory)
         print("Found no temporary directory. Creating one.")
-    filepath = directory + "/" + str(time.time()) + ".jpg"#
+    filepath = directory + "/" + str(time.time()) + ".jpg"
     print(f"Starting download...")
     try:
-        screensize = get_screensize(2)
+        screensize = get_screensize(multiplier)
         urllib.request.urlretrieve("https://source.unsplash.com/random/" + screensize, filepath)
-        print(f"We downloaded the image from source.unsplash.com/random/{screensize} to {filepath}")
+        print(f"Downloaded image from source.unsplash.com/random/{screensize} to {filepath}")
         return filepath
     except:
-        print("Something failed while downloading the image.")
+        print(f"Encountered some problems while downloading the image.")
+        traceback.print_exc()
         exit()
 
 
@@ -44,12 +46,16 @@ def get_image():
 osvar = platform.system()
 
 if osvar == "Windows":
-    print("We found that you're using Windows. Great. Let's do this!")
-    filepath_absolute = get_image()
+    print("Found that you're using Windows.")
+    print("Well, I hate Windows, but it was the easiest thing to implement, so let's do this!\n")
+    filepath_absolute = get_image(2)
     try:
         ctypes.windll.user32.SystemParametersInfoW(20, 0, filepath_absolute, 0)
+        print("\nDone!")
+        exit()
     except:
-        print("We couldn't set your wallpaper.")
+        print(f"Couldn't set your wallpaper.")
+        traceback.print_exc()
         exit()
 else:
     print("Sorry, only supporting Windows right now. Feel free to fork and add support ;)")