it would be nice to have a copy or move function as an archive option.

.gitignore

@@ -2,3 +2,4 @@ __pycache__
 venv
 .DS_Store
 .vscode
+src/plotman.egg-info

README.md

@@ -147,6 +147,25 @@ archive jobs initiated.  This is the one part of the interactive tool which is
 stateful.  There is no permanent record of these executed command lines, so if
 you start a new interactive plotman session, this log is empty.
 
+## `plotman` commands
+To get a complete list of all available commands run: 
+```shell
+plotman -h
+```
+
+You can also use `plotman <command> -h` to get help about a specific command, like 
+```shell
+plotman interactive -h
+```
+
+## Running `plotman` as a daemon
+> _PS: this section assumes that you have already configured `plotman.yaml`._
+
+By default the command `plotman plot` will start the plotting job and continue to run on the foregroud as long as you keep the terminal window open. If you want to have it constantly running, try the following:
+```shell
+nohup plotman plot >> ~/plotman.log 2>&1 &
+```
+
 ## Limitations and Issues
 
 The system is tested on Linux only.  Plotman should be generalizable to other
@@ -203,6 +222,22 @@ Installation for Linux and macOS:
 4. That's it! You can now run Plotman by typing `plotman version` to verify its version.
    Run `plotman --help` to learn about the available commands.
 
+*Note:* If you see `ModuleNotFoundError: No module named 'readline'` when using `plotman` on [RHEL based linux](https://github.com/ericaltendorf/plotman/issues/195) after installing using [chia's guide](https://github.com/Chia-Network/chia-blockchain/wiki/INSTALL#centos--red-hat--fedora), install `readline-devel` then reinstall chia starting at compiling python in a new build environment; or consider using a project like `pyenv`.
+
+## Basic Usage:
+
+1. Install
+
+2. Generate initial config
+
+3. Configure (default location can be found with `plotman config path`). Options explained in the default config file (step 2)
+
+4. Create log directory specified in `directories: { log: "" }`
+
+5. Start plotman: `plotman plot` or `plotman interactive`
+
+6. Check status: `plotman status`
+
 ### Development note:
 
 If you are forking Plotman, simply replace the installation step with `pip install --editable .[dev]` from the project root directory to install *your* version of plotman with test and development extras.

VERSION

@@ -1 +1 @@
-0.3.1
+0.3.1+dev

src/plotman/__main__.py

@@ -4,7 +4,7 @@
 
 
 """Plotman module launcher.
-This is a shim that allows you to run plotman via 
+This is a shim that allows you to run plotman via
     python3 -m plotman
 """
 plotman.main()

src/plotman/_tests/configuration_test.py

@@ -18,7 +18,6 @@ def test_get_validated_configs__default(config_text):
     res = configuration.get_validated_configs(config_text, '')
     assert isinstance(res, configuration.PlotmanConfig)
 
-
 def test_get_validated_configs__malformed(config_text):
     """Check that get_validated_configs() raises exception with invalid plotman.yaml contents."""
     loaded_yaml = yaml.load(config_text, Loader=yaml.SafeLoader)
@@ -54,3 +53,33 @@ def test_loads_without_user_interface(config_text):
     reloaded_yaml = configuration.get_validated_configs(stripped_config_text, '')
 
     assert reloaded_yaml.user_interface == configuration.UserInterface()
+
+
+def test_get_dst_directories_gets_dst():
+    tmp = ['/tmp']
+    dst = ['/dst0', '/dst1']
+    directories = configuration.Directories(log='', tmp=tmp, dst=dst)
+
+    assert directories.get_dst_directories() == dst
+
+
+def test_get_dst_directories_gets_tmp():
+    tmp = ['/tmp']
+    directories = configuration.Directories(log='', tmp=tmp)
+
+    assert directories.get_dst_directories() == tmp
+
+
+def test_dst_is_dst():
+    tmp = ['/tmp']
+    dst = ['/dst0', '/dst1']
+    directories = configuration.Directories(log='', tmp=tmp, dst=dst)
+
+    assert not directories.dst_is_tmp()
+
+
+def test_dst_is_tmp():
+    tmp = ['/tmp']
+    directories = configuration.Directories(log='', tmp=tmp)
+
+    assert directories.dst_is_tmp()

src/plotman/_tests/manager_test.py

@@ -85,7 +85,7 @@ def test_dstdirs_to_furthest_phase():
             { '/plots1' : (1, 5),
               '/plots2' : (3, 1),
               '/plots3' : (4, 1) } )
