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

Move Try back into util package #378

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Move Try back into util package #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775f8fa
Move `Try` back into `util` package
mickael-menu Aug 22, 2023
081e82d
Move `Error` to `util`
mickael-menu Aug 22, 2023
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
2 changes: 1 addition & 1 deletion ...fium/pdfium-document/src/main/java/org/readium/adapters/pdfium/document/PdfiumDocument.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import kotlin.reflect.KClass
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.readium.r2.shared.InternalReadiumApi
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.md5
import org.readium.r2.shared.extensions.tryOrNull
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.util.getOrThrow
import org.readium.r2.shared.util.pdf.PdfDocument
import org.readium.r2.shared.util.pdf.PdfDocumentFactory
import org.readium.r2.shared.util.toFile
Expand Down
2 changes: 1 addition & 1 deletion ...kit-document/src/main/java/org/readium/adapters/pspdfkit/document/ResourceDataProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package org.readium.adapters.pspdfkit.document
import com.pspdfkit.document.providers.DataProvider
import java.util.*
import kotlinx.coroutines.runBlocking
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.synchronized
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.isLazyInitialized
import timber.log.Timber

Expand Down
8 changes: 4 additions & 4 deletions readium/lcp/src/main/java/org/readium/r2/lcp/LcpContentProtection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ import org.readium.r2.lcp.license.model.LicenseDocument
import org.readium.r2.shared.asset.Asset
import org.readium.r2.shared.asset.AssetRetriever
import org.readium.r2.shared.asset.AssetType
import org.readium.r2.shared.error.ThrowableError
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.flatMap
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.publication.encryption.encryption
import org.readium.r2.shared.publication.flatten
Expand All @@ -24,7 +20,11 @@ import org.readium.r2.shared.resource.ArchiveFactory
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.ResourceFactory
import org.readium.r2.shared.resource.TransformingContainer
import org.readium.r2.shared.util.ThrowableError
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.Url
import org.readium.r2.shared.util.flatMap
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.toFile

