mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clarify regexes via variables

Browse source
This commit is contained in:
Matija Nalis 2024-07-15 01:24:43 +02:00
parent ee1d4c8edf
commit 866cf0a120
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
View file

@ -27,7 +27,7 @@ class CategoriesModel @Inject constructor(
private var selectedExistingCategories: MutableList<String> = mutableListOf() private var selectedExistingCategories: MutableList<String> = mutableListOf()
/** /**
* Returns if the item contains an year which should be ignored * Returns true if the item contains an year which should be ignored
* @param item * @param item
* @return * @return
*/ */
@ -41,16 +41,16 @@ class CategoriesModel @Inject constructor(
Timber.d("Previous year: %s", prevYearInString) Timber.d("Previous year: %s", prevYearInString)
val mentionsDecade = item.matches(".*0s.*".toRegex()) val mentionsDecade = item.matches(".*0s.*".toRegex())
val recentDecade = item.matches(".*20[0-2]0s.*".toRegex())
val oldDecade = !recentDecade
val spammyCategory = item.matches("(.*)needing(.*)".toRegex()) val spammyCategory = item.matches("(.*)needing(.*)".toRegex())
|| item.matches("(.*)taken on(.*)".toRegex()) || item.matches("(.*)taken on(.*)".toRegex())
if (mentionsDecade) { if (mentionsDecade) {
//Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029 //Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029
// If not, check if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750) // If not, check if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750)
return !item.matches(".*20[0-2]0s.*".toRegex()) return oldDecade || spammyCategory
|| spammyCategory } else {
}
else {
// If it is not an year in 20xxs form, then check if item contains a 4-digit word // If it is not an year in 20xxs form, then check if item contains a 4-digit word
// anywhere within the string (.* is wildcard) (Issue #47) // anywhere within the string (.* is wildcard) (Issue #47)
// And that item does not equal the current year or previous year // And that item does not equal the current year or previous year