From 4c5138838180ff5ba84cf91ae109ff253d1ef033 Mon Sep 17 00:00:00 2001
From: Jordan Johnson <jordanjohnson1441@gmail.com>
Date: Tue, 30 Jul 2024 23:55:56 -0400
Subject: [PATCH 1/3] Added new dependencies and aspect ratio detection

---
 src/awake.py | 51 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/awake.py b/src/awake.py
index 4360295..7d57e53 100644
--- a/src/awake.py
+++ b/src/awake.py
@@ -2,20 +2,47 @@
 import time
 import sys
 from datetime import datetime
+from screeninfo import get_monitors
 pyautogui.FAILSAFE = False
 numMin = None
-if ((len(sys.argv)<2) or sys.argv[1].isalpha() or int(sys.argv[1])<1):
+xDirection = 0
+aspectRatio = 0
+
+if ((len(sys.argv) <2) or sys.argv[1].isalpha() or int(sys.argv[1])<1):
     numMin = 3
 else:
     numMin = int(sys.argv[1])
-while(True):
-    x=0
-    while(x<numMin):
-        time.sleep(60)
-        x+=1
-    for i in range(0,200):
-        pyautogui.moveTo(0,i*4)
-    pyautogui.moveTo(1,1)
-    for i in range(0,3):
-        pyautogui.press("shift")
-    print("Movement made at {}".format(datetime.now().time()))
\ No newline at end of file
+
+if ((len(sys.argv) < 3) or sys.argv[2].isalpha() or int(sys.argv[1] <0)):
+    xDirection = 0
+else:
+    xDirection = abs(int(sys.argv[2]))
+
+
+def determineAspectRatio():
+    monitors = get_monitors()
+    primaryMonitor = None
+    for monitor in monitors:
+        if (monitor.is_primary):
+            primaryMonitor = monitor
+    print(str(primaryMonitor))
+    return primaryMonitor.width/primaryMonitor.height
+
+def move():
+        while(True):
+            x=0
+            while(x<numMin):
+                x+=1
+            for i in range(0,200):
+                pyautogui.moveTo(((xDirection+i)*aspectRatio),240+(i*aspectRatio))
+                print(str(pyautogui.position()))
+            pyautogui.moveTo(1,1)
+            for i in range(0,3):
+                pyautogui.press("shift")
+            print("Movement made at {}".format(datetime.now().time()))
+            time.sleep(60)
+
+
+aspectRatio = determineAspectRatio()
+move()
+print(aspectRatio)

From 1e40eb4b1d389c7b0100cc1a785a2e986ff7446d Mon Sep 17 00:00:00 2001
From: Jordan Johnson <jordanjohnson1441@gmail.com>
Date: Tue, 30 Jul 2024 23:58:38 -0400
Subject: [PATCH 2/3] Updated readme and requirements, added gitignore

---
 .gitignore       | 1 +
 README.md        | 1 +
 requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dbe9c82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vscode/
\ No newline at end of file
diff --git a/README.md b/README.md
index 20e01a3..1d617a9 100644
--- a/README.md
+++ b/README.md
@@ -5,5 +5,6 @@ Default timer is 3 minutes, but can be 1 or more.
 
 # Dependencies
 This software uses PyAutoGui https://github.com/asweigart/pyautogui as the driver behind the movement. 
+In addition, screeninfo is needed https://pypi.org/project/screeninfo/ to determine primary monitor resolution.
 > Optional- Create Virtual Env Step: ``` python3 -m venv ./StayAwake ```
 > ``` pip install -r requirements.txt  ```
diff --git a/requirements.txt b/requirements.txt
index 1c4fdc4..b6ca450 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 pyautogui
-
+screeninfo

From 624b742f19c5926a37ec5c48a3e63c5e6ed6aca9 Mon Sep 17 00:00:00 2001
From: Jordan Johnson <jordanjohnson1441@gmail.com>
Date: Wed, 31 Jul 2024 00:00:02 -0400
Subject: [PATCH 3/3] Removed unneeded code

---
 src/awake.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/awake.py b/src/awake.py
index 7d57e53..9b180df 100644
--- a/src/awake.py
+++ b/src/awake.py
@@ -25,7 +25,6 @@ def determineAspectRatio():
     for monitor in monitors:
         if (monitor.is_primary):
             primaryMonitor = monitor
-    print(str(primaryMonitor))
     return primaryMonitor.width/primaryMonitor.height
 
 def move():
@@ -45,4 +44,3 @@ def move():
 
 aspectRatio = determineAspectRatio()
 move()
-print(aspectRatio)