Skip to content

Commit

Permalink
[scan] cleanup consistencies on write_metadata log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
whatdoineed2do/Ray committed Dec 12, 2023
1 parent c845f4d commit 1bdc4b3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/library/filescanner.c
Original file line number Diff line number Diff line change
Expand Up @@ -1737,7 +1737,7 @@ filescanner_write_metadata(const char *virtual_path, const uint32_t *id, uint32_
mfi = db_file_fetch_byvirtualpath(virtual_path);
if (!mfi)
{
DPRINTF(E_INFO, L_SCAN, "No known path for local media, (%s) requested for rating write\n", virtual_path);
DPRINTF(E_INFO, L_SCAN, "No known DB entry for media, '%s' to update metadata\n", virtual_path);
return -1;
}
}
Expand All @@ -1747,14 +1747,14 @@ filescanner_write_metadata(const char *virtual_path, const uint32_t *id, uint32_
mfi = db_file_fetch_byid(*id);
if (!mfi)
{
DPRINTF(E_LOG, L_SCAN, "No known path for local media, (%d) requested for rating write\n", *id);
DPRINTF(E_INFO, L_SCAN, "No known DB entry for media, '%d' to update metadata\n", *id);
return -1;
}
}

if (mfi->data_kind != DATA_KIND_FILE)
{
DPRINTF(E_INFO, L_SCAN, "Ignoring non local media (%d/%s is %s) requested for rating write\n", mfi->id, mfi->path, db_data_kind_label(mfi->data_kind));
DPRINTF(E_INFO, L_SCAN, "Unsupported media (%s) to update metadata on '%s' (id=%d)\n", db_data_kind_label(mfi->data_kind), mfi->path, mfi->id);
ret = -1;
goto cleanup;
}
Expand All @@ -1765,7 +1765,7 @@ filescanner_write_metadata(const char *virtual_path, const uint32_t *id, uint32_

if (access(mfi->path, W_OK) < 0 || access(inotify_path, W_OK) < 0)
{
DPRINTF(E_INFO, L_SCAN, "No permissions to update metadata, skipping %s\n", mfi->path);
DPRINTF(E_WARN, L_SCAN, "No permissions to update metadata on '%s' - skipping\n", mfi->path);
ret = 0;
goto cleanup;
}
Expand Down
2 changes: 1 addition & 1 deletion src/library/filescanner_ffmpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ filescanner_ffmpeg_write_rating(const struct media_file_info *mfi)
break;

default:
DPRINTF(E_WARN, L_SCAN, "Unsupported metadata update for 'rating' on '%s' (%s) - skipping\n", mfi->path, avcodec_get_name(ctx->streams[i]->codecpar->codec_id));
DPRINTF(E_WARN, L_SCAN, "Unsupported metadata (%s) update for 'rating' on '%s' - skipping\n", avcodec_get_name(ctx->streams[i]->codecpar->codec_id), mfi->path);
}
}

Expand Down

0 comments on commit 1bdc4b3

Please sign in to comment.