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.

Sign up for GitHub

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

Jump to bottom

Update allowed recent years to include 2020s #5761

Merged
merged 14 commits into from
Jul 20, 2024
Merged

Update allowed recent years to include 2020s #5761

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
81d553c
document regex due to #47
mnalis Jun 24, 2024
d078b2d
also count 2020s as "recent years"
mnalis Jun 24, 2024
99e5d1f
clarify that not all years are ignored
mnalis Jul 14, 2024
8916362
clarify "year" is current year
mnalis Jul 14, 2024
eafb363
original logic fix
mnalis Jul 14, 2024
d92225a
better variale name for ".*0s.*"
mnalis Jul 14, 2024
ee1d4c8
consolidate duplicated code to spammyCategory
mnalis Jul 14, 2024
866cf0a
clarify regexes via variables
mnalis Jul 14, 2024
e3c1923
spammyCategory should always be skipped
mnalis Jul 14, 2024
c545642
return is simple now, so we can get rid of extra val oldDecade
mnalis Jul 14, 2024
1ca742d
fix curYearInString
mnalis Jul 14, 2024
4fe4310
some clarification comments
mnalis Jul 14, 2024
fe74c77
refactor: rename containsYear to isSpammyCategory
sivaraam Jul 17, 2024
61445e3
refactor: rename containsYear to isSpammyCategory (take 2)
sivaraam Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CategoriesModel @Inject constructor(
val prevYearInString = prevYear.toString()
Timber.d("Previous year: %s", prevYearInString)

//Check if item contains a 4-digit word anywhere within the string (.* is wildcard)
//Check if item contains a 4-digit word anywhere within the string (.* is wildcard) (Issue #47)
//And that item does not equal the current year or previous year
//And if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750)
//Check if the year in the form of XX(X)0s is relevant, i.e. in the 2000s or 2010s as stated in Issue #1029
Expand All @@ -50,7 +50,7 @@ class CategoriesModel @Inject constructor(
|| item.matches("(.*)needing(.*)".toRegex())
|| item.matches("(.*)taken on(.*)".toRegex())
|| item.matches(".*0s.*".toRegex())
&& !item.matches(".*(200|201)0s.*".toRegex())
&& !item.matches(".*20[0-2]0s.*".toRegex())
mnalis marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
Loading