-           
+
 
 def test_dstdirs_to_youngest_phase():
     all_jobs = [ job_w_dstdir_phase('/plots1', (1, 5)),

src/plotman/_tests/plot_util_test.py

@@ -10,7 +10,10 @@ def test_human_format():
     assert (plot_util.human_format(3442000000, 0) == '3G')
     assert (plot_util.human_format(3542000, 2) == '3.54M')
     assert (plot_util.human_format(354, 0) == '354')
+    assert (plot_util.human_format(354, 0, True) == '354')
     assert (plot_util.human_format(354, 2) == '354.00')
+    assert (plot_util.human_format(422399296143, 2) == '422.40G')
+    assert (plot_util.human_format(422399296143, 2, True) == '393.39Gi')
 
 def test_time_format():
     assert (plot_util.time_format(34) == '34s')
@@ -54,3 +57,10 @@ def test_list_k32_plots(fs: pyfakefs.fake_filesystem.FakeFilesystem):
             [ '/t/plot-k32-0.plot',
               '/t/plot-k32-1.plot',
               '/t/plot-k32-5.plot' ] )
+
+
+def test_get_plotsize():
+    assert (
+        [659272492, 107287518791, 221143636517, 455373353413, 936816632588]
+        == [plot_util.get_plotsize(n) for n in [25, 32, 33, 34, 35]]
+    )

src/plotman/archive.py

@@ -2,6 +2,7 @@
 import contextlib
 import math
 import os
+import posixpath
 import random
 import re
 import subprocess
@@ -16,16 +17,16 @@
 # TODO : write-protect and delete-protect archived plots
 
 def spawn_archive_process(dir_cfg, all_jobs):
-    '''Spawns a new archive process using the command created 
+    '''Spawns a new archive process using the command created
     in the archive() function. Returns archiving status and a log message to print.'''
 
     log_message = None
     archiving_status = None
-    
+
     # Look for running archive jobs.  Be robust to finding more than one
     # even though the scheduler should only run one at a time.
     arch_jobs = get_running_archive_jobs(dir_cfg.archive)
-    
+
     if not arch_jobs:
         (should_start, status_or_cmd) = archive(dir_cfg, all_jobs)
         if not should_start:
@@ -37,7 +38,7 @@ def spawn_archive_process(dir_cfg, all_jobs):
                     shell=True,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.STDOUT,
-                    start_new_session=True) 
+                    start_new_session=True)
             log_message = 'Starting archive: ' + cmd
             # At least for now it seems that even if we get a new running
             # archive jobs list it doesn't contain the new rsync process.
@@ -51,7 +52,7 @@ def spawn_archive_process(dir_cfg, all_jobs):
         archiving_status = 'pid: ' + ', '.join(map(str, arch_jobs))
 
     return archiving_status, log_message
-            
+
 def compute_priority(phase, gb_free, n_plots):
     # All these values are designed around dst buffer dirs of about
     # ~2TB size and containing k32 plots.  TODO: Generalize, and
@@ -71,7 +72,7 @@ def compute_priority(phase, gb_free, n_plots):
             priority -= 16
         elif (phase >= job.Phase(3, 7)):
             priority -= 32
-        
+
     # If a drive is getting full, we should prioritize it
     if (gb_free < 1000):
         priority += 1 + int((1000 - gb_free) / 100)
@@ -87,7 +88,7 @@ def compute_priority(phase, gb_free, n_plots):
 def get_archdir_freebytes(arch_cfg):
     archdir_freebytes = {}
     df_cmd = ('ssh %s@%s df -aBK | grep " %s/"' %
-        (arch_cfg.rsyncd_user, arch_cfg.rsyncd_host, arch_cfg.rsyncd_path) )
+        (arch_cfg.rsyncd_user, arch_cfg.rsyncd_host, posixpath.normpath(arch_cfg.rsyncd_path)) )
     with subprocess.Popen(df_cmd, shell=True, stdout=subprocess.PIPE) as proc:
         for line in proc.stdout.readlines():
             fields = line.split()
@@ -124,7 +125,7 @@ def get_running_archive_jobs(arch_cfg):
 
 def archive(dir_cfg, all_jobs):
     '''Configure one archive job.  Needs to know all jobs so it can avoid IO
