use Booru trait

pat36 · Jun 27, 2020 · 2d37f72 · 2d37f72
1 parent 39e6314
commit 2d37f72
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 63 deletions.
diff --git a/src/main/scala/libbooru/boorus/Danbooru.scala b/src/main/scala/libbooru/boorus/Danbooru.scala
@@ -1,17 +1,13 @@
 package ovh.fandemonium.libbooru
 
 import java.net.{MalformedURLException, URL}
-import java.io.File
 import java.io.FileWriter
 import java.io.IOException
-import java.nio.file.{Paths, Files}
 import scala.xml.XML
 import scala.collection.mutable.ArrayBuffer
 import scala.io.Source
-import sys.process._
-import scala.language.postfixOps
 
-object Danbooru {
+object Danbooru extends Booru {
     def getFiles(tags: Array[String], limit: Int): Any = {
         val files = Danbooru.getFilesLinks(tags, limit)
 
@@ -45,14 +41,4 @@ object Danbooru {
 
         posts_arr.toArray
     }
-
-    def downloadFile(url: String, name: String): String = {
-        val directory = Paths.get(".").toAbsolutePath + "/img/"
-        if(!new File(directory).exists) {
-            new File(directory).mkdir
-        }
-        val filename = directory  + name
-        new URL(url) #> new File(filename) !!;
-        filename
-    }
 }
diff --git a/src/main/scala/libbooru/boorus/Gelbooru.scala b/src/main/scala/libbooru/boorus/Gelbooru.scala
@@ -1,17 +1,13 @@
 package ovh.fandemonium.libbooru
 
-import java.net.URL
-import java.io.File
+import java.net.{MalformedURLException, URL}
 import java.io.FileWriter
 import java.io.IOException
-import java.nio.file.{Paths, Files}
 import scala.xml.XML
 import scala.collection.mutable.ArrayBuffer
 import scala.io.Source
-import sys.process._
-import scala.language.postfixOps
 
-object Gelbooru {
+object Gelbooru extends Booru {
     def getFiles(tags: Array[String], limit: Int): Any = {
         val files = Gelbooru.getFilesLinks(tags, limit)
 
@@ -29,26 +25,20 @@ object Gelbooru {
         val posts = xml\"post"
 
         for(post <- posts) {
-            val url = post\@"file_url"
-            val tags = post\@"tags"
-            val md5 = post\@"md5"
-            val url_segments = new URL(url).getFile.split("/")
-            val name = url_segments(url_segments.length - 1)
-            val post_map = Map("url" -> url, "tags" -> tags, "md5" -> md5, "name" -> name)
-
-            posts_arr += post_map
+            try {
+                val url = post\@"file_url"
+                val tags = post\@"tags"
+                val md5 = post\@"md5"
+                val url_segments = new URL(url).getFile.split("/")
+                val name = url_segments(url_segments.length - 1)
+                val post_map = Map("url" -> url, "tags" -> tags, "md5" -> md5, "name" -> name)
+
+                posts_arr += post_map
+            } catch {
+                case e: MalformedURLException => println("couldn't download file")
+            }
         }
 
         posts_arr.toArray
     }
-
-    def downloadFile(url: String, name: String): String = {
-        val directory = Paths.get(".").toAbsolutePath + "/img/"
-        if(!new File(directory).exists) {
-            new File(directory).mkdir
-        }
-        val filename = directory  + name
-        new URL(url) #> new File(filename) !!;
-        filename
-    }
 }
diff --git a/src/main/scala/libbooru/boorus/Safebooru.scala b/src/main/scala/libbooru/boorus/Safebooru.scala
@@ -1,17 +1,13 @@
 package ovh.fandemonium.libbooru
 
-import java.net.URL
-import java.io.File
+import java.net.{MalformedURLException, URL}
 import java.io.FileWriter
 import java.io.IOException
-import java.nio.file.{Paths, Files}
 import scala.xml.XML
 import scala.collection.mutable.ArrayBuffer
 import scala.io.Source
-import sys.process._
-import scala.language.postfixOps
 
-object Safebooru {
+object Safebooru extends Booru {
     def getFiles(tags: Array[String], limit: Int): Any = {
         val files = Safebooru.getFilesLinks(tags, limit)
 
@@ -29,26 +25,20 @@ object Safebooru {
         val posts = xml\"post"
 
         for(post <- posts) {
-            val url = post\@"file_url"
-            val tags = post\@"tags"
-            val md5 = post\@"md5"
-            val url_segments = new URL(url).getFile.split("/")
-            val name = url_segments(url_segments.length - 1)
-            val post_map = Map("url" -> url, "tags" -> tags, "md5" -> md5, "name" -> name)
-
-            posts_arr += post_map
+            try {
+                val url = post\@"file_url"
+                val tags = post\@"tags"
+                val md5 = post\@"md5"
+                val url_segments = new URL(url).getFile.split("/")
+                val name = url_segments(url_segments.length - 1)
+                val post_map = Map("url" -> url, "tags" -> tags, "md5" -> md5, "name" -> name)
+
+                posts_arr += post_map
+            } catch {
+                case e: MalformedURLException => println("couldn't download file")
+            }
         }
 
         posts_arr.toArray
     }
-
-    def downloadFile(url: String, name: String): String = {
-        val directory = Paths.get(".").toAbsolutePath + "/img/"
-        if(!new File(directory).exists) {
-            new File(directory).mkdir
-        }
-        val filename = directory  + name
-        new URL(url) #> new File(filename) !!;
-        filename
-    }
 }