Merge pull request 'Make the author field nullable' (#117) from davidoskky/ReaderForSelfoss-multiplatform:author into master
Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/117
This commit is contained in:
commit
a094d88799
@ -46,7 +46,7 @@ data class ParecelableItem(
|
||||
val link: String,
|
||||
val sourcetitle: String,
|
||||
val tags: String,
|
||||
val author: String
|
||||
val author: String?
|
||||
) : Parcelable {
|
||||
|
||||
companion object {
|
||||
|
@ -73,7 +73,7 @@ class SelfossModel {
|
||||
val sourcetitle: String,
|
||||
@Serializable(with = TagsListSerializer::class)
|
||||
val tags: List<String>,
|
||||
val author: String
|
||||
val author: String?
|
||||
) {
|
||||
// TODO: maybe find a better way to handle these kind of urls
|
||||
fun getLinkDecoded(): String {
|
||||
@ -104,7 +104,7 @@ class SelfossModel {
|
||||
|
||||
fun sourceAuthorAndDate(): String {
|
||||
var txt = this.sourcetitle.getHtmlDecoded()
|
||||
if (this.author.isNotEmpty()) {
|
||||
if (!this.author.isNullOrBlank()) {
|
||||
txt += " (by ${this.author}) "
|
||||
}
|
||||
txt += DateUtils.parseRelativeDate(this.datetime)
|
||||
|
@ -511,6 +511,7 @@ class Repository(
|
||||
item.link,
|
||||
item.sourcetitle,
|
||||
item.tags.joinToString(","),
|
||||
item.author,
|
||||
item.id.toString()
|
||||
)
|
||||
|
||||
|
@ -0,0 +1,6 @@
|
||||
CREATE TABLE ITEM_BACKUP AS SELECT `id`, `datetime`, `title`, `content`,
|
||||
`unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`,
|
||||
`tags` FROM ITEM;
|
||||
ALTER TABLE ITEM_BACKUP ADD COLUMN `author` TEXT;
|
||||
DROP TABLE ITEM;
|
||||
ALTER TABLE ITEM_BACKUP RENAME TO ITEM;
|
@ -10,7 +10,7 @@ CREATE TABLE ITEM (
|
||||
`link` TEXT NOT NULL,
|
||||
`sourcetitle` TEXT NOT NULL,
|
||||
`tags` TEXT NOT NULL,
|
||||
`author` TEXT NOT NULL,
|
||||
`author` TEXT,
|
||||
PRIMARY KEY(`id`)
|
||||
);
|
||||
|
||||
@ -31,4 +31,4 @@ deleteItemsWhereSource:
|
||||
DELETE FROM ITEM WHERE `sourcetitle` = ?;
|
||||
|
||||
updateItem:
|
||||
UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;
|
||||
UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ?, `author` = ? WHERE `id` = ?;
|
Loading…
Reference in New Issue
Block a user