internal class LcpContentProtection(
Expand Down
6 changes: 3 additions & 3 deletions readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
package org.readium.r2.lcp

import java.io.IOException
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.coerceFirstNonNegative
import org.readium.r2.shared.extensions.inflate
import org.readium.r2.shared.extensions.requireLengthFitInt
Expand All @@ -25,7 +22,10 @@ import org.readium.r2.shared.resource.TransformingResource
import org.readium.r2.shared.resource.flatMap
import org.readium.r2.shared.resource.flatMapCatching
import org.readium.r2.shared.resource.mapCatching
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.Url
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.getOrThrow

/**
* Decrypts a resource protected with LCP.
Expand Down
4 changes: 2 additions & 2 deletions readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
package org.readium.r2.lcp

import kotlin.math.ceil
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.coerceIn
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.mapCatching
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.getOrThrow
import org.readium.r2.shared.util.use
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/LcpLicense.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import kotlinx.coroutines.runBlocking
import org.joda.time.DateTime
import org.readium.r2.lcp.license.model.LicenseDocument
import org.readium.r2.lcp.license.model.StatusDocument
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.publication.services.ContentProtectionService
import org.readium.r2.shared.util.Try
import timber.log.Timber

/**
Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/LcpService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import org.readium.r2.lcp.service.PassphrasesRepository
import org.readium.r2.lcp.service.PassphrasesService
import org.readium.r2.shared.asset.Asset
import org.readium.r2.shared.asset.AssetRetriever
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.publication.protection.ContentProtection
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.mediatype.MediaType
import org.readium.r2.shared.util.mediatype.MediaTypeRetriever

Expand Down
6 changes: 3 additions & 3 deletions readium/lcp/src/main/java/org/readium/r2/lcp/license/License.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import org.readium.r2.lcp.service.DeviceService
import org.readium.r2.lcp.service.LcpClient
import org.readium.r2.lcp.service.LicensesRepository
import org.readium.r2.lcp.service.NetworkService
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.toIso8601String
import org.readium.r2.shared.extensions.tryOrNull
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.getOrThrow
import org.readium.r2.shared.util.mediatype.MediaType
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/license/LicenseValidation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.readium.r2.lcp.service.DeviceService
import org.readium.r2.lcp.service.LcpClient
import org.readium.r2.lcp.service.NetworkService
import org.readium.r2.lcp.service.PassphrasesService
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.util.getOrElse
import org.readium.r2.shared.util.mediatype.MediaType
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/license/container/ContainerLicenseContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package org.readium.r2.lcp.license.container
import kotlinx.coroutines.runBlocking
import org.readium.r2.lcp.LcpException
import org.readium.r2.lcp.license.model.LicenseDocument
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.resource.Container
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.util.getOrThrow

/**
* Access to a License Document stored in a read-only container.
Expand Down
2 changes: 1 addition & 1 deletion ...um/lcp/src/main/java/org/readium/r2/lcp/license/container/LcplResourceLicenseContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ package org.readium.r2.lcp.license.container
import kotlinx.coroutines.runBlocking
import org.readium.r2.lcp.LcpException
import org.readium.r2.lcp.license.model.LicenseDocument
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.util.getOrThrow

/**
* Access a License Document stored in an LCP License Document file (LCPL) readable through a
Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/service/CRLService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import org.joda.time.DateTime
import org.joda.time.Days
import org.readium.r2.lcp.BuildConfig.DEBUG
import org.readium.r2.lcp.LcpException
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.util.getOrElse
import timber.log.Timber

@OptIn(ExperimentalTime::class)
Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/service/LicensesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import org.readium.r2.lcp.license.container.createLicenseContainer
import org.readium.r2.lcp.license.model.LicenseDocument
import org.readium.r2.shared.asset.Asset
import org.readium.r2.shared.asset.AssetRetriever
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.extensions.tryOr
import org.readium.r2.shared.publication.protection.ContentProtection
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.mediatype.MediaType
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion readium/lcp/src/main/java/org/readium/r2/lcp/service/NetworkService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import kotlin.time.Duration
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.readium.r2.lcp.LcpException
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.http.invoke
import org.readium.r2.shared.util.mediatype.MediaType
import org.readium.r2.shared.util.mediatype.MediaTypeHints
Expand Down
2 changes: 1 addition & 1 deletion readium/navigator-media2/src/main/java/org/readium/navigator/media2/ExoPlayerDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import com.google.android.exoplayer2.upstream.DataSpec
import com.google.android.exoplayer2.upstream.TransferListener
import java.io.IOException
import kotlinx.coroutines.runBlocking
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.buffered
import org.readium.r2.shared.util.getOrThrow

public sealed class ExoPlayerDataSourceException(message: String, cause: Throwable?) : IOException(
message,
Expand Down
4 changes: 2 additions & 2 deletions readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.readium.navigator.media2.MediaNavigator.Companion.create
import org.readium.r2.navigator.Navigator
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.flatMap
import org.readium.r2.shared.publication.Link
import org.readium.r2.shared.publication.Locator
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.publication.indexOfFirstWithHref
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.flatMap
import timber.log.Timber

/**
Expand Down
4 changes: 2 additions & 2 deletions readium/navigator-media2/src/main/java/org/readium/navigator/media2/SessionPlayerFacade.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.receiveAsFlow
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.flatMap
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.flatMap
import timber.log.Timber

/**
Expand Down
2 changes: 1 addition & 1 deletion readium/navigator-media2/src/main/java/org/readium/navigator/media2/SessionPlayerHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.media2.common.SessionPlayer
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.ExperimentalTime
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.util.Try

internal enum class SessionPlayerState {
Idle,
Expand Down
2 changes: 1 addition & 1 deletion readium/navigator/src/main/java/org/readium/r2/navigator/R2BasicWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import org.readium.r2.navigator.input.KeyEvent
import org.readium.r2.navigator.preferences.ReadingProgression
import org.readium.r2.shared.ExperimentalReadiumApi
import org.readium.r2.shared.InternalReadiumApi
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.optNullableString
import org.readium.r2.shared.extensions.tryOrLog
import org.readium.r2.shared.extensions.tryOrNull
Expand All @@ -50,6 +49,7 @@ import org.readium.r2.shared.publication.Locator
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.readAsString
import org.readium.r2.shared.util.Href
import org.readium.r2.shared.util.getOrThrow
import org.readium.r2.shared.util.use
import timber.log.Timber

Expand Down
2 changes: 1 addition & 1 deletion readium/navigator/src/main/java/org/readium/r2/navigator/audio/PublicationDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import com.google.android.exoplayer2.upstream.DataSpec
import com.google.android.exoplayer2.upstream.TransferListener
import java.io.IOException
import kotlinx.coroutines.runBlocking
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.buffered
import org.readium.r2.shared.util.getOrThrow

internal sealed class PublicationDataSourceException(message: String, cause: Throwable?) : IOException(
message,
Expand Down
4 changes: 2 additions & 2 deletions readium/navigator/src/main/java/org/readium/r2/navigator/epub/HtmlInjector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ package org.readium.r2.navigator.epub

import org.readium.r2.navigator.epub.css.ReadiumCss
import org.readium.r2.shared.ExperimentalReadiumApi
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.error.getOrElse
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.publication.epub.EpubLayout
import org.readium.r2.shared.publication.presentation.presentation
import org.readium.r2.shared.publication.services.isProtected
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.ResourceTry
import org.readium.r2.shared.resource.TransformingResource
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.getOrElse
import timber.log.Timber

/**
Expand Down
2 changes: 1 addition & 1 deletion readium/navigator/src/main/java/org/readium/r2/navigator/epub/WebViewServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.readium.r2.navigator.epub.css.ReadiumCss
import org.readium.r2.shared.ExperimentalReadiumApi
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.publication.Link
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.ResourceInputStream
import org.readium.r2.shared.resource.StringResource
import org.readium.r2.shared.resource.fallback
import org.readium.r2.shared.util.Href
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.http.HttpHeaders
import org.readium.r2.shared.util.http.HttpRange
import org.readium.r2.shared.util.mediatype.MediaType
Expand Down
2 changes: 1 addition & 1 deletion readium/navigator/src/main/java/org/readium/r2/navigator/media3/audio/MetadataRetriever.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import java.io.IOException
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlinx.coroutines.runBlocking
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.extensions.tryOrLog
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.util.getOrThrow

@RequiresApi(Build.VERSION_CODES.M)
internal class MetadataRetriever(
Expand Down
2 changes: 1 addition & 1 deletion .../navigator/src/main/java/org/readium/r2/navigator/media3/exoplayer/ExoPlayerDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import androidx.media3.datasource.DataSpec
import androidx.media3.datasource.TransferListener
import java.io.IOException
import kotlinx.coroutines.runBlocking
import org.readium.r2.shared.error.getOrThrow
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.resource.Resource
import org.readium.r2.shared.resource.buffered
import org.readium.r2.shared.util.getOrThrow

public sealed class ExoPlayerDataSourceException(message: String, cause: Throwable?) : IOException(
message,
Expand Down
2 changes: 1 addition & 1 deletion readium/opds/src/main/java/org/readium/r2/opds/OPDS1Parser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ package org.readium.r2.opds

import java.net.URL
import org.joda.time.DateTime
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.extensions.toList
import org.readium.r2.shared.extensions.toMap
import org.readium.r2.shared.opds.*
Expand All @@ -20,6 +19,7 @@ import org.readium.r2.shared.parser.xml.XmlParser
import org.readium.r2.shared.publication.*
import org.readium.r2.shared.toJSON
import org.readium.r2.shared.util.Href
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.http.DefaultHttpClient
import org.readium.r2.shared.util.http.HttpClient
import org.readium.r2.shared.util.http.HttpRequest
Expand Down
2 changes: 1 addition & 1 deletion readium/opds/src/main/java/org/readium/r2/opds/OPDS2Parser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import java.net.URL
import org.joda.time.DateTime
import org.json.JSONArray
import org.json.JSONObject
import org.readium.r2.shared.error.Try
import org.readium.r2.shared.extensions.removeLastComponent
import org.readium.r2.shared.opds.Facet
import org.readium.r2.shared.opds.Feed
Expand All @@ -24,6 +23,7 @@ import org.readium.r2.shared.publication.Link
import org.readium.r2.shared.publication.Manifest
import org.readium.r2.shared.publication.Publication
import org.readium.r2.shared.util.Href
import org.readium.r2.shared.util.Try
import org.readium.r2.shared.util.http.DefaultHttpClient
import org.readium.r2.shared.util.http.HttpClient
import org.readium.r2.shared.util.http.HttpRequest
Expand Down
Loading