Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[settings] ensure year string is at the end in clean datetime regexp #7861

Merged
merged 1 commit into from Aug 25, 2015

Conversation

Projects
None yet
4 participants
@mkortstiege
Copy link
Member

mkortstiege commented Aug 19, 2015

Fixes scraping issue reported in http://trac.kodi.tv/ticket/16170. Credits @Paxxi

@mkortstiege

This comment has been minimized.

Copy link
Member Author

mkortstiege commented Aug 20, 2015

@Montellese and @Paxxi for review/comments please.

@Paxxi

This comment has been minimized.

Copy link
Member

Paxxi commented Aug 20, 2015

+1

@mkortstiege

This comment has been minimized.

Copy link
Member Author

mkortstiege commented Aug 21, 2015

@MilhouseVH, could you please integrate this into your rpi builds in order to get some more testers on it before pushing to master? Thanks.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Aug 21, 2015

Sure, next build.

@mkortstiege

This comment has been minimized.

Copy link
Member Author

mkortstiege commented Aug 21, 2015

Sure, next build.

Great, thanks.

@@ -208,7 +208,7 @@ void CAdvancedSettings::Initialize()
m_fullScreenOnMovieStart = true;
m_cachePath = "special://temp/";

m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";
m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)?";

This comment has been minimized.

@MilhouseVH

MilhouseVH Aug 21, 2015

Contributor

It's another 4 and a bit years before it becomes an issue, but why do we only match on the first two decades of this century 20[0-1][0-9] - this seems unnecessarily restrictive and something that will eventually become a problem unless changed.

This comment has been minimized.

@mkortstiege

mkortstiege Aug 21, 2015

Author Member

Right, will adjust it later today.

@mkortstiege mkortstiege force-pushed the mkortstiege:update-cleandatetime-regexp branch from 55b2ea2 to 3f0d6de Aug 23, 2015

@mkortstiege

This comment has been minimized.

Copy link
Member Author

mkortstiege commented Aug 23, 2015

Updated.

@mkortstiege

This comment has been minimized.

Copy link
Member Author

mkortstiege commented Aug 25, 2015

Any objections? Would like to shove this one in.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor

MilhouseVH commented Aug 25, 2015

Not had any complaints from testers so far.

Paxxi added a commit that referenced this pull request Aug 25, 2015

Merge pull request #7861 from mkortstiege/update-cleandatetime-regexp
[settings] ensure year string is at the end in clean datetime regexp

@Paxxi Paxxi merged commit 7169ee6 into xbmc:master Aug 25, 2015

@hudokkow hudokkow added this to the Jarvis 16.0-alpha2 milestone Aug 25, 2015

@mkortstiege mkortstiege deleted the mkortstiege:update-cleandatetime-regexp branch Aug 30, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.