diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51b05b1..65884cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: python -m PyInstaller epson_print_conf.spec -- --default - name: Generate Changelog - run: echo "This executable is auto-generated by a GitHub Action" > ${{ github.workspace }}-CHANGELOG.txt + run: echo "Note: the executable file in the assets below is auto-generated by a GitHub Action." > ${{ github.workspace }}-CHANGELOG.txt - name: Create Release uses: softprops/action-gh-release@v2 diff --git a/README.md b/README.md index c43b1d9..5d72125 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,9 @@ ui.py [-h] [-P PICKLE_FILE] [-O] optional arguments: -h, --help show this help message and exit -P PICKLE_FILE, --pickle PICKLE_FILE - Save a pickle archive for subsequent load by ui.py and epson_print_conf.py - -O, --override Override the default configuration with the one of the pickle file instead of merging + Load a pickle configuration archive saved by parse_devices.py + -O, --override Replace the default configuration with the one in the pickle file instead of merging (default + is to merge) epson_print_conf GUI ``` @@ -78,9 +79,11 @@ epson_print_conf GUI ### Using the command-line tool ``` -epson_print_conf.py [-h] -m MODEL -a HOSTNAME [-p PORT] [-i] [-q QUERY_NAME] [--reset_waste_ink] [-d] [--write-first-ti-received-time YEAR MONTH DAY] - [--write-poweroff-timer MINUTES] [--dry-run] [-R ADDRESS_SET] [-W ADDRESS_VALUE_SET] [-e FIRST_ADDRESS LAST_ADDRESS] [--detect-key] - [-S SEQUENCE_STRING] [-t TIMEOUT] [-r RETRIES] [-c CONFIG_FILE] [--simdata SIMDATA_FILE] [-P PICKLE_FILE] [-O] +epson_print_conf.py [-h] -m MODEL -a HOSTNAME [-p PORT] [-i] [-q QUERY_NAME] [--reset_waste_ink] [-d] + [--write-first-ti-received-time YEAR MONTH DAY] [--write-poweroff-timer MINUTES] + [--dry-run] [-R ADDRESS_SET] [-W ADDRESS_VALUE_SET] [-e FIRST_ADDRESS LAST_ADDRESS] + [--detect-key] [-S SEQUENCE_STRING] [-t TIMEOUT] [-r RETRIES] [-c CONFIG_FILE] + [--simdata SIMDATA_FILE] [-P PICKLE_FILE] [-O] optional arguments: -h, --help show this help message and exit @@ -113,12 +116,14 @@ optional arguments: -r RETRIES, --retries RETRIES SNMP GET retries (floating point argument) -c CONFIG_FILE, --config CONFIG_FILE - read a configuration file including the full log dump of a previous operation with '-d' flag (instead of accessing the printer via SNMP) + read a configuration file including the full log dump of a previous operation with '-d' flag + (instead of accessing the printer via SNMP) --simdata SIMDATA_FILE write SNMP dictionary map to simdata file -P PICKLE_FILE, --pickle PICKLE_FILE - Load a pickle configuration archive - -O, --override Override the default configuration with the one of the pickle file instead of merging + Load a pickle configuration archive saved by parse_devices.py + -O, --override Replace the default configuration with the one in the pickle file instead of merging (default + is to merge) Epson Printer Configuration via SNMP (TCP/IP) ``` diff --git a/epson_print_conf.py b/epson_print_conf.py index 9367a5a..e28393b 100644 --- a/epson_print_conf.py +++ b/epson_print_conf.py @@ -2203,7 +2203,7 @@ if __name__ == "__main__": "--pickle", dest='pickle', type=argparse.FileType('rb'), - help="Load a pickle configuration archive", + help="Load a pickle configuration archive saved by parse_devices.py", default=None, nargs=1, metavar='PICKLE_FILE' @@ -2213,8 +2213,8 @@ if __name__ == "__main__": "--override", dest='override', action='store_true', - help="Override the default configuration with the one of the pickle " - "file instead of merging", + help="Replace the default configuration with the one in the pickle " + "file instead of merging (default is to merge)", ) args = parser.parse_args() diff --git a/ui.py b/ui.py index b4cbaf2..0d520e9 100644 --- a/ui.py +++ b/ui.py @@ -894,7 +894,7 @@ if __name__ == "__main__": "--pickle", dest='pickle', type=argparse.FileType('rb'), - help="Save a pickle archive for subsequent load by ui.py and epson_print_conf.py", + help="Load a pickle configuration archive saved by parse_devices.py", default=None, nargs=1, metavar='PICKLE_FILE' @@ -904,8 +904,8 @@ if __name__ == "__main__": "--override", dest='override', action='store_true', - help="Override the default configuration with the one of the pickle " - "file instead of merging", + help="Replace the default configuration with the one in the pickle " + "file instead of merging (default is to merge)", ) args = parser.parse_args() conf_dict = {}