-    contention on the plotting dstdir drives.  Returns either (False, <reason>) 
+    contention on the plotting dstdir drives.  Returns either (False, <reason>)
     if we should not execute an archive job or (True, <cmd>) with the archive
     command if we should.'''
     if dir_cfg.archive is None:
@@ -133,13 +134,13 @@ def archive(dir_cfg, all_jobs):
     dir2ph = manager.dstdirs_to_furthest_phase(all_jobs)
     best_priority = -100000000
     chosen_plot = None
-
-    for d in dir_cfg.dst:
+    dst_dir = dir_cfg.get_dst_directories()
+    for d in dst_dir:
         ph = dir2ph.get(d, job.Phase(0, 0))
         dir_plots = plot_util.list_k32_plots(d)
         gb_free = plot_util.df_b(d) / plot_util.GB
         n_plots = len(dir_plots)
-        priority = compute_priority(ph, gb_free, n_plots) 
+        priority = compute_priority(ph, gb_free, n_plots)
         if priority >= best_priority and dir_plots:
             best_priority = priority
             chosen_plot = dir_plots[0]
@@ -156,17 +157,17 @@ def archive(dir_cfg, all_jobs):
     archdir_freebytes = get_archdir_freebytes(dir_cfg.archive)
     if not archdir_freebytes:
         return(False, 'No free archive dirs found.')
-    
+
     archdir = ''
-    available = [(d, space) for (d, space) in archdir_freebytes.items() if 
+    available = [(d, space) for (d, space) in archdir_freebytes.items() if
                  space > 1.2 * plot_util.get_k32_plotsize()]
     if len(available) > 0:
         index = min(dir_cfg.archive.index, len(available) - 1)
         (archdir, freespace) = sorted(available)[index]
 
     if not archdir:
         return(False, 'No archive directories found with enough free space')
-    
+
     msg = 'Found %s with ~%d GB free' % (archdir, freespace / plot_util.GB)
 
     bwlimit = dir_cfg.archive.rsyncd_bwlimit

src/plotman/chia.py

@@ -32,8 +32,8 @@ def latest_command(self):
 
 @commands.register(version=(1, 1, 2))
 @click.command()
-# https://github.com/Chia-Network/chia-blockchain/blob/v1.1.2/LICENSE
-# https://github.com/Chia-Network/chia-blockchain/blob/v1.1.2/chia/cmds/plots.py#L39-L83
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.2/LICENSE
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.2/chia/cmds/plots.py#L39-L83
 # start copied code
 @click.option("-k", "--size", help="Plot size", type=int, default=32, show_default=True)
 @click.option("--override-k", help="Force size smaller than 32", default=False, show_default=True, is_flag=True)
@@ -87,8 +87,8 @@ def _cli():
 
 @commands.register(version=(1, 1, 3))
 @click.command()
-# https://github.com/Chia-Network/chia-blockchain/blob/v1.1.3/LICENSE
-# https://github.com/Chia-Network/chia-blockchain/blob/v1.1.3/chia/cmds/plots.py#L39-L83
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.3/LICENSE
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.3/chia/cmds/plots.py#L39-L83
 # start copied code
 @click.option("-k", "--size", help="Plot size", type=int, default=32, show_default=True)
 @click.option("--override-k", help="Force size smaller than 32", default=False, show_default=True, is_flag=True)
@@ -138,3 +138,113 @@ def _cli():
 # end copied code
 def _cli():
     pass
+
+
+@commands.register(version=(1, 1, 4))
+@click.command()
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.4/LICENSE
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.4/chia/cmds/plots.py#L39-L83
+# start copied code
+@click.option("-k", "--size", help="Plot size", type=int, default=32, show_default=True)
+@click.option("--override-k", help="Force size smaller than 32", default=False, show_default=True, is_flag=True)
+@click.option("-n", "--num", help="Number of plots or challenges", type=int, default=1, show_default=True)
+@click.option("-b", "--buffer", help="Megabytes for sort/plot buffer", type=int, default=3389, show_default=True)
+@click.option("-r", "--num_threads", help="Number of threads to use", type=int, default=2, show_default=True)
+@click.option("-u", "--buckets", help="Number of buckets", type=int, default=128, show_default=True)
+@click.option(
+    "-a",
+    "--alt_fingerprint",
+    type=int,
+    default=None,
+    help="Enter the alternative fingerprint of the key you want to use",
+)
+@click.option(
+    "-c",
+    "--pool_contract_address",
+    type=str,
+    default=None,
+    help="Address of where the pool reward will be sent to. Only used if alt_fingerprint and pool public key are None",
+)
+@click.option("-f", "--farmer_public_key", help="Hex farmer public key", type=str, default=None)
+@click.option("-p", "--pool_public_key", help="Hex public key of pool", type=str, default=None)
+@click.option(
+    "-t",
+    "--tmp_dir",
+    help="Temporary directory for plotting files",
+    type=click.Path(),
+    default=Path("."),
+    show_default=True,
+)
+@click.option("-2", "--tmp2_dir", help="Second temporary directory for plotting files", type=click.Path(), default=None)
+@click.option(
+    "-d",
+    "--final_dir",
+    help="Final directory for plots (relative or absolute)",
+    type=click.Path(),
+    default=Path("."),
+    show_default=True,
+)
+@click.option("-i", "--plotid", help="PlotID in hex for reproducing plots (debugging only)", type=str, default=None)
+@click.option("-m", "--memo", help="Memo in hex for reproducing plots (debugging only)", type=str, default=None)
+@click.option("-e", "--nobitfield", help="Disable bitfield", default=False, is_flag=True)
+@click.option(
+    "-x", "--exclude_final_dir", help="Skips adding [final dir] to harvester for farming", default=False, is_flag=True
+)
+# end copied code
+def _cli():
+    pass
+
+
+@commands.register(version=(1, 1, 5))
+@click.command()
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.5/LICENSE
+# https://github.com/Chia-Network/chia-blockchain/blob/1.1.5/chia/cmds/plots.py#L39-L83
+# start copied code
+@click.option("-k", "--size", help="Plot size", type=int, default=32, show_default=True)
+@click.option("--override-k", help="Force size smaller than 32", default=False, show_default=True, is_flag=True)
+@click.option("-n", "--num", help="Number of plots or challenges", type=int, default=1, show_default=True)
+@click.option("-b", "--buffer", help="Megabytes for sort/plot buffer", type=int, default=3389, show_default=True)
+@click.option("-r", "--num_threads", help="Number of threads to use", type=int, default=2, show_default=True)
+@click.option("-u", "--buckets", help="Number of buckets", type=int, default=128, show_default=True)
+@click.option(
+    "-a",
+    "--alt_fingerprint",
+    type=int,
+    default=None,
+    help="Enter the alternative fingerprint of the key you want to use",
+)
+@click.option(
+    "-c",
+    "--pool_contract_address",
+    type=str,
+    default=None,
+    help="Address of where the pool reward will be sent to. Only used if alt_fingerprint and pool public key are None",
+)
+@click.option("-f", "--farmer_public_key", help="Hex farmer public key", type=str, default=None)
+@click.option("-p", "--pool_public_key", help="Hex public key of pool", type=str, default=None)
+@click.option(
+    "-t",
+    "--tmp_dir",
+    help="Temporary directory for plotting files",
+    type=click.Path(),
+    default=Path("."),
+    show_default=True,
+)
+@click.option("-2", "--tmp2_dir", help="Second temporary directory for plotting files", type=click.Path(), default=None)
+@click.option(
+    "-d",
+    "--final_dir",
+    help="Final directory for plots (relative or absolute)",
+    type=click.Path(),
+    default=Path("."),
+    show_default=True,
+)
+@click.option("-i", "--plotid", help="PlotID in hex for reproducing plots (debugging only)", type=str, default=None)
+@click.option("-m", "--memo", help="Memo in hex for reproducing plots (debugging only)", type=str, default=None)
+@click.option("-e", "--nobitfield", help="Disable bitfield", default=False, is_flag=True)
+@click.option(
+    "-x", "--exclude_final_dir", help="Skips adding [final dir] to harvester for farming", default=False, is_flag=True
+)
+# end copied code
+def _cli():
+    pass