Skip to content

Commit f98c807

Browse files
committed
rework --refresh as --exists
1 parent 0c4f1c6 commit f98c807

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

library/playback/media_player.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ def prep_media(self, m: dict):
482482
media_path = Path(self.args.prefix + m["path"]).resolve() if self.args.prefix else Path(m["path"])
483483
m["path"] = str(media_path)
484484

485-
if not media_path.exists():
485+
if not m["path"].startswith("http") and not media_path.exists():
486486
log.warning("[%s]: Does not exist. Skipping...", m["path"])
487487
db_media.mark_media_deleted(self.args, m["original_path"])
488488
return {}

library/playback/media_printer.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,7 @@ def media_printer(args, data, units=None, media_len=None) -> None:
218218
printing.pipe_lines(json.dumps(m) + "\n" for m in media)
219219

220220
elif "f" in print_args:
221-
if (
222-
len(media) <= 1000
223-
and getattr(args, "hide_deleted", True)
224-
and getattr(args, "action", "") not in [consts.SC.links_open]
225-
):
221+
if getattr(args, "exists", False):
226222
media, deleted_paths = filter_deleted(media)
227223
db_media.mark_media_deleted(args, deleted_paths)
228224
if len(media) == 0:

library/playback/play_actions.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def parse_args(action, default_chromecast=None) -> argparse.Namespace:
188188

189189
parser.add_argument("--safe", action="store_true", help="Skip generic URLs")
190190
parser.add_argument(
191-
"--refresh", "--exists", action="store_true", help="Check for deleted files before starting playqueue"
191+
"--exists", "--refresh", action="store_true", help="Check for deleted files before starting playqueue"
192192
)
193193
parser.add_argument(
194194
"--delete-unplayable", action="store_true", help="Delete from disk any media which does not open successfully"
@@ -414,13 +414,13 @@ def process_playqueue(args) -> None:
414414
media = history_sort(args, media)
415415
log.debug("utils.history_sort: %s", t.elapsed())
416416

417-
if getattr(args, "refresh", False):
417+
if getattr(args, "exists", False):
418418
marked = db_media.mark_media_deleted(
419419
args, [d["path"] for d in media if d and d["path"] and not Path(d["path"]).exists()]
420420
)
421421
if marked > 0:
422422
log.warning(f"Marked {marked} metadata records as deleted")
423-
args.refresh = False
423+
args.exists = False
424424
return process_playqueue(args)
425425
elif args.folders:
426426
media = folder_media(args, media)

0 commit comments

Comments
 (0)