remove dev printer flag

Author: thebeninator

docker-compose.printer.dev.yml

@@ -18,4 +18,3 @@ services:
       - --port=14000
       - --dont-delete-pdfs
       - --config-json-path=/app/config/config.json
-      - --dev-printer

printer/modules/gerard.py

@@ -45,10 +45,9 @@ def create_print_job(
     printer_name,
     file_path,
     is_development_mode=False,
-    is_dev_printer=False,
 ):
     hold_time = "immediate"
-    if is_dev_printer:
+    if is_development_mode:
         future_datetime = datetime.datetime.fromtimestamp(datetime.datetime.utcnow().timestamp() + 5)
         hold_time = f"{future_datetime.hour}:{future_datetime.minute}:{future_datetime.second}"
 

printer/server.py

@@ -65,13 +65,6 @@ def get_args() -> argparse.Namespace:
         help="specify if server should run in development. this means requests won't get sent to a printer but logger instead",
     )
 
-    parser.add_argument(
-        "--dev-printer",
-        action="store_true",
-        default=False,
-        help="specify if we should use the virtual dev printer. requests will be processed as if it were a real printer",
-    )
-
     parser.add_argument(
         "--dont-delete-pdfs",
         action="store_true",
@@ -129,13 +122,13 @@ def send_file_to_printer(
     # only the right printer works right now, so we default to it
     PRINTER_NAME = os.environ.get("RIGHT_PRINTER_NAME")
 
-    if (args.dev_printer):
+    if (args.development):
         PRINTER_NAME = "HP_LaserJet_p2015dn_Right"
 
     metrics_handler.print_jobs_recieved.inc()
 
     job_id = gerard.create_print_job(
-        num_copies, maybe_page_range, sides, PRINTER_NAME, file_path, args.development, args.dev_printer
+        num_copies, maybe_page_range, sides, PRINTER_NAME, file_path, args.development
     )
     if job_id:
         sqlite_helpers.insert_print_job(args.database_file_path, job_id)
@@ -163,9 +156,6 @@ def metrics():
 
 @app.get("/status/")
 async def status(id: str = ''):
-    if not args.dev_printer and args.development:
-        return {"status": "completed"}
-    
     try: 
         db = sqlite3.connect(args.database_file_path)
         cursor = db.cursor()
@@ -223,16 +213,15 @@ async def read_item(
 # metrics_handler referenced by the rest of the file. otherwise,
 # the thread interacts with an instance different than the one the
 # server uses
-if __name__ == "server" and (not args.development or args.dev_printer):
+if __name__ == "server" and not args.development:
     # set the last time we opened an ssh tunnel to now because
     # when the script runs for the first time, we did so in what.sh
-    if not args.dev_printer:
-        metrics_handler.ssh_tunnel_last_opened.set(int(time.time()))
-        t = threading.Thread(
-            target=maybe_reopen_ssh_tunnel,
-            daemon=True,
-        )
-        t.start()
+    metrics_handler.ssh_tunnel_last_opened.set(int(time.time()))
+    t = threading.Thread(
+        target=maybe_reopen_ssh_tunnel,
+        daemon=True,
+    )
+    t.start()
 
     sqlite_helpers.maybe_create_table(args.database_file_path)