X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.fileimport%2Fscl%2FDropins%2FCore.scl;h=b795abbcc5cf6735ed1be906a3b50eab5f62a0bd;hp=7fdcefebc84f91b42b463aa0269cb1a7145924e7;hb=0d82e7808541ed486f6027a28038d44d2d93711a;hpb=b809a171b6dfb81ed9ef9e84870dcbcbc5912f0e

diff --git a/bundles/org.simantics.fileimport/scl/Dropins/Core.scl b/bundles/org.simantics.fileimport/scl/Dropins/Core.scl
index 7fdcefebc..b795abbcc 100644
--- a/bundles/org.simantics.fileimport/scl/Dropins/Core.scl
+++ b/bundles/org.simantics.fileimport/scl/Dropins/Core.scl
@@ -1,13 +1,25 @@
-import "MMap" as MMap
-
-importJava "org.simantics.fileimport.scl.DropinsSCL" where
-    watchDropinsFolder :: () -> <Proc> ()
-    unwatchDropinsFolder :: () -> <Proc> ()
-    uploadToDropinsBase64 :: String -> String -> <Proc> ()
-    getUploadedFiles :: () -> <Proc> MMap.T String Long
-    removeFileForId :: Long -> <Proc> ()
-
-getUploadedDropinFiles :: () -> <Proc> [Long]
-getUploadedDropinFiles dummy = do
-    files = getUploadedFiles ()
+import "Simantics/DB"
+import "MMap" as MMap
+
+importJava "org.simantics.fileimport.scl.DropinsSCL" where
+    watchDropinsFolder :: () -> <Proc> ()
+    unwatchDropinsFolder :: () -> <Proc> ()
+    uploadToDropinsBase64 :: String -> String -> <Proc> ()
+    getUploadedFiles :: () -> <Proc> MMap.T String Long
+    removeFileForId :: Long -> <Proc> ()
+
+
+importJava "org.simantics.fileimport.FileImportService" where
+    performFileImport :: String -> String -> <Proc> String
+    importGenericFileWithExtension :: String -> String -> <Proc> String
+    importGenericFileWithExtensionAndParent :: Resource -> String -> String -> <Proc> Resource
+
+importGenericFileToResource :: String -> String -> <Proc> Resource
+importGenericFileToResource path extension = do
+    resourceId = importGenericFileWithExtension path extension
+    syncRead (\_ -> resourceFromId (read resourceId :: Long))
+
+getUploadedDropinFiles :: () -> <Proc> [Long]
+getUploadedDropinFiles dummy = do
+    files = getUploadedFiles ()
     MMap.values files
\ No newline at end of file