Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #82 from readium/fixes/debug
Browse files Browse the repository at this point in the history 
source formatting
  • Loading branch information
@aferditamuriqi
aferditamuriqi authored Dec 28, 2019
2 parents 3dcb432 + 778aa4c commit 577fc67
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 33 deletions.
16 changes: 8 additions & 8 deletions r2-shared/src/main/java/org/readium/r2/shared/Contributor.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ fun parseContributor(cDict: JSONObject): Contributor {
c.roles.add(cDict.getString("role"))
}
if (cDict.has("links")) {
cDict.get("links")?.let {
val links = it as? JSONArray
?: JSONArray()
for (i in 0 until links.length()) {
val linkDict = links.getJSONObject(i)
val link = parseLink(linkDict)
c.links.add(link)
cDict.get("links").let {
val links = it as? JSONArray
?: JSONArray()
for (i in 0 until links.length()) {
val linkDict = links.getJSONObject(i)
val link = parseLink(linkDict)
c.links.add(link)
}
}
}
}
return c
}
6 changes: 3 additions & 3 deletions r2-shared/src/main/java/org/readium/r2/shared/Link.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ fun parseLink(linkDict: JSONObject, feedUrl: URL? = null): Link {
}
if (linkDict.has("href")) {
feedUrl?.let {
link.href = getAbsolute(linkDict.getString("href")!!, feedUrl.toString())
link.href = getAbsolute(linkDict.getString("href"), feedUrl.toString())
} ?: run {
link.href = linkDict.getString("href")!!
link.href = linkDict.getString("href")
}
}
if (linkDict.has("type")) {
Expand Down Expand Up @@ -138,7 +138,7 @@ fun parseLink(linkDict: JSONObject, feedUrl: URL? = null): Link {
link.properties = properties
}
if (linkDict.has("children")) {
linkDict.get("children")?.let {
linkDict.get("children").let {
val children = it as? JSONArray
?: throw Exception(LinkError.InvalidLink.name)
for (i in 0 until children.length()) {
Expand Down
24 changes: 14 additions & 10 deletions r2-shared/src/main/java/org/readium/r2/shared/Metadata.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ fun parseMetadata(metadataDict: JSONObject): Metadata {
subject.code = sub.getString("code")
}
if (sub.has("links")) {
sub.get("links")?.let {
sub.get("links").let {
val links = it as? JSONArray
?: JSONArray()
for (i in 0 until links.length()) {
Expand All @@ -238,16 +238,20 @@ fun parseMetadata(metadataDict: JSONObject): Metadata {
val belongs = BelongsTo()
if (belongsDict.has("series")) {

if (belongsDict.get("series") is JSONObject) {
belongs.series.add(parseCollection(belongsDict.getJSONObject("series")))
} else if (belongsDict.get("series") is JSONArray) {
val array = belongsDict.getJSONArray("series")
for (i in 0 until array.length()) {
val seriesJsonObject = array.getJSONObject(i)
belongs.series.add(parseCollection(seriesJsonObject))
when {
belongsDict.get("series") is JSONObject -> {
belongs.series.add(parseCollection(belongsDict.getJSONObject("series")))
}
belongsDict.get("series") is JSONArray -> {
val array = belongsDict.getJSONArray("series")
for (i in 0 until array.length()) {
val seriesJsonObject = array.getJSONObject(i)
belongs.series.add(parseCollection(seriesJsonObject))
}
}
belongsDict.get("series") is String -> {
belongs.series.add(Collection(belongsDict.getString("series")))
}
}else if (belongsDict.get("series") is String) {
belongs.series.add(Collection(belongsDict.getString("series")))
}
}

Expand Down
18 changes: 9 additions & 9 deletions r2-shared/src/main/java/org/readium/r2/shared/Publication.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
val p = Publication()

if (pubDict.has("metadata")) {
pubDict.get("metadata")?.let {
pubDict.get("metadata").let {
val metadataDict = it as? JSONObject
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
val metadata = parseMetadata(metadataDict)
Expand All @@ -252,7 +252,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("links")) {
pubDict.get("links")?.let {
pubDict.get("links").let {
val links = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until links.length()) {
Expand All @@ -264,7 +264,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("images")) {
pubDict.get("images")?.let {
pubDict.get("images").let {
val links = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until links.length()) {
Expand All @@ -276,7 +276,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("spine")) {
pubDict.get("spine")?.let {
pubDict.get("spine").let {
val spine = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until spine.length()) {
Expand All @@ -288,7 +288,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("readingOrder")) {
pubDict.get("readingOrder")?.let {
pubDict.get("readingOrder").let {
val readingOrder = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until readingOrder.length()) {
Expand All @@ -300,7 +300,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("resources")) {
pubDict.get("resources")?.let {
pubDict.get("resources").let {
val resources = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until resources.length()) {
Expand All @@ -312,7 +312,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("toc")) {
pubDict.get("toc")?.let {
pubDict.get("toc").let {
val toc = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until toc.length()) {
Expand All @@ -324,7 +324,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("page-list")) {
pubDict.get("page-list")?.let {
pubDict.get("page-list").let {
val pageList = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until pageList.length()) {
Expand All @@ -336,7 +336,7 @@ fun parsePublication(pubDict: JSONObject): Publication {
}

if (pubDict.has("landmarks")) {
pubDict.get("landmarks")?.let {
pubDict.get("landmarks").let {
val landmarks = it as? JSONArray
?: throw Exception(Publication.PublicationError.InvalidPublication.name)
for (i in 0 until landmarks.length()) {
Expand Down
2 changes: 1 addition & 1 deletion r2-shared/src/main/java/org/readium/r2/shared/UserProperties.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sealed class UserProperty(var ref: String, var name: String) {

abstract override fun toString(): String
fun getJson(): String {
return """{name:"$name",value:"${this}"}"""
return """{name:"$name",value:"$this"}"""
}

}
Expand Down
4 changes: 2 additions & 2 deletions r2-shared/src/main/java/org/readium/r2/shared/drm/DRM.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ data class DRM(val brand: Brand): Serializable {
lcp("lcp");

companion object {
operator fun invoke(rawValue: String) = Brand.values().firstOrNull { it.rawValue == rawValue }
operator fun invoke(rawValue: String) = values().firstOrNull { it.rawValue == rawValue }
}
}

enum class Scheme(val rawValue: String): Serializable {
lcp("http://readium.org/2014/01/lcp");

companion object {
operator fun invoke(rawValue: String) = Scheme.values().firstOrNull { it.rawValue == rawValue }
operator fun invoke(rawValue: String) = values().firstOrNull { it.rawValue == rawValue }
}
}

Expand Down

0 comments on commit 577fc67

Please sign in to comment.