From 764025f1e7f6aafcc82adf30dad1738679e38265 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Thu, 5 Feb 2026 18:16:20 +0900 Subject: [PATCH] ... --- .../launcher/helpers/ForeGroundService.kt | 2 +- .../lunatic/launcher/model/CommunityData.kt | 4 +-- .../launcher/model/RssDataInterface.kt | 4 +-- .../lunatic/launcher/workers/RuliWebGetter.kt | 12 ++++++--- .../launcher/workers/TaskAggregator.kt | 1 + .../lunatic/launcher/workers/TheQooGetter.kt | 26 ++++++++++--------- app/src/main/res/layout/settings_todo.xml | 7 +---- 7 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/src/main/kotlin/bums/lunatic/launcher/helpers/ForeGroundService.kt b/app/src/main/kotlin/bums/lunatic/launcher/helpers/ForeGroundService.kt index 818e2a13..5f96f79d 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/helpers/ForeGroundService.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/helpers/ForeGroundService.kt @@ -231,7 +231,7 @@ class ForeGroundService : Service() { TaskAggregator.refreshSystemInfo(applicationContext) - + TaskAggregator.refreshNewsFeeds(applicationContext) // 1. 시스템 정보: 자주 변경되지 않으므로 1~3시간 간격 val systemRequest = PeriodicWorkRequestBuilder(PrefLong.longTimePeriod.get(120L), TimeUnit.MINUTES) .build() diff --git a/app/src/main/kotlin/bums/lunatic/launcher/model/CommunityData.kt b/app/src/main/kotlin/bums/lunatic/launcher/model/CommunityData.kt index 3c51511b..5e332098 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/model/CommunityData.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/model/CommunityData.kt @@ -189,8 +189,8 @@ open class DcInside : RssDataInterface { } else if (dateTiem?.contains("-") == true) { val cal: Calendar = Calendar.getInstance() cal.setTime(Date()) - cal.set(Calendar.MONTH, dateTiem!!.split("-")[0].toInt() - 1) - cal.set(Calendar.DAY_OF_MONTH, dateTiem!!.split("-")[1].toInt()) +// cal.set(Calendar.MONTH, dateTiem!!.split("-")[0].toInt() - 1) +// cal.set(Calendar.DAY_OF_MONTH, dateTiem!!.split("-")[1].toInt()) // cal.add(Calendar.DAY_OF_MONTH, -1) dateTiemL = cal.timeInMillis dateTiemL diff --git a/app/src/main/kotlin/bums/lunatic/launcher/model/RssDataInterface.kt b/app/src/main/kotlin/bums/lunatic/launcher/model/RssDataInterface.kt index e60c32c6..2804ad4e 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/model/RssDataInterface.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/model/RssDataInterface.kt @@ -57,9 +57,9 @@ enum class RssDataType { } companion object { - fun getExcAdt() = arrayListOf(NEWSFEED, REDDIT, DOTAX, FMKORAE, DCINSIDE, RULIWEB, CLIEN, THEQOO, ARCA).map { it.name } + fun getExcAdt() = arrayListOf(NEWSFEED, REDDIT, DOTAX, FMKORAE, DCINSIDE, RULIWEB, CLIEN, THEQOO).map { it.name } fun getAdts() = arrayListOf( REDDIT_NSFW).map { it.name } - fun getAll() = arrayListOf(TORRENT, YOUTUBE, NEWSFEED, REDDIT, DOTAX, FMKORAE, DCINSIDE, RULIWEB, CLIEN, THEQOO, ARCA,PRIVATE,REDDIT_NSFW) + fun getAll() = arrayListOf(YOUTUBE, NEWSFEED, REDDIT, DOTAX, FMKORAE, DCINSIDE, RULIWEB, CLIEN, THEQOO, PRIVATE,REDDIT_NSFW) } } diff --git a/app/src/main/kotlin/bums/lunatic/launcher/workers/RuliWebGetter.kt b/app/src/main/kotlin/bums/lunatic/launcher/workers/RuliWebGetter.kt index db6e89b0..9f0ea018 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/workers/RuliWebGetter.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/workers/RuliWebGetter.kt @@ -3,7 +3,6 @@ package bums.lunatic.launcher.workers import android.annotation.SuppressLint import android.content.Context import androidx.core.net.toUri -import androidx.work.WorkerParameters import bums.lunatic.launcher.model.RssDataType import bums.lunatic.launcher.model.RuliWeb import bums.lunatic.launcher.model.getRssData @@ -17,7 +16,7 @@ class RuliWebGetter(context: Context) : BaseGetter(context) { } fun parseRuli(ruli_tr : org.jsoup.nodes.Element) { - Blog.LOGE("ruli_tr >>> ${ruli_tr.text()}") +// Blog.LOGE("ruli_tr >>> ${ruli_tr.text()}") var aTags = ruli_tr.getElementsByTag("a") var tagIdx = 0 var pageLink = "" @@ -33,6 +32,12 @@ class RuliWebGetter(context: Context) : BaseGetter(context) { } tagIdx = 1 if(ruli_tr.getElementsByTag("a").size > tagIdx) { title = aTags.get(tagIdx).text() } + if (title.isNullOrBlank()) { + val link: org.jsoup.nodes.Element? = ruli_tr.selectFirst("a.subject_link.deco") + if (link != null) { + title = link.ownText().trim() + } + } tagIdx = 2 if(ruli_tr.getElementsByTag("a").size > tagIdx) { desc = aTags.get(tagIdx).text().plus(" / ") } tagIdx = 3 @@ -57,6 +62,7 @@ class RuliWebGetter(context: Context) : BaseGetter(context) { } } } + Blog.LOGE("RULIWEB ${temp.size}") } @SuppressLint("RestrictedApi") @@ -65,7 +71,7 @@ class RuliWebGetter(context: Context) : BaseGetter(context) { RssDataType.RULIWEB.isOn { try { Blog.LOGE("realWork() ${this::class.simpleName}") - val testUrl2 = arrayListOf("https://bbs.ruliweb.com/best/humor_only","https://bbs.ruliweb.com/best/humor_only/now?m=humor_only&t=default&page=2") + val testUrl2 = arrayListOf("https://bbs.ruliweb.com/best/humor_only/now?range=24h","https://bbs.ruliweb.com/best/humor_only/now?range=24h&page=2") testUrl2.forEach { url -> Jsoup.connect(url).timeout(5000).ignoreHttpErrors(true) .userAgent(USAGT) diff --git a/app/src/main/kotlin/bums/lunatic/launcher/workers/TaskAggregator.kt b/app/src/main/kotlin/bums/lunatic/launcher/workers/TaskAggregator.kt index e7392442..2ab6dadd 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/workers/TaskAggregator.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/workers/TaskAggregator.kt @@ -94,6 +94,7 @@ object TaskAggregator { // 병렬로 네트워크 요청 쏘기 (시간 획기적으로 단축됨) val jobs = listOf( async { RuliWebGetter(context).fetchData() }, + async { TheQooGetter(context).fetchData() }, async { YoutubeGetter(context).fetchData() }, async { DCGetter(context).fetchData() }, async { FmKoreaGetter(context).fetchData() }, diff --git a/app/src/main/kotlin/bums/lunatic/launcher/workers/TheQooGetter.kt b/app/src/main/kotlin/bums/lunatic/launcher/workers/TheQooGetter.kt index 57603ab6..c46a4d01 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/workers/TheQooGetter.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/workers/TheQooGetter.kt @@ -8,6 +8,7 @@ import bums.lunatic.launcher.model.TheQoo import bums.lunatic.launcher.model.getHref import bums.lunatic.launcher.model.getRssData import bums.lunatic.launcher.model.getT +import bums.lunatic.launcher.utils.Blog import io.realm.kotlin.types.RealmObject import org.jsoup.Jsoup @@ -18,7 +19,7 @@ class TheQooGetter(context: Context) : BaseGetter(context) { fun parseTQoo(tq_tr : org.jsoup.nodes.Element) { -// BLog.LOGE("tq_tr >>>> ${tq_tr}") + Blog.LOGE("tq_tr >>>> ${tq_tr}") var desc = tq_tr.getElementsByClass("cate").getT() var title = tq_tr.getElementsByClass("title").getT() var pageLink = tq_tr.getElementsByTag("a").getHref() @@ -53,17 +54,18 @@ class TheQooGetter(context: Context) : BaseGetter(context) { override fun realWork(): List { RssDataType.THEQOO.isOn { try { - val testUrl2 = arrayListOf("https://theqoo.net/hot","https://theqoo.net/hot/category/512000937","https://theqoo.net/hot/category/24784","https://theqoo.net/hot/category/24788") - testUrl2.forEach { url -> - Jsoup.connect(url) - .userAgent(USAGT) - .get().let { ruli -> -// BLog.LOGE("test ${testUrl2} >> ${ruli.title()}") - ruli.getElementsByTag("tr").forEach { ruli_tr -> - parseTQoo(ruli_tr) - } - } - } +// val testUrl2 = arrayListOf("https://theqoo.net/hot") +// testUrl2.forEach { url -> +// Jsoup.connect(url) +// .userAgent(USAGT) +// .get().let { ruli -> +// Blog.LOGE("THEQOO url ${url} >> ${ruli.title()} ${ruli.getElementsByTag("tr").text()}") +// +// ruli.getElementsByTag("tr").forEach { ruli_tr -> +// parseTQoo(ruli_tr) +// } +// } +// } } catch (e:Exception){e.printStackTrace()}} return temp } diff --git a/app/src/main/res/layout/settings_todo.xml b/app/src/main/res/layout/settings_todo.xml index a00b6bc9..cf8ba282 100644 --- a/app/src/main/res/layout/settings_todo.xml +++ b/app/src/main/res/layout/settings_todo.xml @@ -54,12 +54,7 @@ android:text="newsfeed" style="@style/tableItem" android:layout_height="wrap_content"/> - +