From e9bbfeca52d0c2d4d04709f01858e37b3e0602b7 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Tue, 3 May 2022 06:34:19 -0700 Subject: [PATCH] Fixed metavars to be consistent, #645 --- README.md | 11 ++++------- osxphotos/cli/common.py | 2 +- osxphotos/cli/export.py | 6 +++--- osxphotos/docs/docs.zip | Bin 1167537 -> 1167537 bytes 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 36a2d80b..100eba83 100644 --- a/README.md +++ b/README.md @@ -630,7 +630,7 @@ Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST modify this behavior. Options: - --db Specify Photos database path. Path to Photos + --db PHOTOS_LIBRARY_PATH Specify Photos database path. Path to Photos library/database can be specified using either --db or directly as PHOTOS_LIBRARY positional argument. If neither --db or PHOTOS_LIBRARY @@ -1138,8 +1138,7 @@ Options: iTerm2 (use with Terminal.app). This is faster and more reliable than the default AppleScript interface. - --report - Write a CSV formatted report of all files that + --report REPORT_FILE Write a CSV formatted report of all files that were exported. --cleanup Cleanup export directory by deleting any files which were not included in this export set. @@ -1229,8 +1228,7 @@ Options: not the system volume, osxphotos may run faster if you specify a temporary directory on the same volume as the Photos library. - --load-config - Load options from file as written with --save- + --load-config CONFIG_FILE Load options from file as written with --save- config. This allows you to save a complex export command to file for later reuse. For example: 'osxphotos export - Save options to file for use with --load- + --save-config CONFIG_FILE Save options to file for use with --load- config. File format is TOML. See also --config-only. --config-only If specified, saves the config file but does diff --git a/osxphotos/cli/common.py b/osxphotos/cli/common.py index 2f4bff17..6cc59c12 100644 --- a/osxphotos/cli/common.py +++ b/osxphotos/cli/common.py @@ -92,7 +92,7 @@ VERSION_CHECK_OPTION = click.option("--no-version-check", required=False, is_fla DB_OPTION = click.option( "--db", required=False, - metavar="", + metavar="PHOTOS_LIBRARY_PATH", default=None, help=( "Specify Photos database path. " diff --git a/osxphotos/cli/export.py b/osxphotos/cli/export.py index ac059ff9..eeef3c5f 100644 --- a/osxphotos/cli/export.py +++ b/osxphotos/cli/export.py @@ -505,7 +505,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print ) @click.option( "--report", - metavar="", + metavar="REPORT_FILE", help="Write a CSV formatted report of all files that were exported.", type=click.Path(), ) @@ -600,7 +600,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print @click.option( "--load-config", required=False, - metavar="", + metavar="CONFIG_FILE", default=None, help=( "Load options from file as written with --save-config. " @@ -615,7 +615,7 @@ from .verbose import get_verbose_console, time_stamp, verbose_print @click.option( "--save-config", required=False, - metavar="", + metavar="CONFIG_FILE", default=None, help="Save options to file for use with --load-config. File format is TOML. " "See also --config-only.", diff --git a/osxphotos/docs/docs.zip b/osxphotos/docs/docs.zip index 3ab5f7348eb52b04ab373b274b2f2716d7297dd7..36dc8fc2e38bccdc1d8033cabb144873b1f22939 100644 GIT binary patch delta 1116 zcmYjOX-HI26z0vn@68*X?KCcsTB2x{VmS(vmlLVp@Mv$4AB^hERBpLQ+z$nv* zrzX)@f`Jm!)D6ltY;i$LF~p_iPaqZ&l|}vNzB4-Z<6J(zbI$jjb8eS2v&)%zJ%@aV zzgwRdt-TRlUf3L6-c|d#nkdob56@mI%0)0UQDs%ZqkLh5mU2+Ys6Dy(8jHg=A~4&CrYiiVU9hm}Z<^vD!pqqnGilV4i0J}0 z=T9ar$hjiP&y9#WZN%V>sM}5q>ky5Wkf8O5zFa1u{wh)|&16$+QJ2jgCfnp+cO6-bZTQLaPO0>L_DJd}*?l@>>)t&OmyP zHmTcX1<~9H^;XKAbee?M;ynA5PE!Slt1K1w+A-DLFUDhve*s(W7qd--H?zz)Vv3;rX_PFi>8;pAP*I&IML9PmJ|Qi< zCia~eavo7$wv?+wxemKz^~k-qOL0b&^Eob+gebI_%hfp~KN)M=>!cV@?R=f|eGd0# zQ>V3-MKZ^?UCfswv<-Y0b+dp&@^n1X%U9(vZM}LTPKRETmrS_2-)*^!qOzk^4qsJv zxLRc%Iv!p;yqT+2KVig%+Ah7peYNHn`q%!bT|BRk^jJ2|>nps~QipLt&%?mO$iu{p z3uaRQdIgK%@nYE`eDp$ks~I-q2|~0Vex;Aj_TXfj}0~3pMV~?&yPL53lI@p%=@C`ymzS z@&O2DG5jIO=M2J*HID<&xyRE%_`0I?5_YXM>0d#E2IqAS!FIwwMsad)WPT4pJmG(W zjA9#xgQ(s%4BI@zuwTPq7O>oV6cSejg4u~tm~|UwjQv-S3N2%h;8DQdA7hZ@u|g(i Ld}W*~;}HH2GZLgm delta 1112 zcmYjPTS!z<6y?r2_c3~BoZXBGX%t11)tIGWlx0b!nMpB?MiF!~i)u&t)T`_Lc?6vS3AXUw4&{-5apEFK?8bDy=)u4PK>6zk+6! z@2Zr>=Tc9D0PDk&$4LcP%3E(qRd%yplO2(GcEonbi|mI3wjCo`^;K|lzl-cw5qyD^AoT2wc$ZPI^xtn|V?y(J07>!bQ46q~PkDymn; zlLBGm{HTj?h;WKX;LeY(gk%(qmci;KeqUZB!`nE7r@CMQ`k24z8W&v8wAk|@O%;Zv zB6wgv?4F2lPdQk7`UOlXATI~u#f>nF2wxVu1SzaA3@*+aK>;k@ya5GP@dl*u)HbNL zUi#uq$cf?1-VSX@?`(%$gty*;(L7yz2;%;`FmtHKlG~!kwY%{7uh)H;JtWc}zzG|Q zLLHDb)MIG`DErv~8SFp=MzO+9SdOgvPM8*B@gJSwvRvaI!Hgk%?IU<&;dx#E@zLRQ c7fg>a5&6~y+2)I|kk}d#|Kq>29C{4iKcO_GK>z>%