diff --git a/Logo/Image Processing.py b/Create Logo/Image Processing.py similarity index 100% rename from Logo/Image Processing.py rename to Create Logo/Image Processing.py diff --git a/Extension/manifest.json b/Extension/manifest.json deleted file mode 100644 index e9d702e..0000000 --- a/Extension/manifest.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "manifest_version": 2, - "name": "PrinterPi", - "version": "3.1", - "description": "Copy and parse data from eBay's Print a Shipping Label page and PayPal's Acitivty page. Then send it to a local application that forwards the data to a networked thermal printer.", - - "icons": { - "16": "logo16.png", - "48": "logo48.png", - "128": "logo128.png", - "256": "logo256.png" - }, - - "browser_action": { - "default_popup": "main.html", - "default_logo": "logo256.png" - }, - - "background": { - "scripts": ["/js/background.js"], - "persistent": true - }, - - "permissions": [ - "tabs", - "nativeMessaging", - "storage", - "*://*/*" - ], - - "key": "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDZuruj56zEH5P6YV1BrLffdleGd4hYRdQyoyO0kLqzJZPjOOdrfRIGF35co9j+I3qfVw1CKmLESv43trdBImVuEsEA4hDj2rtgw4xR9FaAZGL+BaBx5KrrGgz7Jjmfst2swuH9YccfCP7I3xCwv9gpCy+i0fnoTu++8z8DLh8qZFuh7hOy2IBRyrTZcswL6bCIaJPZR55QNBVqU6pSnFgKHBla0Q66wwVmwmdIsLiEUxbHoM2f4DfmmcU/p/rbME5LUsfwT3W2kKQJkpcGkWU3fhZzcLkitldZ1qyaK2/m4skkBCg/pFkCSipbM1gbMlLnzE+3ZPwWfKTqlpeW8ZXTAgMBAAECggEBAKJVnpd7IY3suWkB9QUFYOaklmd0cdzW23qRtgpnqjvttZDBmZHD449VLuqlYyFAlKl+vyzo61DNVTN28LUIjzV9mBcvdkZcjD5+Lf3gvinmLwSUb2bbhi/Z8XnDq00NkEfB2bsQjuTt0QE1h30w3FrlszOjeL+jMw9cz0twtN3mKtMuZOD39eN2/jDyS6LqqYJpzxCL1Is5jSGxKeq7eqOjQuzvRB1GUBY4rNy9Nh/q7WjNeaZk+fR9sgrci8WdMn+NOZjFmMwqv/2F8qTmxKIfhxkYew2m100V+44/S0AQ/ZI82vSSxsxEbWHyCANeQdptit8yo0w6t2kiLFTq6AkCgYEA+ueGZiBNPmfUkDVGeUzsE1j4VKl1WimFfggaYOAQLbg2Fuy68O49iU25d8CXsjaZ92jPiZZiRjCwkFwYF2YgZxtHhpP+TJbvt6hH5WLXpV5DsQX/y3PHOsmk/WCEL6iL+KZZ83+klvnH/gxZCvxWimOQ5pEyg+amzZKejV/mptUCgYEA3ia6b2R3cvSLkK2JxUsgJe6Av2L7afeHfWLEYKmhNtdBih4QE06s0tQ0ULcpGVjh2ZIdTIvOl/jhJAl0I4KYUF1b1R1jg/4Np9XAvcTZue8jKNK4mrSGVZTINkdL/OB1Lq8kG/t6+wONE9rh2zbfkevOyT8wvkLSZqUzgxzl7gcCgYA6xjF9iuONUtVAUrqHf7VtctH5QxjyXfefZlaHivU/QH+rLxk7hxNzLnnby4m9fXzjr/Gt0USEHLO/nVMnaAz/GizPIavYVSMiapEs8tKBMmu49CbPifeJleLIV+ufHmRrgsxfde8gTrLCmDHjmOjM0jYHTMwAie9ZCJeLloN5YQKBgDT+pCcCnoQr1kdzPpR0MX0bAlelszg6NnYw44vzq2O7wgTC2y7f69Z3jOtcZk+HpokSlC64g1Y5puvD3ZLDCrbRLqEOW7kXGAbbtRkQJqh2ZbrNWgB95DXyQjjAlV4D5bB3U3PhcBsFY9hCtPJoirjyuefETUp2Al8+NaWndSptAoGADqYSjgvIigqcVczH2lLP57Lhw0jb3CFjKOo2929skfnxnvHrpsvHAk2R8EmmYMBvh+UjmO4wdfripRrmNAlrcIpYRcZTvMeayBmMEn7ECfXlndA0Czubz4f2OLw0tb5F6mcnccH1lCcJ9yhdz1OUVtQpQJZeMW4gIpvgN8gPetA=" - -} diff --git a/Host/Item.class b/Host/Item.class deleted file mode 100644 index 0fdf026..0000000 Binary files a/Host/Item.class and /dev/null differ diff --git a/Host/Item.java b/Host/Item.java deleted file mode 100644 index 9ac236e..0000000 --- a/Host/Item.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Item.java - Data structure to hold one item - its price, description, quantity, and SKU - * - * Copyright (C) 2020 PolarPiBerry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import java.io.Serializable; - -public class Item implements Serializable { - String desc, sku; - double price; - int qty; - - public Item(String desc, String sku, int qty, double price) { - this.desc = desc; - this.sku = sku; - this.qty = qty; - this.price = price; - } - - public String toString() { - return "Description: " + this.desc + " SKU: " + this.sku + " QTY: " + this.qty + " Price: " + this.price; - } -} diff --git a/Host/Packet.class b/Host/Packet.class deleted file mode 100644 index 6d4fb63..0000000 Binary files a/Host/Packet.class and /dev/null differ diff --git a/Host/Packet.java b/Host/Packet.java deleted file mode 100644 index 42310fd..0000000 --- a/Host/Packet.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Packet.java - Data structure to hold a single print job. Contains the address, subtotal, total, shipping, and a set of items - * - * Copyright (C) 2020 PolarPiBerry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import java.util.Set; -import java.util.HashSet; -import java.io.Serializable; -import java.util.Arrays; - -public class Packet implements Serializable { - String[] address; //Address stored in separate lines - double subtotal; - double shipping; - double total; - Set items; - - public Packet(String[] address, double subtotal, double shipping, double total) { - this.address = address; - this.subtotal = subtotal; - this.shipping = shipping; - this.total = total; - this.items = new HashSet(); - } - - public String toString() { - return "Address: " + Arrays.toString(this.address) + "\nSubtotal: " + this.subtotal + "\nShipping: " + this.shipping + "\nTotal: " + this.total + "\nItems: " + items; - } -} \ No newline at end of file diff --git a/Host/ThermalPrinterClient.class b/Host/ThermalPrinterClient.class deleted file mode 100644 index 1fa3377..0000000 Binary files a/Host/ThermalPrinterClient.class and /dev/null differ diff --git a/Host/ThermalPrinterClient.java b/Host/ThermalPrinterClient.java deleted file mode 100644 index 00e7295..0000000 --- a/Host/ThermalPrinterClient.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * ThermalPrinterClient.java - Main program to receive data from the Chrome - * extension and transmit it to a remote Raspberry Pi. Data is parsed as JSON, - * added to a Packet object, and sent via object serialization. The remote - * host is denoted by IP_ADDRESS.txt. - * - * Copyright (C) 2020 PolarPiBerry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * Data must sent to this program (through stdin) in a certain JSON format - * as below. Additionally, this program waits for four size bytes before - * reading in the data. - * - * { - * address: "ADDRESS FULL", - * total: "TOTAL COST", - * shipping: "SHIPPING COST", - * items: [[desc: "DESCRITPION", price: "PRICE", sku: "I-NO", qty: "QUANTITY"]] - * } -*/ - -import java.io.*; -import java.util.*; -import java.net.*; -import java.text.SimpleDateFormat; - -public class ThermalPrinterClient { - public static void main(String[] args) throws IOException, FileNotFoundException { - try { - //Read the data - DataInputStream stdin = new DataInputStream(System.in); - String raw = ""; //Buffer for the input data - boolean reading = true; - while (reading) { //Run until end of data - char inpt = (char)stdin.read(); //Get a character - if (inpt != 0) { //Check that it is valid - int len = (char)inpt & (char)stdin.read() << 8 & (char)stdin.read() << 16 & (char)stdin.read() << 24; //Read the length of the data to be read (not used in calculations) - char pinpt = '0'; //Previous input - while (reading) { //Loop until all data read - inpt = (char)stdin.read(); - reading = (pinpt != ']' || inpt != '}'); - raw += ""+inpt; - pinpt = inpt; - } - } - } - - //Parse the JSON - Packet packet = parseData(raw); - - - - //Generate a copy of the data - writeFileCopy(packet); - - //Get the IP address of the Raspberry Pi server - BufferedReader ip = new BufferedReader(new FileReader(new File("IP_ADDRESS.txt"))); //Read the IP address from the file - String ip_addr = ip.readLine(); - ip.close(); - - //Send the data - sendDataPacket(ip_addr, packet); - } catch (Exception e) { - try { - FileWriter outf = new FileWriter("error.txt"); - outf.write(e.toString()); - outf.close(); - } catch (Exception err) {} - - if (e instanceof ConnectException || e instanceof SocketTimeoutException) { - System.out.print("\u0003\u0000\u0000\u0000404"); //HTTP Error code (404 Not Found) - } else if (e instanceof IOException) { - System.out.print("\u0003\u0000\u0000\u0000400"); //HTTP Error code (400 Bad Request) - } else { - System.out.print("\u0003\u0000\u0000\u0000408"); //HTTP Error code (408 Request Timeout) - } - } - } - - public static void sendDataPacket(String ip_address, Packet pkt) throws IOException, SocketTimeoutException { - InetSocketAddress addr = new InetSocketAddress(ip_address,9321); //Custom port 9321 - //Open a socket connection to the printer - Socket conn = new Socket(); - conn.connect(addr,1000); //Custom port 9321 - timeout of 1000ms - ObjectOutputStream output = new ObjectOutputStream(conn.getOutputStream()); - output.writeObject(pkt); - System.out.print("\u0003\u0000\u0000\u0000200"); //HTTP Success code (200 OK) - output.close(); - conn.close(); - } - - public static void writeFileCopy(Packet pkt) throws IOException { //Write a copy of pkt to a file with the name of the SKUs of the items or the date if there are none - String fname = ""; - for (Item i : pkt.items) { - if (i.sku.length() > 1) { //More that just "I" - fname += i.sku + ","; - } - } - - if (fname.length() > 0) { //If there is data, trim the trailing comma - fname = fname.substring(0,fname.length()-1); - } else { - SimpleDateFormat date = new SimpleDateFormat("-yyyy-MM-dd_HH-mm-ss"); - fname = "I" + date.format(new Date()); - } - fname = "Receipts/" + ".json"; - - FileWriter outf = new FileWriter(fname); - outf.write(pkt.toString()); - outf.close(); - } - - public static Packet parseData(String raw) { //Parse the raw data into JSON and return as a Packet - //Get the JSON from the connection and store it in Maps and Sets - Map json = new TreeMap<>(); - Scanner jparse = new Scanner(raw); - jparse.useDelimiter("(\\{\"|\"\\}|\",\"|\":\")"); //Delimeter to be used for the first three lines - //Read the first three lines and add to the map - for (int i=0; i<3; i++) { //Basic data - address, etc. - String key = jparse.next(); - String value = jparse.next(); - cleanKey(key); - json.put(key, value); - } - - //Now parse the item data - jparse.useDelimiter("(\":\\[\\{\"|\"\\}\\]\\}|\",\"|\":\"|\"\\},\\{\"|\"\\}|\\{\")"); //Delimeter to be used for the first three lines - Set> items = new LinkedHashSet<>(); //Set of Maps to store the items - String label = jparse.next(); //Label - while (jparse.hasNext()) { //Loop until all items found - Map item = new TreeMap<>(); - for (int i=0; i<4; i++) { //Add the key/value pairs to the Map - String key = jparse.next(); - String value = jparse.next(); - cleanKey(key); //Remove extraneous characters - item.put(key, value); - } - items.add(item); - } - - //Parse float values of price, shipping, etc. - double shipping = java.lang.Double.parseDouble(json.get("shipping").substring(1)); - double subtotal = java.lang.Double.parseDouble(json.get("total").substring(1)); - double total = subtotal + shipping; - - String[] addr = json.get("address").split("/n/"); //Get the address in lines - - Packet output = new Packet(addr,subtotal,shipping,total); //Create a data packet - - for (Map item : items) { //Add the items to the data packet - int qty = java.lang.Integer.parseInt(item.get("qty")); - double price = java.lang.Double.parseDouble(item.get("price").substring(1)); - Item temp = new Item(item.get("desc"), item.get("sku"), qty, price); - output.items.add(temp); - } - - return output; - } - - public static void cleanKey(String key) { //Remove extraneous characters from the key (passed by reference - nothing to return) - key = key.replace("\"",""); - key = key.replace("\'",""); - key = key.replace("{",""); - key = key.replace("}",""); - key = key.replace("[",""); - key = key.replace("]",""); - } -} diff --git a/Host/installer.bat b/Host/installer.bat deleted file mode 100644 index 3117c34..0000000 --- a/Host/installer.bat +++ /dev/null @@ -1,4 +0,0 @@ -:: Installer for the host program for the Google Chrome extension - -:: Add to the current user in the registry -REG ADD "HKLM\Software\Google\Chrome\NativeMessagingHosts\com.polarpiberry.thermal.printer.system" /ve /t REG_SZ /d "%~dp0manifest.json" /f \ No newline at end of file diff --git a/Host/thermal_printer_subsystem.bat b/Host/thermal_printer_subsystem.bat deleted file mode 100644 index 84ce661..0000000 --- a/Host/thermal_printer_subsystem.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -java ThermalPrinterClient \ No newline at end of file diff --git a/Extension/COPYING b/PrinterPiExtension/COPYING similarity index 100% rename from Extension/COPYING rename to PrinterPiExtension/COPYING diff --git a/Extension/css/bootstrap.min.css b/PrinterPiExtension/css/bootstrap.min.css similarity index 100% rename from Extension/css/bootstrap.min.css rename to PrinterPiExtension/css/bootstrap.min.css diff --git a/Extension/css/bootstrap.min.css.map b/PrinterPiExtension/css/bootstrap.min.css.map similarity index 100% rename from Extension/css/bootstrap.min.css.map rename to PrinterPiExtension/css/bootstrap.min.css.map diff --git a/Extension/css/font-awesome.min.css b/PrinterPiExtension/css/font-awesome.min.css similarity index 100% rename from Extension/css/font-awesome.min.css rename to PrinterPiExtension/css/font-awesome.min.css diff --git a/Extension/css/style.css b/PrinterPiExtension/css/style.css similarity index 100% rename from Extension/css/style.css rename to PrinterPiExtension/css/style.css diff --git a/Extension/fonts/fontawesome-webfont.woff2 b/PrinterPiExtension/fonts/fontawesome-webfont.woff2 similarity index 100% rename from Extension/fonts/fontawesome-webfont.woff2 rename to PrinterPiExtension/fonts/fontawesome-webfont.woff2 diff --git a/Extension/js/background.js b/PrinterPiExtension/js/background.js similarity index 98% rename from Extension/js/background.js rename to PrinterPiExtension/js/background.js index 1846da8..c35b8bf 100644 --- a/Extension/js/background.js +++ b/PrinterPiExtension/js/background.js @@ -33,9 +33,9 @@ }); } chrome.runtime.sendMessage({ //Send the first data - address: address, + to: address, shipping: shipping, - total: total, + subtotal: total, items: item_arr }); } catch (TypeError) { @@ -62,9 +62,9 @@ var addr = addr_block[0].innerText + "\n" + addr_block[1].innerText; //Combine the name and address chrome.runtime.sendMessage({ //Send the first data - address: addr, + to: addr, shipping: shipping, - total: total + subtotal: total }); var items = trans_sub[0].getElementsByTagName("dd")[0].querySelectorAll(".item"); //Items section diff --git a/Extension/js/bootstrap.min.js b/PrinterPiExtension/js/bootstrap.min.js similarity index 100% rename from Extension/js/bootstrap.min.js rename to PrinterPiExtension/js/bootstrap.min.js diff --git a/Extension/js/bootstrap.min.js.map b/PrinterPiExtension/js/bootstrap.min.js.map similarity index 100% rename from Extension/js/bootstrap.min.js.map rename to PrinterPiExtension/js/bootstrap.min.js.map diff --git a/Extension/js/jquery.min.js b/PrinterPiExtension/js/jquery.min.js similarity index 100% rename from Extension/js/jquery.min.js rename to PrinterPiExtension/js/jquery.min.js diff --git a/Extension/js/main.js b/PrinterPiExtension/js/main.js similarity index 65% rename from Extension/js/main.js rename to PrinterPiExtension/js/main.js index c7bb892..ba8c3f8 100644 --- a/Extension/js/main.js +++ b/PrinterPiExtension/js/main.js @@ -20,10 +20,12 @@ /** * Data packet * @typedef {Object} Packet - * @property {string} address Address of the buyer + * @property {string} from Address of the seller + * @property {string} to Address of the buyer * @property {string} shipping Shipping paid by buyer - * @property {string} total Subtotal paid by buyer (not including shipping) + * @property {string} subtotal Subtotal paid by buyer (not including shipping) * @property {Array} items Items purchased + * @property {Array} messages Messages to print out at bottom of receipt */ /** @@ -35,29 +37,19 @@ * @property {string} qty Quantity purchased */ -let port = null; -let host_name = "com.polarpiberry.thermal.printer.system"; +/* + Data format to send to PrinterPi (NOTE: item descs and skus MUST NOT CONTAIN ~ and NO EXTRA SPACES ARE ALLOWED): -/** - * Connect to the local application and send the data on the page if the inputs are valid - * - * @function connectHost - */ -let connectHost = () => { - if (validateInputs()) { - port = chrome.runtime.connectNative(host_name); - let done_msg = document.getElementById("done-msg"); - port.onDisconnect.addListener(() => { - //done_msg.innerHTML = "Error while connecting to local messaging host."; //Default error message - //done_msg.classList = "text-danger"; - port = null; - }); - port.onMessage.addListener(onMessage); - done_msg.innerHTML = "Sending data..."; - done_msg.classList = "text-warning"; - sendData(); - } -} + To: Line1/n/Line2/n/Line3 + From: Line1/n/Line2/n/Line3 + Subtotal: $5.00 + Shipping: $3.00 + SaveFile: 1 + Item: Item_1~I123~1~$1.00 + Item: Item 2, And 3~I32-+A5~44~$1.00 + Message: Contact me at eikyutsuho@gmail.com if you have any questions/concerns/n/Thank you for your business! + +*/ /** * Read the data from the storage and show it on the page @@ -86,6 +78,59 @@ let setStorageData = () => { } } +/** + * Get the settings from memory + * + * @function getSettings + * @returns {Promise} Settings as a Promise + */ +let getSettings = () => { + return new Promise((resolve, reject) => { + chrome.storage.sync.get(["settings"], (data) => { + if (data && data.settings) { + resolve(data.settings); + } else { + reject("No settings"); + } + }); + }); +} + +/** + * Convert a Packet into a message + * + * @function convertToMessage + * @param {Packet} pkt Packet + * @returns {string} Message + */ +let convertToMessage = (pkt) => { + /* + Data format (NOTE: item descs and skus MUST NOT CONTAIN ~ or ` and NO EXTRA SPACES ARE ALLOWED. ` Signifies end of transmission): + + To: Line1/n/Line2/n/Line3 + From: Line1/n/Line2/n/Line3 + Subtotal: $5.00 + Shipping: $3.00 + Item: Item_1~I123~1~$1.00 + Item: Item 2, And 3~I32-+A5~44~$1.00 + Message: Contact me at eikyutsuho@gmail.com if you have any questions/concerns/n/Thank you for your business! + ` + */ + if (pkt.to != undefined && pkt.from != undefined && pkt.subtotal != undefined && pkt.shipping != undefined && pkt.messages != undefined && pkt.items != undefined) { + let msg = ""; + msg += "To: " + pkt.to.split("\n").join("/n/") + "\r\n"; + msg += "From: " + pkt.from.split("\n").join("/n/") + "\r\n"; + msg += "Subtotal: " + pkt.subtotal + "\r\n"; + msg += "Shipping: " + pkt.shipping + "\r\n"; + pkt.items.forEach((item) => msg += "Item: " + item.desc.replace("~", " ") + "~" + item.sku.replace("~", " ") + "~" + item.qty + "~" + item.price + "\r\n"); + msg += "Message: " + pkt.messages.split("\n").join("~") + "\r\n"; + msg += "`"; + return msg; + } else { + return null; + } +} + /** * Create the message from the data on the page and send it * @@ -93,28 +138,72 @@ let setStorageData = () => { */ let sendData = () => { let pkt = getData(); - pkt.address = pkt.address.split("\n").join("/n/"); //Replace newline characters with custom notation - if (port) { - port.postMessage(pkt); - } + let done_msg = document.getElementById("done-msg"); + done_msg.innerHTML = "Sending data..."; + done_msg.classList = "text-warning"; + getSettings().then((settings) => { + pkt = {...pkt, ...settings}; + let msg = convertToMessage(pkt); + if (msg) { + fetch("http://" + settings.ipAddress, { + method: "POST", + headers: { + "Content-Type": "text/plain", + }, + body: msg + }).then((res) => { + return res.json(); + }).then((res) => { + console.log(res); + if (res.success) { + if (settings.saveFiles == "Y") { + downloadFile(pkt, settings.saveFilesLocation); + } + done_msg.innerHTML = "Successfully sent data to the printer"; + done_msg.classList = "text-success"; + } else { + done_msg.innerHTML = "Error on the printer - possible lack of data or transmission error"; + done_msg.classList = "text-danger"; + } + }).catch((err) => { + console.log(err); + done_msg.innerHTML = "Error while sending data to the printer! Please try again, make sure the printer is on and the server is up, or contact the developer"; + done_msg.classList = "text-danger"; + }) + } else { + done_msg.innerHTML = "Please configure the printer settings in the Setting page below"; + done_msg.classList = "text-danger"; + } + }); } + /** - * Event handler for the message returned by the local host after data is sent + * Download the data Packet onto the user's OS * - * @function onMessage - * @param {string} msg Message - status code + * @param {Packet} pkt */ -let onMessage = (msg) => { - if (msg == "200") { - let done_msg = document.getElementById("done-msg"); - done_msg.innerHTML = "Successfully sent data to the printer."; - done_msg.classList = "text-success"; - } else { - let done_msg = document.getElementById("done-msg"); - done_msg.innerHTML = "Error while sending data to the printer! Please try again, make sure the printer is on and the server is up, or contact the developer. Code: " + msg; - done_msg.classList = "text-danger"; - } +let downloadFile = (pkt, filepath) => { + let blob = new Blob([JSON.stringify(pkt)], {type: "application/json"}); + let url = URL.createObjectURL(blob); + let item_skus = pkt.items.filter((item) => item.sku.length > 1); + let name; + if (item_skus.length > 1) { + name = item_skus.reduce((prev, curr, i) => { + return (i==1 ? prev.sku + "," + curr.sku : prev + "," + curr.sku); + }); + } else if (item_skus.length == 1) { + name = item_skus[0].sku + } else { + name = "Packing List"; + } + chrome.downloads.download({ + url: url, + filename: filepath + "/" + name + ".json", + saveAs: name=="Packing List" + }, () => { + console.log("Download complete"); + }) } /** @@ -139,8 +228,8 @@ let getData = () => { //Read the data from the HTML page } let pkt = { - address: document.getElementById("Address").value, - total: document.getElementById("Subtotal").value, + to: document.getElementById("Address").value, + subtotal: document.getElementById("Subtotal").value, shipping: document.getElementById("Shipping").value, items: items } @@ -154,9 +243,9 @@ let getData = () => { //Read the data from the HTML page * @param {Packet} pkt Data packet */ let setData = (pkt) => { - document.getElementById("Address").value = pkt.address; + document.getElementById("Address").value = pkt.to; document.getElementById('Shipping').value = pkt.shipping; - document.getElementById('Subtotal').value = pkt.total; + document.getElementById('Subtotal').value = pkt.subtotal; document.getElementById('items').innerHTML = ""; //Remove existing items pkt.items.forEach((item) => addItem(item)); } @@ -320,11 +409,17 @@ let addRowItems = () => { //Add an empty row to the table "items" document.getElementById("items").appendChild(ele); } +let showOptions = () => { + chrome.tabs.create({'url': "/options.html" } ); +} + + window.onload = () => { //Add event listeners - document.getElementById('run-button').addEventListener('click', connectHost); + document.getElementById('run-button').addEventListener('click', sendData); document.getElementById('save-button').addEventListener('click', setStorageData); document.getElementById('parse-button').addEventListener('click', () => chrome.extension.getBackgroundPage().chrome.tabs.executeScript(null, { file: './js/background.js' })); //Execute the background parsing script - document.getElementById("items-row-btn").addEventListener("click", addRowItems); + document.getElementById("items-row-btn").addEventListener("click", addRowItems); + document.getElementById("options-btn").addEventListener("click", showOptions); document.getElementById('Shipping').addEventListener("change", validateInputs); document.getElementById('Subtotal').addEventListener("change", validateInputs); document.getElementById('Address').addEventListener("change", validateInputs); @@ -336,9 +431,9 @@ chrome.runtime.onMessage.addListener((msg) => { //Listen for messages and set th document.getElementById("more-info").innerHTML = "Manual entry mode - not a valid page to parse"; //Show the error message } else { setData({ //Set the data packet - address: msg.address, + to: msg.to, shipping: msg.shipping, - total: msg.total, + subtotal: msg.subtotal, items: msg.items, }); validateInputs(); diff --git a/PrinterPiExtension/js/options.js b/PrinterPiExtension/js/options.js new file mode 100644 index 0000000..96076be --- /dev/null +++ b/PrinterPiExtension/js/options.js @@ -0,0 +1,170 @@ +/* + * options.js - Update the user settings + * + * Copyright (C) 2020 PolarPiBerry + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * Settings object + * @typedef {Object} Settings + * @property {string} ipAddress IP of printer + * @property {string} from Address of seller + * @property {string} messages Messages to add to receipt + * @property {boolean} saveFiles Save copies of receipts + * @property {string} saveFilesLocation Path to where to save copies of receipts + */ + +const DEFAULT_SETTINGS = { + ipAddress: "", + from: "", + saveFiles: "Y", + saveFilesLocation: "Receipts", + messages: ["Thank you for your business!"] +} + +/** + * Get the settings from storage + * + * @function getSettings + * @returns {Promise} Promise containing Settings object + */ +let getSettings = () => { //Get the options from memory + return new Promise((resolve, reject) => { + chrome.storage.sync.get(["settings"], (data) => { + if (!chrome.runtime.lastError) { + if (data.settings) { + resolve(data.settings); + } else { + reject("Settings not set"); + } + } else { + reject(chrome.runtime.lastError); + } + }); + }); +} + +/** + * Save the settings to memory + * + * @function saveSettings + * @param {Settings} settings + * @returns {Promise} Promise of status + */ +let saveSettings = (settings) => { + return new Promise((resolve, reject) => { + chrome.storage.sync.set({settings: settings}, () => { + if (!chrome.runtime.lastError) { + resolve(); + } else { + reject(chrome.runtime.lastError); + } + }); + }); +} + +/** + * Show the settings on the page + * + * @function displaySettings + * @param {Settings} settings + */ +let displaySettings = (settings) => { //Display the settings on the page + for (let key in settings) { + if (key == "saveFiles") { + console.log("#form-" + key + "-" + settings[key]) + document.querySelector("#form-" + key + "-" + settings[key]).checked = true; + onSaveFilesChange(settings[key] == "Y") + } else { + console.log(key); + document.querySelector("#form-" + key).value = settings[key]; + } + } +} + +/** + * Show the save file path box based on the status + * + * @function onSaveFilesChange + * @param {boolean} show Show or hide the box + */ +let onSaveFilesChange = (show) => { + if (show) { + document.querySelector("#form-saveFilesLocation-show").classList.remove("d-none"); + } else { + document.querySelector("#form-saveFilesLocation-show").classList.add("d-none"); + } +} + +/** + * Event handler for settings form submit - validate and save the new settings + * + * @function updateSettings + * @param {Object} e Event object + */ +let updateSettings = (e) => { + e.preventDefault(); + let data = {}; + let form_data = new FormData(e.target); + form_data.forEach((v, k) => data[k] = v); + if (validateSettings(data)) { + saveSettings(data).then(() => { + document.querySelector("#info-msg").innerHTML = "Settings updated"; + document.querySelector("#info-msg").classList = "text-info"; + }).catch((err) => { + document.querySelector("#info-msg").innerHTML = "Settings valid, but error while updating. Please try again."; + document.querySelector("#info-msg").classList = "text-danger"; + }) + } +} + +/** + * Validate the settings + * + * @function validateSettings + * @param {Settings} settings Settings object (see DEFAULT_SETTINGS) + * @returns {boolean} If settings are valid + */ +let validateSettings = (settings) => { + return (settings.from && settings.from.length > 0) + && (settings.ipAddress && settings.ipAddress.length > 0) + && (settings.messages && settings.messages.length > 0) + && ((settings.saveFiles == "Y" && (settings.saveFilesLocation && settings.saveFilesLocation.length > 0)) || (settings.saveFiles == "N")) +} + + + +window.onload = () => { //Add event listeners + document.querySelector("#settings-form").onsubmit = (e) => updateSettings(e); + document.querySelector("#form-saveFiles-Y").onchange = () => onSaveFilesChange(true); + document.querySelector("#form-saveFiles-N").onchange = () => onSaveFilesChange(false); + getSettings().then((settings) => { + if (validateSettings(settings)) { + document.querySelector("#info-msg").innerHTML = "Settings loaded and validated"; + document.querySelector("#info-msg").classList = "text-success"; + } else { + document.querySelector("#info-msg").innerHTML = "Settings loaded but invalid"; + document.querySelector("#info-msg").classList = "text-danger"; + } + console.log("Loaded data: ", settings); + displaySettings(settings); + }).catch((err) => { + console.log(err); + document.querySelector("#info-msg").innerHTML = "No settings saved. Please enter them below and press Save Settings"; + document.querySelector("#info-msg").classList = "text-danger"; + displaySettings(DEFAULT_SETTINGS); + }); +} diff --git a/Extension/js/popper.min.js b/PrinterPiExtension/js/popper.min.js similarity index 100% rename from Extension/js/popper.min.js rename to PrinterPiExtension/js/popper.min.js diff --git a/Extension/js/popper.min.js.map b/PrinterPiExtension/js/popper.min.js.map similarity index 100% rename from Extension/js/popper.min.js.map rename to PrinterPiExtension/js/popper.min.js.map diff --git a/Extension/logo128.png b/PrinterPiExtension/logo128.png similarity index 100% rename from Extension/logo128.png rename to PrinterPiExtension/logo128.png diff --git a/Extension/logo16.png b/PrinterPiExtension/logo16.png similarity index 100% rename from Extension/logo16.png rename to PrinterPiExtension/logo16.png diff --git a/Extension/logo256.png b/PrinterPiExtension/logo256.png similarity index 100% rename from Extension/logo256.png rename to PrinterPiExtension/logo256.png diff --git a/Extension/logo48.png b/PrinterPiExtension/logo48.png similarity index 100% rename from Extension/logo48.png rename to PrinterPiExtension/logo48.png diff --git a/Extension/main.html b/PrinterPiExtension/main.html similarity index 89% rename from Extension/main.html rename to PrinterPiExtension/main.html index 57e1e3a..a02a789 100644 --- a/Extension/main.html +++ b/PrinterPiExtension/main.html @@ -50,7 +50,13 @@
Items Purchased
-
+
+
+
+ +
+
+
diff --git a/PrinterPiExtension/manifest.json b/PrinterPiExtension/manifest.json new file mode 100644 index 0000000..049701a --- /dev/null +++ b/PrinterPiExtension/manifest.json @@ -0,0 +1,33 @@ +{ + "manifest_version": 2, + "name": "PrinterPi", + "version": "4.0", + "description": "Parse eBay Print Shipping Label or PayPal Activity pages and send the data to an application that controls a receipt printer", + + "options_page": "options.html", + + "icons": { + "16": "logo16.png", + "48": "logo48.png", + "128": "logo128.png", + "256": "logo256.png" + }, + + "browser_action": { + "default_popup": "main.html", + "default_logo": "logo256.png" + }, + + "background": { + "scripts": ["/js/background.js"], + "persistent": true + }, + + "permissions": [ + "tabs", + "storage", + "downloads", + "activeTab", + "http://*:9321/" + ] +} diff --git a/PrinterPiExtension/options.html b/PrinterPiExtension/options.html new file mode 100644 index 0000000..56b2776 --- /dev/null +++ b/PrinterPiExtension/options.html @@ -0,0 +1,56 @@ + + + + + + + +
+

PrinterPi Settings

+
+
Loading...
+
+
From Address
+ +
Receipt Message

(printed at bottom)

+ +
Printer IP Address
+ + + Please supply a valid IP address or domain name. An invalid IP/domain name will result in an error while connecting to the printer. + +
Save Receipts
+
+
+ +
+
+ +
+
+
+ + + Please do not supply absolute paths or use back-references (".."). These will result in an error + +
+
+
+ +
+
+ + + + + + diff --git a/Host/COPYING b/PrinterPiServer/COPYING similarity index 100% rename from Host/COPYING rename to PrinterPiServer/COPYING diff --git a/RPi Source/Hardware.java b/PrinterPiServer/Hardware.java similarity index 100% rename from RPi Source/Hardware.java rename to PrinterPiServer/Hardware.java diff --git a/RPi Source/Item.java b/PrinterPiServer/Item.java similarity index 94% rename from RPi Source/Item.java rename to PrinterPiServer/Item.java index 9ac236e..5f760d9 100644 --- a/RPi Source/Item.java +++ b/PrinterPiServer/Item.java @@ -20,9 +20,9 @@ import java.io.Serializable; public class Item implements Serializable { - String desc, sku; - double price; - int qty; + public String desc, sku; + public double price; + public int qty; public Item(String desc, String sku, int qty, double price) { this.desc = desc; diff --git a/RPi Source/Main.java b/PrinterPiServer/Main.java similarity index 100% rename from RPi Source/Main.java rename to PrinterPiServer/Main.java diff --git a/RPi Source/Packet.java b/PrinterPiServer/Packet.java similarity index 62% rename from RPi Source/Packet.java rename to PrinterPiServer/Packet.java index b91003c..f73fc48 100644 --- a/RPi Source/Packet.java +++ b/PrinterPiServer/Packet.java @@ -19,25 +19,26 @@ import java.util.Set; import java.util.HashSet; -import java.io.Serializable; import java.util.Arrays; -public class Packet implements Serializable { - String[] address; //Address stored in separate lines - double subtotal; - double shipping; - double total; - Set items; +public class Packet { + public String[] to; //Address stored in separate lines + public String[] from; + public double subtotal; + public double shipping; + public double total; + public Set items; + public String[] messages; - public Packet(String[] address, double subtotal, double shipping, double total) { - this.address = address; - this.subtotal = subtotal; - this.shipping = shipping; - this.total = total; + public Packet() { this.items = new HashSet(); } + public boolean isComplete() { //Check if the packet is complete + return to != null && from != null && total != 0 && this.items.size() != 0 && this.messages != null; + } + public String toString() { - return "Address: " + Arrays.toString(this.address) + "\nSubtotal: " + this.subtotal + "\nShipping: " + this.shipping + "\nTotal: " + this.total + "\nItems: " + items; + return "From: " + Arrays.toString(this.from) + "\nTo: " + Arrays.toString(this.to) + "\nSubtotal: " + this.subtotal + "\nShipping: " + this.shipping + "\nTotal: " + this.total + "\nItems: " + items; } } diff --git a/RPi Source/Pin.java b/PrinterPiServer/Pin.java similarity index 100% rename from RPi Source/Pin.java rename to PrinterPiServer/Pin.java diff --git a/RPi Source/Printer.java b/PrinterPiServer/Printer.java similarity index 92% rename from RPi Source/Printer.java rename to PrinterPiServer/Printer.java index a90251b..0d0c251 100644 --- a/RPi Source/Printer.java +++ b/PrinterPiServer/Printer.java @@ -88,26 +88,21 @@ public static void print(Packet packet) throws IOException { //String address, S write("Packing List"); cr();newline(); justify(0); -/* This section is optional - fill in the details and recompile if you would like it added style(0x88); //bold, underlined write("From:"); cr(); style(0x00); - write(" ADDR_LINE_1"); - cr(); - write(" ADDR_LINE_2"); - cr(); - write(" ADDR_LINE_3"); - cr(); - write(" ADDR_LINE_4"); - cr();newline(); -*/ + for (String line: packet.from) { + write(" "); + printSplitString(line, 4); + cr(); + } style(0x88); write("To:"); cr(); style(0x00); justify(0); - for (String line : packet.address) { + for (String line: packet.to) { write(" "); printSplitString(line, 4); cr(); @@ -125,7 +120,7 @@ public static void print(Packet packet) throws IOException { //String address, S cr();newline(); style(0x00); //Clear int c = 1; - for (Item item : packet.items) { + for (Item item: packet.items) { write(c + ". "); printSplitString(item.desc, 4); //Use helper function to make sure item description fits well cr(); @@ -133,7 +128,7 @@ public static void print(Packet packet) throws IOException { //String address, S cr(); newline(); c++; } - cr(); newline(); + cr();newline(); style(0x88); //Bold, underline write("Subtotal:"); style(0x00); //Clear @@ -152,9 +147,10 @@ public static void print(Packet packet) throws IOException { //String address, S cr(); write(" $" + String.format("%.2f",packet.total)); cr();newline(); - style(0x08); //Bold - write("Thank you for your business!"); - style(0x00); //Clear + for (String line: packet.messages) { + write(line); + cr();newline(); + } cut(); } diff --git a/PrinterPiServer/PrinterServer.java b/PrinterPiServer/PrinterServer.java new file mode 100644 index 0000000..c3e46fb --- /dev/null +++ b/PrinterPiServer/PrinterServer.java @@ -0,0 +1,156 @@ +/* + * PrinterServer.java - Manages the network port 9321, listening for incoming connections, and returns the data sent. + * + * Copyright (C) 2020 PolarPiBerry + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import java.io.*; +import java.net.*; +import java.util.*; +import java.lang.Integer; +import java.lang.Character; +import java.lang.Double; + +public class PrinterServer { + private ServerSocket serv; + + public PrinterServer() throws IOException { //Constructor + serv = new ServerSocket(9321); //Create the server + } + + public void close() throws IOException { //Destructor + serv.close(); + } + + public Packet getPacket() { //Waits until client connects and return a Packet object of the data (or null if failed) + try { //Overall try-catch to prevent exceptions in client - writes to log file instead + Socket client = serv.accept(); //Wait until there is a connection + client.setSoTimeout(1000); //Set the timeout to 1000ms + System.out.println("(PrinterServer) -INFO- Connection received"); + + BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream())); + PrintWriter out = new PrintWriter(client.getOutputStream()); + + String response; //Response to request + + String method = in.readLine(); + int dataLen = 0; + if (method.startsWith("POST")) { //Only accept POST requests + String header; + while ((header = in.readLine()) != null && header.length() > 0) { //Read newlines until the end of input or until there is no data + String headerName = header.substring(0, header.indexOf(":")).toLowerCase(); + String headerContent = header.substring(header.indexOf(":")+2).toLowerCase(); + switch (headerName) { + case "content-length": + dataLen = Integer.parseInt(headerContent); + System.out.println("(PrinterServer) -INFO- Data length to read: " + dataLen); + break; + default: + System.out.println("(PrinterServer) -INFO- Unused header: " + header); + } + } + } else { + response = "HTTP/1.0 400 Bad Request\r\nContent-Type: application/json\r\n\r\n{\"success\":false,\"error\":\"Method type must be POST\"}\r\n"; + out.print(response); + out.flush(); + client.close(); + return null; + } + + + + /* + Data format (NOTE: item descs and skus MUST NOT CONTAIN ~ or ` and NO EXTRA SPACES ARE ALLOWED. ` signifies end of transmission): + + To: Line1/n/Line2/n/Line3 + From: Line1/n/Line2/n/Line3 + Subtotal: $5.00 + Shipping: $3.00 + SaveFile: 1 + Item: Item_1~I123~1~$1.00 + Item: Item 2, And 3~I32-+A5~44~$1.00 + Message: Contact me at eikyutsuho@gmail.com if you have any questions/concerns/n/Thank you for your business! + ` + */ + + //Parse the data Packet + Packet pkt = new Packet(); + try { + int i = 0; + String body = ""; //Body of request + char curr; + while ((i++) < dataLen && (curr = (char)in.read()) != '`') { + body = body + Character.toString(curr); + } + String[] params = body.split("\n"); + for (i=0; i - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/RPi Source/PrinterServer.java b/RPi Source/PrinterServer.java deleted file mode 100644 index e2d3cca..0000000 --- a/RPi Source/PrinterServer.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * PrinterServer.java - Manages the network port 9321, listening for incoming connections, and returns the data sent. - * - * Copyright (C) 2020 PolarPiBerry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -import java.io.*; -import java.net.*; -import java.util.*; -import java.lang.Integer; -import java.lang.Double; - -public class PrinterServer { - private ServerSocket serv; - - public PrinterServer() throws IOException { //Constructor - serv = new ServerSocket(9321); //Create the server - } - - public void close() throws IOException { //Destructor - serv.close(); - } - - public Packet getPacket() { //Waits until client connects and return a Packet object of the data (or null if failed) - try { //Overall try-catch to prevent exceptions in client - writes to log file instead - Socket client = serv.accept(); //Wait until there is a connection - client.setSoTimeout(1000); //Set the timeout to 1000ms - - ObjectInputStream netin = new ObjectInputStream(client.getInputStream()); - Packet recv = (Packet) netin.readObject(); - netin.close(); - client.close(); - return recv; - } catch (Exception e) { - System.out.println("(PrinterServer.java) -ERROR- Error while receiving and/or processing data. " + e.toString()); - } - return null; - } -} diff --git a/RPi Source/power_button.sh b/RPi Source/power_button.sh deleted file mode 100644 index cb0e850..0000000 --- a/RPi Source/power_button.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# -# power_button.sh - Script to monitor power button (GPIO2) and shutdown if pressed. -# Also controls LED to indicate shutdown (GPIO4) -# -# Copyright (C) 2020 PolarPiBerry -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -echo "2" > /sys/class/gpio/export -echo "in" > /sys/class/gpio/gpio2/direction - -echo "4" > /sys/class/gpio/export -echo "out" > /sys/class/gpio/gpio4/direction - -echo "1" > /sys/class/gpio/gpio4/value; -sleep 3; -echo "0" > /sys/class/gpio/gpio4/value; - -sleep 20; #Wait at least 20 seconds before taking affect - -while true; do - state=`cat /sys/class/gpio/gpio2/value`; - if [ $state = "0" ]; then - echo "1" > /sys/class/gpio/gpio4/value; - sleep 3; - state=`cat /sys/class/gpio/gpio2/value`; - if [ $state = "0" ]; then - echo "Shutting down now" - sudo shutdown -h now - fi - fi - sleep 1; -done; - -