[videodb] Fix TV shows cleaning after 5755573981ca706a82a7ecbbdf5de112a570377a.

[anaconda]

A regression in 5755573 meant removing a
deleted TV show needed multiple library cleanings (i.e. TV shows only got
removed when filesToTestForDelete was empty). This is much more noticeable
after 5cae3b5.

After 5755573:

• if we had files to be checked for deletion: CleanMediaType would return a
  decision for the TV show path (delete) and a decision for the parent path
  (keep), so the TV show wasn't removed from the database;
• if no files needed to be checked for deletion: CleanMediaType would return
  earlier and pathsDeleteDecisions was empty, so we'd have checked if the
  path existed and there was a decision for the parent path (delete) or no
  decision at all.

This commit checks if there's a decision to delete the parent path or it
exists (we only end up there if there's a decision to delete the path or it
doesn't exist), so that you can delete a TV show with episodes (or other random
files).

See:

• http://forum.kodi.tv/showthread.php?tid=238881

The 2 booleans are just to improve readability.

[MartijnKaijser]

@Montellese @mkortstiege ping

[mkortstiege]

No objections but i'd like to get @Montellese opinion as well.

[MartijnKaijser]

Ping

[mkortstiege]

@Montellese could you please have a look at this?

[anaconda]

Please wait. This breaks multiple movies in the same folder:
http://forum.kodi.tv/showthread.php?tid=231092&pid=2142689#pid2142689

Suggestions welcome.

[anaconda]

Looks like in that case pathsDeleteDecision->second is true and the added logic deletes it - why is it true (delete) if the path does exist?

Edit:

CleanDatabase: hasDecision=true pathsDeleteDecision->second=true
CleanDatabase: !CDirectory::Exists(/Users/anaconda/tmp/xbmc-testsource/Action/, false)=false
CleanDatabase: hasDecisionForParent=true pathsDeleteDecisionByParent->second=false
CleanDatabase: !parentPath.empty()=true CDirectory::Exists(/Users/anaconda/tmp/xbmc-testsource/, false)=true

[MartijnKaijser]

@anaconda would this still something for Jarvis or too risky?

[anaconda]

Too risky for Jarvis unless CleanMediaType is fixed to return false.
After a path with multiple movies is incorrectly cleaned, a subsequent scan adds them again, but you get duplicates.

[vbat99]

No chance of this getting into 16.1 then?

[razzeee]

@anaconda is this still wanted/needed?

[eusi]

Actually your fix needs some improvements.

Example, I am using a movie structure like:
SourceVideoFolder ("Movies")
---QualityFolder (like "HD", "SD", "4k" etc.)
------YearFolder (like "1900-1999", "2000-2010" etc)
---------Movies

Following part of the if-statement (in VideoDatabase) wipes an entire folder (removes all movies in the folder from the database), when I delete only ONE movie in the folder and execute a "clean video library":
(pathsDeleteDecisionByParent != pathsDeleteDecisions.end() && pathsDeleteDecisionByParent->second)

This issue is super annoying for me and my folder structure. Because any time I delete a movie, like 200 movies getting removed as well from my kodi database.

It works correctly, if I change
if (scanSettings.parent_name) pathsDeleteDecisions.insert(std::make_pair(m_pDS2->fv(2).get_asInt(), del));
to
if (scanSettings.parent_name) pathsDeleteDecisions.insert(std::make_pair(m_pDS2->fv(2).get_asInt(), !CDirectory::Exists( parentPath, false ) && del));
Those line(s) can be found in CleanMediaType(). This method sets the pathsDeleteDecisionByParent-object.

@anaconda this could also be a fix for your last comment/worries on Oct 25, 2015.

I opened PR11937 that includes the fix and some of your/this improvements for better readability of this part.

[razzeee]

@menakite will you revisit this?

[jenkins4kodi]

@anaconda this needs a rebase

[MartijnKaijser]

I will close this PR. If there's interest please open a new one (with required changes if needed).