Compare commits

..
Author SHA1 Message Date
r-ca 3205923eb5 修正 2024-01-08 15:15:12 +09:00
r-ca 441479d9b9 デバッグ実装 2024-01-08 15:13:58 +09:00
r-ca 099d900ffd close処理を実装 2024-01-08 15:11:54 +09:00
r-ca 080e86d05d デバッグ処理実装 2024-01-08 15:11:28 +09:00
r-ca 6d6f4790a0 ページを修正 2024-01-08 15:09:48 +09:00
r-ca 1a31d63786 Currentの確認処理を修正 2024-01-08 15:09:17 +09:00
r-ca ce834a7cfd Currentを確認するメソッド追加 2024-01-08 15:06:33 +09:00
r-ca f7b8006fa4 保存ロジック修正 2024-01-08 14:42:29 +09:00
r-ca 5bb2f0d387 修正漏れ 2024-01-08 14:37:50 +09:00
r-ca e54cc07e9d ファイルマネージャーを共用するように 2024-01-08 14:37:10 +09:00
r-ca bc5d0edd68 unused警告を無効に 2024-01-08 12:52:45 +09:00
r-ca 3540f20c46 ログ追加 2024-01-08 12:52:10 +09:00
r-ca 164b6ea6d4 ログ追加 2024-01-08 12:50:44 +09:00
r-ca 8fdefb9850 Logger追加 2024-01-08 12:50:26 +09:00
r-ca 8e4018beb0 必要のなかった戻り値を削除 2024-01-08 12:49:52 +09:00
r-ca ddd2b097e6 import整理 2024-01-08 12:48:20 +09:00
r-ca 9fe646fad8 import整理 2024-01-08 12:48:04 +09:00
r-ca 5e1d1f6a76 書き換えない変数をfinalに 2024-01-08 12:47:39 +09:00
r-ca 649d6ccfdc ログ修正 2024-01-08 12:46:42 +09:00
r-ca dccb3090e1 Merge branch 'common/improve_logger' into source/add_files_refactor1 2024-01-08 12:43:58 +09:00
r-ca de4a501c3f Revert "KeyValueログモデル作成"
This reverts commit b75759b650.
2024-01-08 12:43:49 +09:00
r-ca 28b5f97c31 Revert "移動"
This reverts commit 3453d224e1.
2024-01-08 12:43:49 +09:00
r-ca 4656914203 Revert "Key-Valueなログを出力しやすくした"
This reverts commit a439bbd888.
2024-01-08 12:43:48 +09:00
r-ca 1996d8dc4a Revert "修正"
This reverts commit 3b6d88bafd.
2024-01-08 12:43:48 +09:00
r-ca dec4983bfc 移動 2024-01-08 12:43:31 +09:00
r-ca 88dfae7d37 KeyValueログモデル作成 2024-01-08 12:43:30 +09:00
r-ca 48101190a2 修正 2024-01-08 12:43:21 +09:00
r-ca 2b79c7669f Key-Valueなログを出力しやすくした 2024-01-08 12:43:21 +09:00
r-ca 3b6d88bafd 修正 2024-01-08 12:41:10 +09:00
r-ca a439bbd888 Key-Valueなログを出力しやすくした 2024-01-08 12:39:37 +09:00
r-ca 3453d224e1 移動 2024-01-08 12:36:39 +09:00
r-ca b75759b650 KeyValueログモデル作成 2024-01-08 12:35:30 +09:00
r-ca a78cac8178 リファクタリング 2024-01-08 12:29:24 +09:00
r-ca a42ef8f4fc 改行の訂正 2024-01-08 12:27:00 +09:00
r-ca 5c16ea6e21 メタデータの書き込みに対応 2024-01-08 12:23:48 +09:00
r-ca f000addbce Documentオブジェクト読み込みメソッド作成 2024-01-08 12:20:12 +09:00
r-ca 73fa8201d6 Documentオブジェクト保存メソッド作成 2024-01-08 12:17:16 +09:00
r-ca 5c0fd4fdbb WIP Documentオブジェクト保存メソッド作成 2024-01-08 12:16:03 +09:00
r-ca 6e514b216a パーサー作り直し 2024-01-08 12:14:23 +09:00
r-ca 59ba2cdcfc WIP 2024-01-08 12:03:26 +09:00
r-ca b3be0b9e21 Initメソッド作り直し 2024-01-08 12:00:22 +09:00
r-ca a836410cbd ファイルにStringを保存するメソッド作成 2024-01-08 11:56:24 +09:00
r-ca 15d454690e ファイルにStringを保存するメソッド作成 WIP 2024-01-08 11:54:13 +09:00
r-ca 2ba243ea4a ファイルの中身をStringで読み出すメソッド作成 2024-01-08 11:48:17 +09:00
r-ca 52657fdbbd ファイルを取得するメソッド作成 2024-01-08 11:42:58 +09:00
r-ca 88cd58f920 いくつかのメソッドで対応する引数を増やした 2024-01-08 11:38:05 +09:00
r-ca 1ee0a1b8ea ファイル名から検索するメソッドを追加 2024-01-08 11:35:09 +09:00
r-ca 656482e968 一気に移動する処理を作成 WIP 2024-01-08 11:32:46 +09:00
r-ca efc16423d4 ログ 2024-01-08 11:30:48 +09:00
r-ca 38db65c9d3 挙動修正 2024-01-08 11:30:30 +09:00
r-ca 31a0220b90 Currentまでを自動で作成するメソッドを作成 2024-01-08 11:27:59 +09:00
r-ca 5cb57997b8 WIP 2024-01-08 11:27:09 +09:00
r-ca 0fade2c41b ファイルマネージャにメソッド追加, 微修正 2024-01-08 11:26:18 +09:00
r-ca 5a0b215626 ファイルマネージャにメソッド追加 WIP 2024-01-08 11:24:29 +09:00
r-ca 49775a1f49 WIP 2024-01-08 11:23:06 +09:00
r-ca 552f0e42b5 親ディレクトリが不足している場合は作成するように WIP 2024-01-08 11:19:05 +09:00
r-ca b8e70cd015 ログポイント追加 2024-01-08 11:14:48 +09:00
r-ca 67350639c7 ファイル作成/削除を追加 WIP 2024-01-08 11:12:51 +09:00
r-ca eb6a13baba ボタン追加WIP 2024-01-08 11:00:55 +09:00
r-ca bd0a16bec6 ボタン追加WIP 2024-01-08 10:56:33 +09:00
r-ca 1019b1d035 init処理を追加 2024-01-08 10:54:46 +09:00
r-ca 2f0460a9ea サンプルにパスを追加 2024-01-08 10:53:20 +09:00
r-ca 2b4a24de7c クラス変数作成 2024-01-08 10:51:39 +09:00
r-ca b683c311df クラス変数作成 2024-01-08 10:51:10 +09:00
r-ca 4bbb119729 Listで追加するメソッドを実装 2024-01-08 10:50:31 +09:00
r-ca 8c714d5193 修正 2024-01-08 09:52:19 +09:00
r-ca f441a957f7 pluginにHiltを追加 2024-01-07 19:37:38 +09:00
r-ca dfe5c36e9e リファクタリング 2024-01-07 19:36:49 +09:00
r-ca c54967f016 WIP 2024-01-07 19:22:57 +09:00
r-ca 95beda8cc2 WIP 2024-01-07 18:07:43 +09:00
r-ca 02d72ffa68 グローバル変数作成 2024-01-07 18:04:07 +09:00
r-ca b159db97bb サンプルを生成するメソッド作成 2024-01-07 18:03:33 +09:00
r-ca 1653da9c94 依存関係に追加 2024-01-07 18:01:33 +09:00
r-ca 1b00f2c64e WIP 2024-01-07 18:00:40 +09:00
r-ca de668412fc WIP 2024-01-07 17:55:39 +09:00
r-ca 07042f4e91 リスナー作成 いろいろ 2024-01-07 17:52:56 +09:00
r-ca 78c36df105 レイアウト修正 2024-01-07 17:52:17 +09:00
r-ca 14837f83cc 依存関係追加 2024-01-07 17:48:44 +09:00
r-ca 4fd490ee12 Factory作成 2024-01-07 17:47:47 +09:00
r-ca d453c0705f import 2024-01-07 17:44:42 +09:00
r-ca aca90aa6e1 依存関係に追加 2024-01-07 16:38:12 +09:00
r-ca f52d00f930 リスナー追加 2024-01-07 16:37:07 +09:00
r-ca 9b70adecac レイアウト修正 WIP 2024-01-07 16:36:19 +09:00
r-ca 80c5bca179 WIP 2024-01-07 16:32:44 +09:00
r-ca 0a639d4b05 レイアウト修正 2024-01-07 16:30:57 +09:00
r-ca 3ed6f7b5a6 テーマをインポート 2024-01-07 16:29:22 +09:00
r-ca f86dc981b4 レイアウト修正 WIP 2024-01-07 16:28:33 +09:00
r-ca c9eda4837b いろいろ 2024-01-07 16:26:46 +09:00
r-ca 4d72fc10bf 引数の処理を削除 2024-01-07 16:25:38 +09:00
r-ca c9a594763d デバッグ用フラグメント作成 2024-01-07 16:25:04 +09:00
r-ca 5a93b79b07 依存関係追加 2024-01-07 16:23:33 +09:00
r-ca 8a5cbe7b18 メタデータのパース処理実装 WIP 2023-12-25 15:51:11 +09:00
r-ca ca153f5602 Injectできるように 2023-12-25 15:45:42 +09:00
r-ca 73f553cff3 パーサーを依存関係に追加 2023-12-25 15:44:15 +09:00
r-ca bd1a1d56cb XMLMetaのパーサーを作成 Impl WIP 2023-12-25 15:43:03 +09:00
r-ca b98fa18cae XMLMetaのパーサーを作成 Impl WIP 2023-12-25 15:34:17 +09:00
r-ca 4875394417 XMLMetaのパーサーを作成 Repository WIP 2023-12-25 15:33:56 +09:00
r-ca b675e7ffa9 XMLMetaのパーサーを作成 WIP 2023-12-25 15:32:57 +09:00
r-ca 453fa4c4cf utilsの依存関係にmodelを追加 2023-12-25 15:31:39 +09:00
r-ca ce3565c082 依存修正 2023-12-25 15:31:10 +09:00
r-ca 523a66429e モデル移動 2023-12-25 15:30:13 +09:00
r-ca b7062a4942 一旦コメントアウト 2023-12-25 15:15:58 +09:00
r-ca 43c7f4ae0f 一旦コメントアウト 2023-12-25 15:15:55 +09:00
r-ca 77702b9da5 Revert "XMLメタデータを読み取るメソッド追加"
This reverts commit d2950ab781.
2023-12-25 15:14:09 +09:00
r-ca d2950ab781 XMLメタデータを読み取るメソッド追加 2023-12-25 15:13:55 +09:00
r-ca 4aefae6b51 XMLメタデータを読み取るメソッド追加 2023-12-25 15:07:00 +09:00
r-ca f2ed0515f8 モデルを移動 2023-12-25 15:05:49 +09:00
r-ca b30834479e initメソッド実装 WIP 2023-12-25 15:04:16 +09:00
r-ca aa0728e97b initメソッド作成 2023-12-25 15:03:04 +09:00
r-ca 3affd2dd2f ログ追加 2023-12-25 15:00:14 +09:00
r-ca 9534e36a9d LoggerをInjectした 2023-12-25 14:57:21 +09:00
r-ca 3bfcc9fd63 close()を追加 WIP 2023-12-25 14:55:02 +09:00
r-ca e3186249a0 XmlMetaProcessor廃止 2023-12-25 14:53:12 +09:00
23 changed files with 847 additions and 81 deletions

