Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] No issue: history view search group missing

Browse Source 
Our boundary conditions for matching search groups to visits was wrong.

This change switches the boundary buffer to only be applied to history
items, not the metadata items.

In other words, when checking if any of the metadata items match the
current "page" of history, we'll be looking to see if the item falls
within this time window:
buffer - oldest history item <= metadata item <= newest history item +
buffer

There's a separate problem with buffer though: it's reset to 0 when requested
offset is >0, but that requires a larger refactor of this code, for a
separate PR.
This commit is contained in:
Grisha Kruglov 2021-11-04 00:06:55 -07:00 committed by mergify[bot]
parent 422a8e2a67
commit 31c2c7bf12
2 changed files with 148 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/components/history/PagedHistoryProvider.kt
View File

@ -156,8 +156,8 @@ class DefaultPagedHistoryProvider(
val historyGroupsInOffset = if (history.isNotEmpty()) {
historyGroups?.filter {
it.items.any { item ->
history.last().visitedAt <= item.visitedAt - visitedAtBuffer &&
item.visitedAt - visitedAtBuffer <= (history.first().visitedAt + visitedAtBuffer)
(history.last().visitedAt - visitedAtBuffer) <= item.visitedAt &&
item.visitedAt <= (history.first().visitedAt + visitedAtBuffer)
}
} ?: emptyList()
} else {

146
app/src/test/java/org/mozilla/fenix/components/history/PagedHistoryProviderTest.kt
View File

@ -146,4 +146,150 @@ class PagedHistoryProviderTest {
)
assertEquals(results, actualResults)
}
@Test
fun `history metadata matching lower bound`() {
val provider = DefaultPagedHistoryProvider(
historyStorage = storage,
showHistorySearchGroups = true
)
// Oldest history visit on the page is 15 seconds (buffer time) newer than matching
// metadata record.
val visitInfo1 = VisitInfo(
url = "http://www.mozilla.com",
title = "mozilla",
visitTime = 25000,
visitType = VisitType.LINK,
previewImageUrl = null
)
val historyMetadataKey1 = HistoryMetadataKey("http://www.mozilla.com", "mozilla", null)
val historyEntry1 = HistoryMetadata(
key = historyMetadataKey1,
title = "mozilla",
createdAt = 10000,
updatedAt = 10,
totalViewTime = 10,
documentType = DocumentType.Regular,
previewImageUrl = null
)
coEvery { storage.getVisitsPaginated(any(), any(), any()) } returns listOf(visitInfo1)
coEvery { storage.getHistoryMetadataSince(any()) } returns listOf(historyEntry1)
var actualResults: List<History>? = null
provider.getHistory(0L, 5) {
actualResults = it
}
coVerify {
storage.getVisitsPaginated(
offset = 0L,
count = 5,
excludeTypes = listOf(
VisitType.NOT_A_VISIT,
VisitType.DOWNLOAD,
VisitType.REDIRECT_TEMPORARY,
VisitType.RELOAD,
VisitType.EMBED,
VisitType.FRAMED_LINK,
VisitType.REDIRECT_PERMANENT
)
)
}
val results = listOf(
History.Group(
id = historyEntry1.createdAt.toInt(),
title = historyEntry1.key.searchTerm!!,
visitedAt = historyEntry1.createdAt,
// Results are de-duped by URL and sorted descending by createdAt/visitedAt
items = listOf(
History.Metadata(
id = historyEntry1.createdAt.toInt(),
title = historyEntry1.title!!,
url = historyEntry1.key.url,
visitedAt = historyEntry1.createdAt,
totalViewTime = historyEntry1.totalViewTime,
historyMetadataKey = historyMetadataKey1
)
)
)
)
assertEquals(results, actualResults)
}
@Test
fun `history metadata matching upper bound`() {
val provider = DefaultPagedHistoryProvider(
historyStorage = storage,
showHistorySearchGroups = true
)
// Newest history visit on the page is 15 seconds (buffer time) older than matching
// metadata record.
val visitInfo1 = VisitInfo(
url = "http://www.mozilla.com",
title = "mozilla",
visitTime = 10000,
visitType = VisitType.LINK,
previewImageUrl = null
)
val historyMetadataKey1 = HistoryMetadataKey("http://www.mozilla.com", "mozilla", null)
val historyEntry1 = HistoryMetadata(
key = historyMetadataKey1,
title = "mozilla",
createdAt = 25000,
updatedAt = 10,
totalViewTime = 10,
documentType = DocumentType.Regular,
previewImageUrl = null
)
coEvery { storage.getVisitsPaginated(any(), any(), any()) } returns listOf(visitInfo1)
coEvery { storage.getHistoryMetadataSince(any()) } returns listOf(historyEntry1)
var actualResults: List<History>? = null
provider.getHistory(0L, 5) {
actualResults = it
}
coVerify {
storage.getVisitsPaginated(
offset = 0L,
count = 5,
excludeTypes = listOf(
VisitType.NOT_A_VISIT,
VisitType.DOWNLOAD,
VisitType.REDIRECT_TEMPORARY,
VisitType.RELOAD,
VisitType.EMBED,
VisitType.FRAMED_LINK,
VisitType.REDIRECT_PERMANENT
)
)
}
val results = listOf(
History.Group(
id = historyEntry1.createdAt.toInt(),
title = historyEntry1.key.searchTerm!!,
visitedAt = historyEntry1.createdAt,
// Results are de-duped by URL and sorted descending by createdAt/visitedAt
items = listOf(
History.Metadata(
id = historyEntry1.createdAt.toInt(),
title = historyEntry1.title!!,
url = historyEntry1.key.url,
visitedAt = historyEntry1.createdAt,
totalViewTime = historyEntry1.totalViewTime,
historyMetadataKey = historyMetadataKey1
)
)
)
)
assertEquals(results, actualResults)
}
}