Skip to content

軽微なリファクタ #1

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

Open
mikrogeophagus wants to merge 4 commits into
base: main
Choose a base branch
from
Open

軽微なリファクタ #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f7e102
scala.collection.Seq のインポートを削除
mikrogeophagus Nov 22, 2025
bdb687d
Message をシールドトレイトに変更
mikrogeophagus Nov 22, 2025
1116aca
DownloadSuccess と DownloadFailure をケースオブジェクトに変更
mikrogeophagus Nov 22, 2025
2dedbe8
with を , に変更
mikrogeophagus Nov 22, 2025
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
4 changes: 1 addition & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import scala.collection.Seq

ThisBuild / version := "0.1.0-SNAPSHOT"

ThisBuild / scalaVersion := "3.3.1"
Expand All @@ -16,4 +14,4 @@ libraryDependencies ++= Seq(
"com.squareup.okhttp3" % "okhttp" % "4.12.0",
"com.typesafe" % "config" % "1.4.3",
"ch.qos.logback" % "logback-classic" % "1.5.18"
)
)
8 changes: 4 additions & 4 deletions src/main/scala/jp/co/dwango/urlslistmaker/Message.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package jp.co.dwango.urlslistmaker

trait Message
sealed trait Message

sealed trait SupervisorMessage extends Message
case object Start extends SupervisorMessage
case object Finished extends SupervisorMessage
case class DownloadSuccess() extends SupervisorMessage
case class DownloadFailure() extends SupervisorMessage
case object DownloadSuccess extends SupervisorMessage
case object DownloadFailure extends SupervisorMessage

sealed trait UrlsFileLoaderMessage extends Message
case object LoadUrlsFile extends UrlsFileLoaderMessage

sealed trait WebPageLoaderMessage extends Message

case class WebPageUrl(domain: String)
extends WebPageLoaderMessage with SupervisorMessage
extends WebPageLoaderMessage, SupervisorMessage
4 changes: 2 additions & 2 deletions src/main/scala/jp/co/dwango/urlslistmaker/Supervisor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ object Supervisor:
router ! url
Behaviors.same

case DownloadSuccess() =>
case DownloadSuccess =>
successCount += 1
logAndCheckFinish()
Behaviors.same

case DownloadFailure() =>
case DownloadFailure =>
failureCount += 1
logAndCheckFinish()
Behaviors.same
Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/jp/co/dwango/urlslistmaker/WebPageLoader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object WebPageLoader:

client.newCall(request).enqueue(new Callback:
override def onFailure(call: Call, e: IOException): Unit =
supervisor ! DownloadFailure() // 通信自体が失敗
supervisor ! DownloadFailure // 通信自体が失敗

override def onResponse(call: Call, response: Response): Unit =
try
Expand All @@ -49,10 +49,10 @@ object WebPageLoader:
StandardOpenOption.APPEND
)
match
case Success(_) => supervisor ! DownloadSuccess()
case Failure(_) => supervisor ! DownloadFailure() // 書き込み失敗
case Success(_) => supervisor ! DownloadSuccess
case Failure(_) => supervisor ! DownloadFailure // 書き込み失敗
else
supervisor ! DownloadFailure() // HTTP ステータスが失敗
supervisor ! DownloadFailure // HTTP ステータスが失敗
finally
response.close()
)
Expand Down