arcanis/ffxivbis
1
0
Fork 0
mirror of https://github.com/arcan1s/ffxivbis.git synced 2025-07-15 06:45:49 +00:00
Code Issues Projects Releases Wiki Activity

identify url in runtime

Browse Source
This commit is contained in:
Evgenii Alekseev
2020-11-26 23:43:14 +03:00
parent 534ed98459
commit 25b05aa289
10 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/reference.conf
View File

@ -1,7 +1,5 @@
me.arcanis.ffxivbis {
bis-provider {
# either use ariyala or etro
use-etro = no
# xivapi base url, string, required
xivapi-url = "https://xivapi.com"
# xivapi developer key, string, optional

4
src/main/scala/me/arcanis/ffxivbis/Application.scala
View File

@ -34,9 +34,7 @@ class Application extends Actor with StrictLogging {
Migration(config).onComplete {
case Success(_) =>
val useEtro = config.getBoolean("me.arcanis.ffxivbis.bis-provider.use-etro")
val bisProvider = context.system.actorOf(BisProvider.props(useEtro), "bis-provider")
val bisProvider = context.system.actorOf(BisProvider.props, "bis-provider")
val storage = context.system.actorOf(DatabaseImpl.props, "storage")
val party = context.system.actorOf(PartyService.props(storage), "party")
val http = new RootEndpoint(context.system, party, bisProvider)

2
src/main/scala/me/arcanis/ffxivbis/service/bis/Ariyala.scala
View File

@ -14,7 +14,7 @@ import spray.json.{JsNumber, JsObject, JsString, deserializationError}
import scala.concurrent.{ExecutionContext, Future}
trait Ariyala {
object Ariyala {
def idParser(job: Job.Job, js: JsObject)
(implicit executionContext: ExecutionContext): Future[Map[String, Long]] =

19
src/main/scala/me/arcanis/ffxivbis/service/bis/BisProvider.scala
View File

@ -19,11 +19,7 @@ import spray.json._
import scala.concurrent.{ExecutionContext, Future}
abstract class BisProvider extends Actor with XivApi with StrictLogging {
def idParser(job: Job.Job, js: JsObject)
(implicit executionContext: ExecutionContext): Future[Map[String, Long]]
def uri(root: Uri, id: String): Uri
class BisProvider extends Actor with XivApi with StrictLogging {
override def receive: Receive = {
case BisProvider.GetBiS(link, job) =>
@ -40,15 +36,20 @@ abstract class BisProvider extends Actor with XivApi with StrictLogging {
val url = Uri(link)
val id = Paths.get(link).normalize.getFileName.toString
sendRequest(uri(url, id), BisProvider.parseBisJsonToPieces(job, idParser, getPieceType))
val (idParser, uri) =
if (url.authority.host.address().contains("etro")) {
(Etro.idParser(_, _), Etro.uri(url, id))
} else {
(Ariyala.idParser(_, _), Ariyala.uri(url, id))
}
sendRequest(uri, BisProvider.parseBisJsonToPieces(job, idParser, getPieceType))
}
}
object BisProvider {
def props(useEtro: Boolean): Props =
if (useEtro) Props(new BisProvider with Etro)
else Props(new BisProvider with Ariyala)
def props: Props = Props(new BisProvider)
case class GetBiS(link: String, job: Job.Job)

2
src/main/scala/me/arcanis/ffxivbis/service/bis/Etro.scala
View File

@ -14,7 +14,7 @@ import spray.json.{JsNumber, JsObject}
import scala.concurrent.{ExecutionContext, Future}
trait Etro {
object Etro {
def idParser(job: Job.Job, js: JsObject)
(implicit executionContext: ExecutionContext): Future[Map[String, Long]] =