mirrors/epson_print_conf
1
0
Fork 0
mirror of https://github.com/Ircama/epson_print_conf.git synced 2024-10-18 09:10:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refinements

Browse source
This commit is contained in:
Ircama 2023-08-08 17:35:34 +02:00
parent 6e5cac9316
commit 3571c365d9
2 changed files with 85 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -236,8 +236,8 @@ Example of advanced printer status with an XP-205 printer:
'Model': 'EPSON XP-205 207 Series', 'Model': 'EPSON XP-205 207 Series',
'Model short': 'XP-205 207 Series', 'Model short': 'XP-205 207 Series',
'Name': '....', 'Name': '....',
'Print counter': '0',
'Print input': 'Auto sheet feeder', 'Print input': 'Auto sheet feeder',
'Total printed pages': '0',
'URL': 'http://192.168.1.87:631/Epson_IPP_Printer', 'URL': 'http://192.168.1.87:631/Epson_IPP_Printer',
'URL_path': 'Epson_IPP_Printer', 'URL_path': 'Epson_IPP_Printer',
'UpTime': '00:57:48', 'UpTime': '00:57:48',

108
epson_print_conf.py
View file

@ -480,10 +480,10 @@ class EpsonPrinter:
mib, mib,
label label
) )
return False return None, False
return self.mib_dict[mib] return self.mib_dict[mib]
if not self.hostname: if not self.hostname:
return False return None, False
utt = UdpTransportTarget( utt = UdpTransportTarget(
(self.hostname, 161), (self.hostname, 161),
) )
@ -506,7 +506,7 @@ class EpsonPrinter:
) )
if " timed out" in errorIndication: if " timed out" in errorIndication:
raise TimeoutError(errorIndication) raise TimeoutError(errorIndication)
return False return None, False
elif errorStatus: elif errorStatus:
logging.info( logging.info(
'snmp_mib PDU error: %s at %s. MIB: %s. Operation: %s', 'snmp_mib PDU error: %s at %s. MIB: %s. Operation: %s',
@ -515,25 +515,31 @@ class EpsonPrinter:
mib, mib,
label label
) )
return False return None, False
else: else:
for varBind in varBinds: for varBind in varBinds:
if isinstance(varBind[1], OctetStringType): if isinstance(varBind[1], OctetStringType):
return varBind[1].asOctets() return(
varBind[1].__class__.__name__,
varBind[1].asOctets()
)
else: else:
return varBind[1].prettyPrint() return(
varBind[1].__class__.__name__,
varBind[1].prettyPrint()
)
logging.info( logging.info(
"snmp_mib value error: invalid multiple data. " "snmp_mib value error: invalid multiple data. "
"MIB: %s. Operation: %s", "MIB: %s. Operation: %s",
mib, mib,
label label
) )
return False return None, False
logging.info( logging.info(
"snmp_mib value error: invalid data. MIB: %s. Operation: %s", "snmp_mib value error: invalid data. MIB: %s. Operation: %s",
label label
) )
return False return None, False
def invalid_response(self, response): def invalid_response(self, response):
return len(response) < 2 or response[0] != 0 or response[-1] != 12 return len(response) < 2 or response[0] != 0 or response[-1] != 12
@ -549,7 +555,7 @@ class EpsonPrinter:
f"{self.eeprom_oid_read_address(oid, label=label)}\n" f"{self.eeprom_oid_read_address(oid, label=label)}\n"
f" OID: {oid}={hex(oid)}" f" OID: {oid}={hex(oid)}"
) )
response = self.snmp_mib( tag, response = self.snmp_mib(
self.eeprom_oid_read_address(oid, label=label), label=label) self.eeprom_oid_read_address(oid, label=label), label=label)
if not response: if not response:
return None return None
@ -559,7 +565,7 @@ class EpsonPrinter:
repr(response), oid, label repr(response), oid, label
) )
return None return None
logging.debug(f" RESPONSE: {repr(response)}") logging.debug(" TAG: %s\n RESPONSE: %s", tag, repr(response))
try: try:
response = re.findall(r"EE:[0-9A-F]{6}", response.decode())[0][3:] response = re.findall(r"EE:[0-9A-F]{6}", response.decode())[0][3:]
except (TypeError, IndexError): except (TypeError, IndexError):
@ -610,9 +616,9 @@ class EpsonPrinter:
f" OID: {oid}={hex(oid)}\n" f" OID: {oid}={hex(oid)}\n"
f" VALUE: {value} = {hex(int(value))}" f" VALUE: {value} = {hex(int(value))}"
) )
response = self.snmp_mib(oid_string, label=label) tag, response = self.snmp_mib(oid_string, label=label)
if response: if response:
logging.debug(f" RESPONSE: {repr(response)}") logging.debug(" TAG: %s\n RESPONSE: %s", tag, repr(response))
if not self.dry_run and response and not ":OK;" in repr(response): if not self.dry_run and response and not ":OK;" in repr(response):
logging.info( logging.info(
"Write error. Oid=%s, value=%s, label=%s", oid, value, label) "Write error. Oid=%s, value=%s, label=%s", oid, value, label)
@ -947,8 +953,8 @@ class EpsonPrinter:
f"SNMP_DUMP {name}:\n" f"SNMP_DUMP {name}:\n"
f" ADDRESS: {oid}" f" ADDRESS: {oid}"
) )
result = self.snmp_mib(oid, label="get_snmp_info " + name) tag, result = self.snmp_mib(oid, label="get_snmp_info " + name)
logging.debug(f" RESPONSE: {repr(result)}") logging.debug(" TAG: %s\n RESPONSE: %s", tag, repr(result))
if name == "hex_data" and result is not False: if name == "hex_data" and result is not False:
sys_info[name] = result.hex(" ").upper() sys_info[name] = result.hex(" ").upper()
elif name == "UpTime" and result is not False: elif name == "UpTime" and result is not False:
@ -1032,7 +1038,7 @@ class EpsonPrinter:
f"SNMP_DUMP {label}:\n" f"SNMP_DUMP {label}:\n"
f" ADDRESS: {oid}" f" ADDRESS: {oid}"
) )
firmware_string = self.snmp_mib(oid, label=label) tag, firmware_string = self.snmp_mib(oid, label=label)
if not firmware_string: if not firmware_string:
return None return None
if self.invalid_response(firmware_string): if self.invalid_response(firmware_string):
@ -1040,7 +1046,7 @@ class EpsonPrinter:
f"Invalid response for %s: '%s'", f"Invalid response for %s: '%s'",
label, repr(firmware_string) label, repr(firmware_string)
) )
logging.debug(f" RESPONSE: {repr(firmware_string)}") logging.debug(" TAG: %s\n RESPONSE: %s", tag, repr(firmware_string))
firmware = re.sub( firmware = re.sub(
r".*vi:00:(.{6}).*", r'\g<1>', firmware_string.decode()) r".*vi:00:(.{6}).*", r'\g<1>', firmware_string.decode())
year = ord(firmware[4:5]) + 1945 year = ord(firmware[4:5]) + 1945
@ -1057,7 +1063,7 @@ class EpsonPrinter:
f"SNMP_DUMP {label}:\n" f"SNMP_DUMP {label}:\n"
f" ADDRESS: {oid}" f" ADDRESS: {oid}"
) )
cartridges_string = self.snmp_mib(oid, label=label) tag, cartridges_string = self.snmp_mib(oid, label=label)
if self.invalid_response(cartridges_string): if self.invalid_response(cartridges_string):
logging.error( logging.error(
f"Invalid response for %s: '%s'", f"Invalid response for %s: '%s'",
@ -1065,7 +1071,8 @@ class EpsonPrinter:
) )
if not cartridges_string: if not cartridges_string:
return None return None
logging.debug(f" RESPONSE: {repr(cartridges_string)}") logging.debug(
" TAG: %s\n RESPONSE: %s", tag, repr(cartridges_string))
cartridges = re.sub( cartridges = re.sub(
r".*IA:00;(.*);.*", r'\g<1>', r".*IA:00;(.*);.*", r'\g<1>',
cartridges_string.decode(), cartridges_string.decode(),
@ -1099,10 +1106,12 @@ class EpsonPrinter:
"""Return printer status and ink levels.""" """Return printer status and ink levels."""
address = f"{self.eeprom_link}.115.116.1.0.1" address = f"{self.eeprom_link}.115.116.1.0.1"
logging.debug(f"PRINTER_STATUS:\n ADDRESS: {address}") logging.debug(f"PRINTER_STATUS:\n ADDRESS: {address}")
result = self.snmp_mib(address, label="get_printer_status") tag, result = self.snmp_mib(address, label="get_printer_status")
if not result: if not result:
return None return None
logging.debug(f" RESPONSE: {repr(result[:20])}...\n%s", logging.debug(" TAG: %s\n RESPONSE: %s...\n%s",
tag,
repr(result[:20]),
textwrap.fill( textwrap.fill(
result.hex(' '), result.hex(' '),
initial_indent=" ", initial_indent=" ",
@ -1166,8 +1175,9 @@ class EpsonPrinter:
f"Cartridge {i}:\n" f"Cartridge {i}:\n"
f" ADDRESS: {mib}" f" ADDRESS: {mib}"
) )
cartridge = self.snmp_mib(mib, label="get_cartridge_information") tag, cartridge = self.snmp_mib(
logging.debug(f" RESPONSE: {repr(cartridge)}") mib, label="get_cartridge_information")
logging.debug(" TAG: %s\n RESPONSE: %s", tag, repr(cartridge))
if not cartridge: if not cartridge:
continue continue
if self.invalid_response(cartridge): if self.invalid_response(cartridge):
@ -1368,6 +1378,7 @@ class EpsonPrinter:
process = None process = None
address_val = None address_val = None
response_val = None response_val = None
tag_val = None
response_val_bytes = None response_val_bytes = None
if line.startswith("PRINTER_STATUS:"): if line.startswith("PRINTER_STATUS:"):
oid = False oid = False
@ -1424,6 +1435,15 @@ class EpsonPrinter:
"Missing VALUE: '%s'", value_line.rstrip()) "Missing VALUE: '%s'", value_line.rstrip())
next_line.pushline(value_line) next_line.pushline(value_line)
continue continue
# tag
tag_line = next_line.readline()
if tag_line.startswith(" TAG: "):
tag_val = tag_line[7:].rstrip()
if not tag_val:
logging.error(
"Invalid TAG '%s'", tag_line.rstrip())
next_line.pushline(tag_line)
continue
# response # response
response_line = next_line.readline() response_line = next_line.readline()
if response_line.startswith(" RESPONSE: "): if response_line.startswith(" RESPONSE: "):
@ -1459,7 +1479,7 @@ class EpsonPrinter:
next_line.pushline(dump_hex) next_line.pushline(dump_hex)
continue continue
if val: if val:
mib_dict[address_val] = val mib_dict[address_val] = tag_val, val
else: else:
try: try:
response_val_bytes = ast.literal_eval( response_val_bytes = ast.literal_eval(
@ -1473,7 +1493,7 @@ class EpsonPrinter:
next_line.pushline(response_line) next_line.pushline(response_line)
continue continue
if response_val_bytes: if response_val_bytes:
mib_dict[address_val] = response_val_bytes mib_dict[address_val] = tag_val, response_val_bytes
else: else:
logging.error( logging.error(
"Null value for response %s", "Null value for response %s",
@ -1487,6 +1507,33 @@ class EpsonPrinter:
self.mib_dict = mib_dict self.mib_dict = mib_dict
return mib_dict return mib_dict
def write_simdata(self, file):
tagnum = {
"OctetString": "4x",
"TimeTicks": "2", # 64
"Integer": "2",
}
try:
for key, (tag, value) in self.mib_dict.items():
if tag == "OctetString":
if isinstance(value, bytes):
write_line = f"{key}|{tagnum[tag]}|{value.hex()}\n"
else:
logging.error(
"OctetString is not byte type: key=%s, tag=%s, "
"value=%s, type=%s",
key, tag, value, type(value)
)
continue
else:
write_line = f"{key}|{tagnum[tag]}|{value}\n"
file.write(write_line)
file.close()
except Exception as e:
logging.error("simdata write error: %s", e)
return False
return True
if __name__ == "__main__": if __name__ == "__main__":
import argparse import argparse
@ -1621,6 +1668,14 @@ if __name__ == "__main__":
default=0, default=0,
nargs=1, nargs=1,
metavar='CONFIG_FILE') metavar='CONFIG_FILE')
parser.add_argument(
"--simdata",
dest='simdata_file',
type=argparse.FileType('a'),
help="write SNMP dictionary map to simdata file",
default=0,
nargs=1,
metavar='SIMDATA_FILE')
args = parser.parse_args() args = parser.parse_args()
logging_level = logging.WARNING logging_level = logging.WARNING
@ -1656,6 +1711,11 @@ if __name__ == "__main__":
print("Error while reading configuration file") print("Error while reading configuration file")
quit(1) quit(1)
args.config_file[0].close() args.config_file[0].close()
if args.simdata_file:
if not printer.write_simdata(args.simdata_file[0]):
print("Error while writing simdata file")
quit(1)
args.simdata_file[0].close()
if not printer.parm: if not printer.parm:
print(textwrap.fill("Unknown printer. Valid printers: " + ", ".join( print(textwrap.fill("Unknown printer. Valid printers: " + ", ".join(
printer.valid_printers), printer.valid_printers),