No files matched your search

+9
View File
@@ -1,5 +1,6 @@
plugins {
alias(libs.plugins.com.android.library)
id 'com.google.dagger.hilt.android'
}
android {
@@ -33,8 +34,16 @@ dependencies {
androidTestImplementation libs.androidx.test.ext.junit
androidTestImplementation libs.androidx.test.espresso.core
// Hilt (DI)
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
implementation 'com.websitebeaver:documentscanner:1.0.0'
implementation project(':shared:ui')
implementation project(':model')
implementation project(':processor')
implementation project(':utils')
}
@@ -25,15 +25,32 @@ import android.widget.Toast;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import java.util.UUID;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.processor.DocumentProcessor;
import one.nem.lacerta.processor.factory.DocumentProcessorFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ScannerDataManagerStubFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ScannerDataManagerStubFragment extends Fragment {
// TODO-rca: 時間があったらcacheを使うようにする?
@@ -43,6 +60,19 @@ public class ScannerDataManagerStubFragment extends Fragment {
private Uri photoURI;
private DocumentDetail documentDetail;
private DocumentProcessor documentProcessor;
@Inject
DocumentProcessorFactory documentProcessorFactory;
@Inject
LacertaLogger logger;
@Inject
DeviceInfoUtils deviceInfoUtils;
private final ActivityResultLauncher<Intent> cameraLauncher = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
result -> {
@@ -120,6 +150,65 @@ public class ScannerDataManagerStubFragment extends Fragment {
}
updateResults();
});
view.findViewById(R.id.button_create_documnent).setOnClickListener(v -> {
Log.d("ScannerDataManagerStubFragment", "button_create_documnent clicked");
Toast.makeText(getActivity(), "button_create_documnent clicked", Toast.LENGTH_LONG).show();
this.documentDetail = createSampleDocumentDetail();
});
view.findViewById(R.id.button_init_document_processor).setOnClickListener(v -> {
Log.d("ScannerDataManagerStubFragment", "button_init_document_processor clicked");
Toast.makeText(getActivity(), "button_init_document_processor clicked", Toast.LENGTH_LONG).show();
// TODO-rca: ここでDocumentProcessorを初期化する
if (this.documentDetail == null) {
Toast.makeText(getActivity(), "documentDetail is null", Toast.LENGTH_LONG).show();
return;
}
this.documentProcessor = documentProcessorFactory.create(this.documentDetail);
Toast.makeText(getActivity(), "documentProcessor created", Toast.LENGTH_LONG).show();
this.documentProcessor.init();
Toast.makeText(getActivity(), "documentProcessor initialized", Toast.LENGTH_LONG).show();
});
view.findViewById(R.id.button_add_page).setOnClickListener(v -> {
Log.d("ScannerDataManagerStubFragment", "button_add_page clicked");
Toast.makeText(getActivity(), "button_add_page clicked", Toast.LENGTH_LONG).show();
if (this.documentProcessor == null) {
Toast.makeText(getActivity(), "documentProcessor is null", Toast.LENGTH_LONG).show();
return;
}
Bitmap[] bitmaps = new Bitmap[results.size()];
for (int i = 0; i < results.size(); i++) {
bitmaps[i] = results.get(i).getBitmap();
}
this.documentProcessor.addNewPagesToLast(bitmaps);
this.documentProcessor.close();
});
}
public DocumentDetail createSampleDocumentDetail() {
String id = UUID.randomUUID().toString();
Toast.makeText(getActivity(), "Generated id: " + id, Toast.LENGTH_LONG).show();
//logger.debug("CreateSample", "Generated id: " + id);
DocumentMeta meta = new DocumentMeta(
id,
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()),
new Date(),
new Date());
DocumentPath path = new DocumentPath(
deviceInfoUtils.getExternalStorageDirectoryString(),
"Sample" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()));
return new DocumentDetail(meta, path, "SampleAuthor", "SampleDefaultBranch");
}
@Override
@@ -11,6 +11,7 @@
android:id="@+id/action_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:weightSum="2"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -19,7 +20,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/button_call_camera"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
@@ -27,6 +28,58 @@
</LinearLayout>
<LinearLayout
android:id="@+id/init_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/action_button_container">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_create_documnent"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Create Doc Obj" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_init_document_processor"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Init Processor" />
</LinearLayout>
<LinearLayout
android:id="@+id/doc_button_container"
android:layout_width="match_parent"
android:layout_height="0dp"
android:weightSum="2"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/init_button_container">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_add_page"
style="@style/Widget.Material3.Button.IconButton.Filled"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16px"
android:layout_weight="1"
android:text="Add page to last" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/result_recycler_view"
android:layout_width="match_parent"
@@ -35,6 +88,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/action_button_container" />
app:layout_constraintTop_toBottomOf="@id/doc_button_container" />
</androidx.constraintlayout.widget.ConstraintLayout>
+3
View File
@@ -65,4 +65,7 @@ dependencies {
// Scanner
implementation project(':component:scanner')
// Processor
implementation project(':processor')
}
@@ -0,0 +1,44 @@
package one.nem.lacerta.feature.debug;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMenuDocProcessorTesterFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugMenuDocProcessorTesterFragment extends Fragment {
public DebugMenuDocProcessorTesterFragment() {
// Required empty public constructor
}
public static DebugMenuDocProcessorTesterFragment newInstance() {
DebugMenuDocProcessorTesterFragment fragment = new DebugMenuDocProcessorTesterFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_debug_menu_doc_processor_tester, container, false);
return view;
}
}
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Theme.Lacerta"
tools:context=".DebugMenuDocProcessorTesterFragment" >
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_gen_random_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Generate random image" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,7 +1,6 @@
package one.nem.lacerta.processor.model;
package one.nem.lacerta.model.document.internal;
import java.util.ArrayList;
import java.util.Date;
public class XmlMetaModel {
@@ -1,4 +1,4 @@
package one.nem.lacerta.processor.model;
package one.nem.lacerta.model.document.internal;
public class XmlMetaPageModel {
@@ -18,4 +18,7 @@ public interface DocumentProcessor {
Bitmap getPageAtIndex(int index);
int getPageCount();
void close();
void init();
}
@@ -1,10 +0,0 @@
package one.nem.lacerta.processor;
import one.nem.lacerta.processor.model.XmlMetaModel;
import one.nem.lacerta.processor.model.XmlMetaPageModel;
public interface XmlMetaProcessor {
void saveXmlMeta(XmlMetaModel xmlMetaModel);
XmlMetaModel loadXmlMeta();
}
@@ -1,4 +1,10 @@
package one.nem.lacerta.processor.factory;
public class DocumentProcessorFactory {
import dagger.assisted.AssistedFactory;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.processor.impl.DocumentProcessorImpl;
@AssistedFactory
public interface DocumentProcessorFactory {
DocumentProcessorImpl create(DocumentDetail documentDetail);
}
@@ -2,50 +2,131 @@ package one.nem.lacerta.processor.impl;
import android.graphics.Bitmap;
import java.io.File;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.UUID;
import javax.inject.Inject;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
import one.nem.lacerta.processor.DocumentProcessor;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.XmlMetaParser;
public class DocumentProcessorImpl implements DocumentProcessor{
// Magic Numbers
private static final String DEFAULT_SAVE_DIR = "raw";
private DocumentDetail documentDetail;
// Variables
private final DocumentDetail documentDetail;
private XmlMetaModel xmlMetaModel;
private Path documentRootPath;
private FileManager fileManager;
// Injection
@Inject
FileManagerFactory fileManagerFactory;
private final FileManagerFactory fileManagerFactory;
private final LacertaLogger logger;
private final XmlMetaParser xmlMetaParser;
@AssistedInject
public DocumentProcessorImpl(FileManagerFactory fileManagerFactory, LacertaLogger logger, XmlMetaParser xmlMetaParser, @Assisted DocumentDetail documentDetail) {
this.fileManagerFactory = fileManagerFactory;
this.logger = logger;
this.xmlMetaParser = xmlMetaParser;
if (documentDetail == null) {
throw new IllegalArgumentException("documentDetail must not be null");
}
this.documentDetail = documentDetail;
}
// Internal utils
@Override
public void init() {
logger.debug("init", "called");
// Init Variables
this.documentRootPath = this.documentDetail.getPath().getFullPath();
logger.debug("init", "documentRootPath: " + this.documentRootPath);
this.fileManager = fileManagerFactory.create(this.documentRootPath); //Initialize FileManager
logger.debug("init", "fileManager created");
this.fileManager.autoCreateDir(this.documentRootPath);
// rawディレクトリInit
this.fileManager.autoCreateDir(DEFAULT_SAVE_DIR);
// xmlファイルの読み込み
if (fileManager.isExist("meta.xml")) {
logger.debug("init", "meta.xml found");
try {
xmlMetaModel = xmlMetaParser.deserialize(this.fileManager.loadDocument("meta.xml"));
} catch (Exception e) {
logger.debug("init", "meta.xml parse failed");
logger.trace("init", e.getMessage());
}
} else {
logger.debug("init", "meta.xml not found");
xmlMetaModel = new XmlMetaModel();
xmlMetaModel.setTitle(this.documentDetail.getMeta().getTitle());
xmlMetaModel.setAuthor(this.documentDetail.getAuthor());
xmlMetaModel.setDescription(""); // FIXME-rca:
xmlMetaModel.setDefaultBranch(this.documentDetail.getDefaultBranch());
xmlMetaModel.setPages(new ArrayList<>());
try {
this.fileManager.saveDocument(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
logger.debug("init", "meta.xml saved");
} catch (Exception e) {
logger.error("init", "meta.xml save failed");
logger.trace("init", e.getMessage());
}
}
logger.info("init", "finished");
}
@Override
public void addNewPageToLast(Bitmap bitmap) {
Path path = documentDetail.getPath().getFullPath();
String fileName = String.format(UUID.randomUUID().toString() + ".png"); // TODO-rca: 対応表をもたせる
FileManager fileManager = fileManagerFactory.create(path);
if(fileManager.getList().contains(path.resolve(DEFAULT_SAVE_DIR))) {
fileManager.changeDir(DEFAULT_SAVE_DIR);
logger.debug("addNewPageToLast", "called");
String filename = UUID.randomUUID().toString() + ".png"; // TODO-rca: 拡張子を動的にする
// FileManager
if (this.fileManager.getCurrentDir().equals(this.documentRootPath.resolve(DEFAULT_SAVE_DIR))) { // TODO-rca: 効率化
logger.debug("addNewPageToLast", "currentDir is documentRootPath");
} else {
fileManager.createDir(DEFAULT_SAVE_DIR);
fileManager.changeDir(DEFAULT_SAVE_DIR);
logger.debug("addNewPageToLast", "currentDir is not documentRootPath");
this.fileManager.backRootDir();
this.fileManager.autoCreateDir(DEFAULT_SAVE_DIR);
this.fileManager.changeDir(DEFAULT_SAVE_DIR);
}
fileManager.saveBitmapAtCurrent(bitmap, fileName);
logger.debug("addNewPageToLast", "DirInit finished");
// Save file
this.fileManager.saveBitmapAtCurrent(bitmap, filename);
// Update meta
XmlMetaPageModel page = new XmlMetaPageModel();
page.setIndex(xmlMetaModel.getPages().size() + 1);
page.setFilename(filename);
xmlMetaModel.addPage(page);
}
@Override
public void addNewPagesToLast(Bitmap[] bitmaps) {
logger.debug("addNewPagesToLast", "called");
for (Bitmap bitmap : bitmaps) {
addNewPageToLast(bitmap);
} // TODO-rca: 効率悪いので改善する
}
@Override
@@ -77,4 +158,20 @@ public class DocumentProcessorImpl implements DocumentProcessor{
public int getPageCount() {
return 0;
}
@Override
public void close() {
logger.debug("close", "called");
// TODO-rca: ここでxmlファイルを保存する
this.fileManager.backRootDir();
try {
this.fileManager.saveDocument(xmlMetaParser.serialize(xmlMetaModel), "meta.xml");
logger.debug("close", "meta.xml saved");
} catch (Exception e) {
logger.error("close", "meta.xml save failed");
logger.trace("close", e.getMessage());
}
logger.info("close", "finished");
}
}
@@ -1,17 +0,0 @@
package one.nem.lacerta.processor.impl;
import one.nem.lacerta.processor.XmlMetaProcessor;
import one.nem.lacerta.processor.model.XmlMetaModel;
public class XmlMetaProcessorImpl implements XmlMetaProcessor{
@Override
public void saveXmlMeta(XmlMetaModel xmlMetaModel) {
}
@Override
public XmlMetaModel loadXmlMeta() {
return null;
}
}
@@ -1,4 +1,16 @@
package one.nem.lacerta.processor.module;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.model.document.DocumentDetail;
public class DocumentProcessorModule {
private final DocumentDetail documentDetail;
@AssistedInject
public DocumentProcessorModule(@Assisted DocumentDetail documentDetail) {
this.documentDetail = documentDetail;
}
}
@@ -2,26 +2,58 @@ package one.nem.lacerta.source.file;
import android.graphics.Bitmap;
import org.w3c.dom.Document;
import java.io.File;
import java.nio.file.Path;
import java.util.List;
/** @noinspection unused*/
public interface FileManager {
Path getRootDir();
Path getCurrentDir();
void changeDir(String dirName); //cd
void changeDir(Path path); //cd
void backDir(); //cd ..
void backRootDir(); //cd /
List<Path> getList();
void createDir(String dirName);
void createDir(Path path);
void removeDir(String dirName);
void removeDir(Path path);
File createFile(String fileName);
void removeFile(String fileName);
File getFile(String fileName);
File getFile(Path path);
String loadText(String fileName);
String loadText(Path path);
void saveText(String text, String fileName);
void saveText(String text, Path path);
void saveDocument(Document document, String fileName);
void saveDocument(Document document, Path path);
Document loadDocument(String fileName);
Document loadDocument(Path path);
boolean isExist(Path path);
boolean isExist(String fileName);
void autoCreateDir(Path path);
void autoCreateDir(String dirName);
void autoCreateToCurrentDir();
void saveBitmapAtCurrent(Bitmap bitmap, String fileName);
Bitmap loadBitmap(Path path);
void removeBitmap(Path path);
// void saveFileAtCurrent(File file);
// File getFile(Path path);
// void removeFile(Path path);
}
@@ -2,21 +2,30 @@ package one.nem.lacerta.source.file.impl;
import android.graphics.Bitmap;
import org.w3c.dom.Document;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.utils.LacertaLogger;
public class FileManagerImpl implements FileManager {
// RootDir
@@ -35,8 +44,12 @@ public class FileManagerImpl implements FileManager {
}
}
// Injection
private LacertaLogger logger;
@AssistedInject
public FileManagerImpl(@Assisted Path rootDir) {
public FileManagerImpl(LacertaLogger logger, @Assisted Path rootDir) {
this.logger = logger;
this.rootDir = rootDir;
this.currentDir = rootDir;
}
@@ -46,11 +59,27 @@ public class FileManagerImpl implements FileManager {
return rootDir;
}
@Override
public Path getCurrentDir() {
return currentDir;
}
@Override
public void changeDir(String dirName) {
this.currentDir = rootDir.resolve(dirName);
}
@Override
public void changeDir(Path path) {
if (path.startsWith(rootDir)) {
this.currentDir = path;
}
else {
logger.debug("changeDir", "invalid path: " + path);
// TODO-rca: 例外を投げる
}
}
@Override
public void backDir() {
this.currentDir = currentDir.getParent();
@@ -76,16 +105,227 @@ public class FileManagerImpl implements FileManager {
@Override
public void createDir(String dirName) {
currentDir.resolve(dirName).toFile().mkdir(); // TODO-rca: エラーハンドリング
//ディレクトリ作成
logger.debug("createDir", "called");
Path path = currentDir.resolve(dirName);
logger.debug("createDir", "path: " + path);
try {
Files.createDirectory(path);
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public void createDir(Path path) {
logger.debug("createDir", "called");
try {
Files.createDirectory(path);
} catch (IOException e) {
e.printStackTrace();
}
}
@Override
public void removeDir(String dirName) {
logger.debug("removeDir", "called");
currentDir.resolve(dirName).toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public void removeDir(Path path) {
logger.debug("removeDir", "called");
path.toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public File createFile(String fileName) {
logger.debug("createFile", "called");
return currentDir.resolve(fileName).toFile();
}
@Override
public void removeFile(String fileName) {
logger.debug("removeFile", "called");
currentDir.resolve(fileName).toFile().delete(); // TODO-rca: エラーハンドリング
}
@Override
public File getFile(String fileName) {
logger.debug("getFile", "called");
return currentDir.resolve(fileName).toFile();
}
@Override
public File getFile(Path path) {
logger.debug("getFile", "called");
return path.toFile();
}
@Override
public String loadText(String fileName) { // TODO-rca: 統合
try(FileInputStream fileInputStream = new FileInputStream(currentDir.resolve(fileName).toFile())) {
byte[] bytes = new byte[fileInputStream.available()];
fileInputStream.read(bytes); // TODO-rca: エラーハンドリング
return new String(bytes);
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
public String loadText(Path path) {
try(FileInputStream fileInputStream = new FileInputStream(path.toFile())) {
byte[] bytes = new byte[fileInputStream.available()];
fileInputStream.read(bytes); // TODO-rca: エラーハンドリング
return new String(bytes);
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
public void saveText(String text, String fileName) { // TODO-rca: リファクタリング // TODO-rca: 統合
if (isExist(fileName)) {
logger.debug("saveText", "file already exists");
// Overwrite
try {
Files.write(currentDir.resolve(fileName), text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
else {
try {
Files.createFile(currentDir.resolve(fileName));
Files.write(currentDir.resolve(fileName), text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveText(String text, Path path) {
if (isExist(path)) {
logger.debug("saveText", "file already exists");
// Overwrite
try {
Files.write(path, text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
else {
try {
Files.createFile(path);
Files.write(path, text.getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveDocument(Document document, String fileName) {
try {
TransformerFactory transformerFactory = TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
DOMSource source = new DOMSource(document);
File file = createFile(fileName);
StreamResult result = new StreamResult(file);
transformer.transform(source, result);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void saveDocument(Document document, Path path) {
// TODO-rca 実装する
}
@Override
public Document loadDocument(String fileName) {
try {
File file = getFile(fileName);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.parse(file);
return document;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
@Override
public Document loadDocument(Path path) {
// TODO-rca 実装する
return null;
}
@Override
public boolean isExist(Path path) {
logger.debug("isExist", "called");
return Files.exists(path);
}
@Override
public boolean isExist(String fileName) {
logger.debug("isExist", "called");
return Files.exists(currentDir.resolve(fileName));
}
@Override
public void autoCreateDir(Path path) {
logger.debug("autoCreateDir", "called");
if (!Files.exists(path)) {
try {
Files.createDirectories(path);
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void autoCreateDir(String dirName) {
logger.debug("autoCreateDir", "called");
if (!Files.exists(currentDir.resolve(dirName))) {
try {
Files.createDirectories(currentDir.resolve(dirName));
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void autoCreateToCurrentDir() {
logger.debug("autoGenerateToCurrentDir", "called");
if (isExist(currentDir)) {
logger.debug("autoGenerateToCurrentDir", "currentDir already exists");
return;
}
else {
try {
Files.createDirectories(currentDir);
} catch (IOException e) {
e.printStackTrace();
}
}
}
@Override
public void saveBitmapAtCurrent(Bitmap bitmap, String fileName) { // TODO-rca: ファイル形式を変更できるようにする?
logger.debug("saveBitmapAtCurrent", "called");
try {
File file = currentDir.resolve(fileName).toFile();
bitmap.compress(Bitmap.CompressFormat.PNG, 100, Files.newOutputStream(file.toPath()));
@@ -104,27 +344,4 @@ public class FileManagerImpl implements FileManager {
}
// @Override
// public void saveFileAtCurrent(File file) {
// try {
// Files.copy(file.toPath(), currentDir.resolve(file.getName()));
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
//
// @Override
// public File getFile(Path path) {
// // ファイルを取得する
// return path.toFile();
// }
//
// @Override
// public void removeFile(Path path) {
// // ファイルを削除する
// if (path.toFile().exists()) {
// path.toFile().delete(); // Resultを返す?
// }
// }
}
+2 -1
View File
@@ -37,5 +37,6 @@ dependencies {
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler
//
// model
implementation project(':model')
}
@@ -1,5 +1,7 @@
package one.nem.lacerta.utils;
import one.nem.lacerta.utils.model.KeyValueLog;
public interface LacertaLogger {
void info(String tag, String message);
@@ -9,4 +11,7 @@ public interface LacertaLogger {
void trace(String tag, String message);
void fatal(String tag, String message);
String buildKVMessage(KeyValueLog... logs);
// With name
String buildKVMessage(String name, KeyValueLog... logs);
}
@@ -0,0 +1,13 @@
package one.nem.lacerta.utils;
import org.w3c.dom.Document;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
public interface XmlMetaParser {
XmlMetaModel deserialize(Document document);
Document serialize(XmlMetaModel meta);
}
@@ -5,6 +5,8 @@ import android.util.Log;
import javax.inject.Inject;
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.model.KeyValueLog;
public class LacertaLoggerImpl implements LacertaLogger{
@Inject
@@ -40,4 +42,30 @@ public class LacertaLoggerImpl implements LacertaLogger{
public void fatal(String tag, String message) {
Log.wtf(tag, message);
}
@Override
public String buildKVMessage(KeyValueLog... logs) {
StringBuilder builder = new StringBuilder();
for (KeyValueLog log : logs) {
builder.append(log.getKey());
builder.append(": ");
builder.append(log.getValue());
builder.append("\n");
}
return builder.toString();
}
@Override
public String buildKVMessage(String name, KeyValueLog... logs) {
StringBuilder builder = new StringBuilder();
builder.append(name);
builder.append("\n");
for (KeyValueLog log : logs) {
builder.append(log.getKey());
builder.append(": ");
builder.append(log.getValue());
builder.append("\n");
}
return builder.toString();
}
}
@@ -0,0 +1,98 @@
package one.nem.lacerta.utils.impl;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import java.util.ArrayList;
import javax.inject.Inject;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.LacertaLogger;
public class XmlMetaParserImpl implements XmlMetaParser{
@Inject
LacertaLogger logger;
@Inject
public XmlMetaParserImpl() {
}
@Override
public XmlMetaModel deserialize(Document document) {
logger.debug("deserialize", "called");
try {
Element rootElement = document.getDocumentElement();
XmlMetaModel meta = new XmlMetaModel();
meta.setTitle(rootElement.getElementsByTagName("title").item(0).getTextContent());
meta.setAuthor(rootElement.getElementsByTagName("author").item(0).getTextContent());
meta.setDescription(rootElement.getElementsByTagName("description").item(0).getTextContent());
meta.setDefaultBranch(rootElement.getElementsByTagName("defaultBranch").item(0).getTextContent());
ArrayList<XmlMetaPageModel> pages = new ArrayList<>();
for(int i = 0; i < rootElement.getElementsByTagName("pages").getLength(); i++) {
Element pageElement = (Element) rootElement.getElementsByTagName("page").item(i);
XmlMetaPageModel page = new XmlMetaPageModel();
page.setIndex(Integer.parseInt(pageElement.getElementsByTagName("index").item(0).getTextContent()));
page.setFilename(pageElement.getElementsByTagName("filename").item(0).getTextContent());
pages.add(page);
}
meta.setPages(pages);
return meta;
} catch (Exception e) {
logger.error("deserialize", "something wrong");
logger.trace("deserialize", e.getMessage());
}
return null;
}
@Override
public Document serialize(XmlMetaModel meta) {
logger.debug("serialize", "called");
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.newDocument();
Element rootElement = document.createElement("meta");
appendElement(document, rootElement, "title", meta.getTitle());
appendElement(document, rootElement, "author", meta.getAuthor());
appendElement(document, rootElement, "description", meta.getDescription());
appendElement(document, rootElement, "defaultBranch", meta.getDefaultBranch());
Element pagesElement = document.createElement("pages");
for(XmlMetaPageModel page : meta.getPages()) {
Element pageElement = document.createElement("page");
appendElement(document, pageElement, "index", String.valueOf(page.getIndex()));
appendElement(document, pageElement, "filename", page.getFilename());
pagesElement.appendChild(pageElement);
}
rootElement.appendChild(pagesElement);
document.appendChild(rootElement);
return document;
} catch (Exception e) {
logger.error("serialize", "something wrong");
logger.trace("serialize", e.getMessage());
}
return null;
}
// Internal Methods
private void appendElement(Document document, Element rootElement, String name, String textContent) {
Element element = document.createElement(name);
element.setTextContent(textContent);
rootElement.appendChild(element);
}
}
@@ -0,0 +1,31 @@
package one.nem.lacerta.utils.model;
public class KeyValueLog {
String key;
String value;
public KeyValueLog(String key, String value) {
this.key = key;
this.value = value;
}
// Getter
public String getKey() {
return key;
}
public String getValue() {
return value;
}
// Setter
public void setKey(String key) {
this.key = key;
}
public void setValue(String value) {
this.value = value;
}
}
@@ -0,0 +1,17 @@
package one.nem.lacerta.utils.module;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.components.SingletonComponent;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.impl.XmlMetaParserImpl;
@Module
@InstallIn(SingletonComponent.class)
abstract public class XmlMetaParserModule {
@Binds
public abstract XmlMetaParser bindXmlMetaParser(XmlMetaParserImpl impl);
}