Merge branch 'main' into http4sGen

davenverse · Nov 19, 2021 · 2d86618 · 2d86618
2 parents bc3842c + e85898c
commit 2d86618
Showing 1 changed file with 16 additions and 29 deletions.
diff --git a/core/src/main/scala/io/chrisdavenport/curly/Main.scala b/core/src/main/scala/io/chrisdavenport/curly/Main.scala
@@ -2,36 +2,24 @@ package io.chrisdavenport.curly
 
 import cats.effect._
 import cats.syntax.all._
-import cats.ApplicativeError
-import org.http4s.Request
-import io.chrisdavenport.curly.Curly.Opt
-import io.chrisdavenport.curly.Curly.Unhandled
+import cats.parse.Rfc5234.{alpha, sp}
+import cats.parse.Rfc5234
+import cats.parse.{Parser => P, Parser0 => P0}
 
 object Main extends IOApp {
 
+  def debugParse[A](p: P0[A], s: String): IO[Unit] = {
+    val res = p.parseAll(s)
+    val warn = res match {
+      case Left(err) => IO.println(s + "\n" + ("-" * err.failedAtOffset) + "^")
+      case _ => IO.unit
+    }
+    warn *> IO.println(res)
+  }
+
   def run(args: List[String]): IO[ExitCode] = {
     val x = "curl 'https://linux.die.net/man/1/curl' -H 'User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:94.0) Gecko/20100101 Firefox/94.0' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8' -H 'Accept-Language: en-US,en;q=0.5' --compressed -H 'Referer: https://www.google.com/' -H 'Connection: keep-alive' -H 'Cookie: u=0ZfsEl8jjh6BR0aoAw9hAg==' -H 'Upgrade-Insecure-Requests: 1' -H 'Sec-Fetch-Dest: document' -H 'Sec-Fetch-Mode: navigate' -H 'Sec-Fetch-Site: cross-site' -H 'Sec-Fetch-User: ?1' -H 'Cache-Control: max-age=0'"
-    // val x = "curl -H 'foo:bar' 'https://localhost:8080/'"
-    // val p = Curly.opts.parse("--header 'foo'")
-    // val opt = Curly.OptC('H'.some, "header", true)
-    // val i = "'https://localhost:8080/'"
-    // val p = Curly.opts.parse("-H 'foo'")
-    // val p = Curly.uri.parse(i)
-    // val p = (Curly.curl *> Curly.uri ~ Curly.opts).parse(x)
-    val p = Curly.all.parseAll(x).leftMap(e => new Throwable(s"$e"))
-
-    for {
-      opts <- p.liftTo[IO]
-      (req, s) <- CurlyHttp4s.fromOpts[IO](opts)
-      _ <- IO.println(s)
-      // _ <- IO.print(s.asCurl(_ => false))
-      // _ <- IO.println("")
-      // _ <- org.http4s.ember.client.EmberClientBuilder.default[IO].build.use(client => 
-      //   client.expect[String](s.covary[IO]).flatMap(s => IO.println(s.take(300))) 
-      // )
-    } yield ExitCode.Success
-
-    // IO(println(p)).as(ExitCode.Success)
+    debugParse(Curly.all, x).as(ExitCode.Success)
   }
 
 }
@@ -42,10 +30,6 @@ object Curly {
   case class Flag(option: String) extends Component
   case class Opt(option: String, value: String) extends Component
   case class Unhandled(value: String) extends Component
-
-  import cats.parse.Rfc5234.{alpha, sp}
-  import cats.parse.Rfc5234
-  import cats.parse.{Parser => P, Parser0 => P0}
 
 
   val curl = sp.? *> P.ignoreCase("curl") *> sp
@@ -232,6 +216,9 @@ object CurlyHttp4s {
   import cats._
   import org.http4s._
   import fs2.Pure
+  import Curly._
+
+
   def fromOpts[F[_]: MonadThrow](opts: List[Curly.Component]): F[(Request[Pure], String)] = {
     val method = opts.collectFirst{
       case Opt("request", value) => Method.fromString(value)