mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-05-24 16:35:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

[db] Add URL as mirror if repo was added with unofficial mirror

Browse Source
This commit is contained in:
Torsten Grote
2023-10-25 13:31:52 -03:00
committed by Hans-Christoph Steiner
parent 66844a17a7
commit b1a0403960
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/database/src/main/java/org/fdroid/repo/RepoAdder.kt
View File

@@ -85,7 +85,7 @@ public data class AddRepoError(
}
public sealed class FetchResult {
public object IsNewRepository : FetchResult()
public data class IsNewRepository(internal val addUrl: String) : FetchResult()
public data class IsNewMirror(
internal val existingRepoId: Long,
internal val newMirrorUrl: String,
@@ -211,7 +211,7 @@ internal class RepoAdder(
val cert = repo.certificate ?: error("Certificate was null")
val existingRepo = repositoryDao.getRepository(cert)
return if (existingRepo == null) {
FetchResult.IsNewRepository
FetchResult.IsNewRepository(url)
} else {
val existingMirror = if (existingRepo.address.trimEnd('/') == url) {
url
@@ -258,8 +258,17 @@ internal class RepoAdder(
username = repo.username,
password = repo.password,
)
val repoId = repositoryDao.insert(newRepo)
repositoryDao.getRepository(repoId) ?: error("New repository not found in DB")
db.runInTransaction<Repository> {
val repoId = repositoryDao.insert(newRepo)
// add user mirror, if URL is not the repo address and not a known mirror
if (fetchResult.addUrl != repo.address.trimEnd('/') &&
repo.mirrors.find { fetchResult.addUrl == it.url.trimEnd('/') } == null
) {
val userMirrors = listOf(fetchResult.addUrl)
repositoryDao.updateUserMirrors(repoId, userMirrors)
}
repositoryDao.getRepository(repoId) ?: error("New repository not found in DB")
}
}
is FetchResult.IsNewMirror -> {