Skip to content

Commit 4ccf198

Browse files
committed
3.0.162
1 parent cc08e7b commit 4ccf198

File tree

6 files changed

+164
-191
lines changed

6 files changed

+164
-191
lines changed

.github/README.md

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
9999
<details><summary>List all subcommands</summary>
100100

101101
$ library
102-
library (v3.0.161; 104 subcommands)
102+
library (v3.0.162; 103 subcommands)
103103

104104
Create database subcommands:
105105
╭─────────────────┬──────────────────────────────────────────╮
@@ -171,8 +171,6 @@ To stop playing press Ctrl+C in either the terminal or mpv
171171
╭─────────────────┬─────────────────────────────────────────────────────────────────────╮
172172
│ merge-mv │ Move files and merge folders in BSD/rsync style, rename if possible │
173173
├─────────────────┼─────────────────────────────────────────────────────────────────────┤
174-
│ merge-folders │ Merge two or more file trees, check for conflicts before merging │
175-
├─────────────────┼─────────────────────────────────────────────────────────────────────┤
176174
│ mergerfs-cp │ cp files with reflink on mergerfs │
177175
├─────────────────┼─────────────────────────────────────────────────────────────────────┤
178176
│ scatter │ Scatter files between folders or disks │
@@ -1351,24 +1349,6 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
13511349
) /mnt/d/sync/weekly/
13521350

13531351

1354-
</details>
1355-
1356-
###### merge-folders
1357-
1358-
<details><summary>Merge two or more file trees, check for conflicts before merging</summary>
1359-
1360-
$ library merge-folders -h
1361-
usage: library merge-folders [--replace] [--no-replace] [--simulate] SOURCES ... DESTINATION
1362-
1363-
Merge multiple folders with the same file tree into a single folder.
1364-
1365-
https://github.com/chapmanjacobd/journal/blob/main/programming/linux/misconceptions.md#mv-src-vs-mv-src
1366-
1367-
Trumps are new or replaced files from an earlier source which now conflict with a later source.
1368-
If you only have one source then the count of trumps will always be zero.
1369-
The count of conflicts also includes trumps.
1370-
1371-
13721352
</details>
13731353

13741354
###### mergerfs-cp

library/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from library.utils import argparse_utils, iterables
66
from library.utils.log_utils import log
77

8-
__version__ = "3.0.161"
8+
__version__ = "3.0.162"
99

1010
progs = {
1111
"Create database subcommands": {

library/playback/media_printer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ def media_printer(args, data, units: str | None = "media", media_len=None) -> No
103103
cols = getattr(args, "cols", [])
104104
m_columns = db_utils.columns(args, "media")
105105

106-
if "path" in data[0].keys():
106+
if (args.limit or args.timeout_size) and "path" in data[0].keys():
107107
new_data = []
108108
MOVED_COUNT = 0
109109
for d in data:
110110
filesize = d.get("size")
111-
if not filesize:
111+
if not filesize and not d["path"].startswith("http"):
112112
try:
113113
stat = os.stat(d["path"])
114114
filesize = stat.st_size

0 commit comments

Comments
 (0)