fix error in tempPrint method

Author: hexadecimalDinosaur

octoprint_cli/__main__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 import argparse
 import configparser
 import os
@@ -9,6 +9,7 @@
 import requests
 from termcolor import colored
 from octoprint_cli import __version__
+from octoprint_cli.api import api
 
 config = configparser.ConfigParser()
 parser = argparse.ArgumentParser(prog="octoprint-cli", description="Command line tool for controlling OctoPrint 3D printer servers", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -18,98 +19,6 @@
 destination = None
 key = None
 
-class api:
-    address = ""
-    XapiKey = ""
-    header = {}
-
-    def __init__(self, key, destination):
-        """api caller constructor method"""
-        self.address = destination
-        self.XapiKey = key
-        self.header['X-API-Key']=key
-
-    def get(self, target):
-        request = requests.get(self.address+target, headers=self.header)
-        if request.status_code != 200:
-            return request.status_code
-        return request.json()
-
-    def post(self, target, data):
-        request = requests.post(self.address+target, headers=self.header, json=(data))
-        return request.status_code
-
-    def connectionTest(self):
-        try:
-            if isinstance(self.get("/api/version"),dict):
-                return True
-            else:
-                return False
-        except requests.ConnectionError:
-            return False
-
-    def authTest(self):
-        if isinstance(self.get("/api/job"),dict):
-            return True
-        else:
-            return False
-
-    def getVersionInfo(self):
-        return self.get("/api/version")
-
-    def getState(self):
-        return self.get("/api/job")['state']
-
-    def getFile(self):
-        return self.get("/api/job")['job']['file']['name']
-
-    def getProgress(self):
-        return self.get("/api/job")['progress']['completion']
-
-    def getTimeLeft(self):
-        time = self.get("/api/job")['progress']['printTimeLeft']
-        hours = int(time//3600)
-        if len(str(hours))==1:
-            hours = "0"+str(hours)
-        time = time%3600
-        minutes = int(time//60)
-        time = int(time%60)
-        if len(str(minutes))==1:
-            minutes = "0"+str(minutes)
-        time = int(time%60)
-        if len(str(time))==1:
-            time = "0"+str(time)
-        return str(hours)+":"+str(minutes)+":"+str(time)
-
-    def getTotalTime(self):
-        time = self.get("/api/job")['job']['estimatedPrintTime']
-        hours = int(time//3600)
-        if len(str(hours))==1:
-            hours = "0"+str(hours)
-        time = time%3600
-        minutes = int(time//60)
-        time = int(time%60)
-        if len(str(minutes))==1:
-            minutes = "0"+str(minutes)
-        return str(hours)+":"+str(minutes)
-
-    def selectFile(self, fileName):
-        return self.post("/api/files/local/"+fileName, {'command':'select'})
-
-    def printRequests(self, command):
-        return self.post("/api/job", {'command':command})
-
-    def pauseRequests(self, action):
-        return self.post("/api/job", {'command':'pause', 'action':action})
-
-    def fileUpload(self, file):
-        fle = {'file':open(file,'rb'), 'filename':file}
-        request = requests.post(self.address+"/api/files/local", headers=self.header, files=fle)
-        if request.status_code == 201:
-            return request.json()
-        return request.status_code
-
-
 def loadConfig(path):
     try:
         open(os.path.join(path))
@@ -157,6 +66,7 @@ def tempPrint():
             print(colored("Bed Temp: ", attrs=['bold']) + str(data2['temperature']['bed']['actual'])+"°C")
             print(colored("Bed Target: ", attrs=['bold']) + str(data2['temperature']['bed']['target'])+"°C")
             lines += 2
+        return lines
     def jobPrint():
         data = caller.get('/api/job')
         print(colored("Loaded File: ", attrs=['bold']) + data['job']['file']['name'])
@@ -763,4 +673,4 @@ def nt_colored(*args, attrs=None):
         sys.exit(2)
 
 if __name__ == "__main__":
-    main()
+    main()