Major fixes

installers/configfiles/nginx-default

@@ -10,10 +10,10 @@ server {
     }
 
     location  /static/ {
-        root {REPLACEHOME}/skytracer/static;
+        root /var/www;
     }
 
     location  /media/ {
-        root {REPLACEHOME}/skytracer/media;
+        root /var/www;
     }
 }

installers/setup_nginx.sh

@@ -13,8 +13,9 @@ sudo cp -f $SKYTRACER_HOME/installers/configfiles/nginx-default /etc/nginx/sites
 
 sudo sed -i 's|{REPLACEONIONSITE}|'"${REPLACEONIONSITE}"'|g' /etc/nginx/sites-available/onionsite
 
-sudo sed -i 's|{REPLACEHOME}|'"${REPLACEHOME}"'|g' /etc/nginx/sites-available/onionsite
-
 sudo ln -s -f /etc/nginx/sites-available/onionsite /etc/nginx/sites-enabled/onionsite
 
+sudo chown $USER:www-data -R /var/www
+
+
 sudo service nginx restart

skytracer/camera/skycam.py

@@ -2,25 +2,72 @@
 #   Captures a camera image upon notification.
 #   Binds REP socket to tcp://*:5555
 #
+
+import os
+from pathlib import Path
 from datetime import datetime 
 import time
 import zmq
+import cv2
+
+# Main vars
+home = Path.home()
+imagedir = os.path.join(home, "Images")
+
+# ZMQ Setup
 
 context = zmq.Context()
 socket = context.socket(zmq.REP)
 socket.bind("tcp://*:5555")
 
+# CV2 Setup
+
+cap = cv2.VideoCapture(1)
+cap.set(cv2.CAP_PROP_FRAME_WIDTH, 1920)
+cap.set(cv2.CAP_PROP_FRAME_HEIGHT, 1080)
+
+if not os.path.exists(imagedir):
+    os.mkdir(imagedir)
+
+# Generates the filename string pertaining to time.
+
+
+def get_current_time_string():
+    d = datetime.now()
+    year = d.year
+    month = d.month
+    day = d.day
+    hour = d.hour
+    minute = d.minute
+    timestring = "%i_%i_%i_%i_%i" % (year, month, day, hour, minute)
+    return timestring
+
+
 while True:
-    #  Wait for next request from client
-    message = socket.recv()
-    if message == b"CaptureImage":
-        now = datetime.now()
-        current_time = now.strftime("%H:%M:%S")
-        print("Capturing image: %s" % current_time)
-
-        #  Send reply back to client
-        socket.send(b"CapturedTheImage")
-
-#  Do some 'work'
-    time.sleep(1)
+    # Read from camera...
+    ret, frame = cap.read()
+
+    #uncomment for local testing
+    #cv2.imshow('frame', frame)
+
+    if cv2.waitKey(1) == ord('q'):
+        break
+
+    try:
+
+        message = socket.recv(flags=zmq.NOBLOCK)
+
+        if message == b"CaptureImage":
+
+            cv2.imwrite(os.path.join(imagedir, get_current_time_string()+".jpg"), frame)
+
+            # Send reply to client
+            socket.send(b"Captured")
+    except zmq.Again as e:
+        continue
+
+
+cap.release()
+cv2.destroyAllWindows()
+
 

skytracer/skytracer/settings.py

@@ -119,6 +119,9 @@
 
 STATIC_URL = 'static/'
 
+STATIC_ROOT = "/var/www/static/"
+MEDIA_ROOT = "/var/www/media/"
+
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field