lacerta-dev/Lacerta
1
0
Fork 0
mirror of https://github.com/lacerta-doc/Lacerta.git synced 2024-11-26 09:43:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #75 from lacerta-doc/refactor/refactoring2

Browse Source 
リファクタリング
This commit is contained in:
ろむねこ 2024-01-16 12:59:08 +09:00 committed by GitHub
commit a81d79a972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 16 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml
View File

@ -25,7 +25,6 @@
<option value="$PROJECT_DIR$/model" />
<option value="$PROJECT_DIR$/processor" />
<option value="$PROJECT_DIR$/shared" />
<option value="$PROJECT_DIR$/shared/icon" />
<option value="$PROJECT_DIR$/shared/ui" />
<option value="$PROJECT_DIR$/source" />
<option value="$PROJECT_DIR$/utils" />

2
app/build.gradle
View File

@ -83,8 +83,6 @@ dependencies {
implementation project(':shared:ui')
implementation project(':shared:icon')
// Hilt (DI)
implementation libs.com.google.dagger.hilt.android
annotationProcessor libs.com.google.dagger.hilt.compiler

19
data/src/main/java/one/nem/lacerta/data/impl/DocumentImpl.java
View File

@ -2,32 +2,27 @@ package one.nem.lacerta.data.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
// Hilt
import javax.inject.Inject;
// Lacerta/data
import one.nem.lacerta.data.Document;
// Lacerta/model
import one.nem.lacerta.model.PublicPath;
import one.nem.lacerta.model.document.DocumentMeta;
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.path.DocumentPath;
import one.nem.lacerta.model.document.tag.DocumentTag;
// Lacerta/source
import one.nem.lacerta.source.database.LacertaDatabase;
import one.nem.lacerta.source.database.entity.DocumentEntity;
import one.nem.lacerta.source.database.entity.LibraryEntity;
import one.nem.lacerta.source.database.entity.TagEntity;
import one.nem.lacerta.source.database.entity.VcsLogEntity;
import one.nem.lacerta.vcs.ActionType;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
import one.nem.lacerta.source.jgit.JGitRepository;
// Lacerta/utils
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
// Lacerta/vcs
import one.nem.lacerta.vcs.LacertaVcs;

6
feature/debug/src/main/AndroidManifest.xml
View File

@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".DebugMenuContainerActivity"
android:exported="false" />
</application>
</manifest>

15
processor/src/main/java/one/nem/lacerta/processor/impl/DocumentProcessorImpl.java
View File

@ -3,27 +3,30 @@ package one.nem.lacerta.processor.impl;
import android.graphics.Bitmap;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.UUID;
// Hilt
import dagger.assisted.Assisted;
import dagger.assisted.AssistedInject;
import one.nem.lacerta.model.document.internal.XmlMetaPageModel;
import one.nem.lacerta.processor.DocumentProcessor;
// Lacerta/model
import one.nem.lacerta.model.document.DocumentDetail;
import one.nem.lacerta.model.document.internal.XmlMetaModel;
import one.nem.lacerta.model.document.page.Page;
// Lacerta/processor
import one.nem.lacerta.processor.DocumentProcessor;
// Lacerta/source
import one.nem.lacerta.source.file.FileManager;
import one.nem.lacerta.source.file.factory.FileManagerFactory;
// Lacerta/utils
import one.nem.lacerta.utils.LacertaLogger;
import one.nem.lacerta.utils.XmlMetaParser;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
// Lacerta/vcs
import one.nem.lacerta.vcs.LacertaVcs;
import one.nem.lacerta.vcs.factory.LacertaVcsFactory;

1
settings.gradle
View File

@ -30,5 +30,4 @@ include ':source'
include ':model'
include ':processor'
include ':shared:ui'
include ':shared:icon'
include ':vcs'

31
source/src/main/java/one/nem/lacerta/source/jgit/ActionRepo.java
View File

@ -1,31 +0,0 @@
package one.nem.lacerta.source.jgit;
import org.eclipse.jgit.lib.Repository;
public interface ActionRepo {
// リポジトリをインスタンス変数に格納
void setRepository(Repository repository);
// リポジトリ取得
Repository getRepository();
// リポジトリ名取得
String getRepositoryName();
// ステージングされていないファイルの一覧を取得
String[] getUnstagedFiles();
// ステージングされているファイルの一覧を取得
String[] getStagedFiles();
// ファイルをステージング
void stageFile(String path);
// ファイルをアンステージング
void unstageFile(String path);
// ステージングされているファイルをコミット
void commit(String message);
}

17
source/src/main/java/one/nem/lacerta/source/jgit/JGitRepository.java
View File

@ -1,17 +0,0 @@
package one.nem.lacerta.source.jgit;
import org.eclipse.jgit.lib.Repository;
public interface JGitRepository {
// リポジトリ取得
Repository getRepository(String id);
// リポジトリ作成
Repository createRepository(String id);
// リポジトリ削除
void deleteRepository(String id);
// リポジトリ存在確認
boolean repositoryExists(String id);
}

101
source/src/main/java/one/nem/lacerta/source/jgit/impl/ActionRepoImpl.java
View File

@ -1,101 +0,0 @@
package one.nem.lacerta.source.jgit.impl;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Repository;
import javax.inject.Inject;
import one.nem.lacerta.source.jgit.ActionRepo;
import one.nem.lacerta.utils.LacertaLogger;
public class ActionRepoImpl implements ActionRepo{
@Inject // Inject logger
LacertaLogger logger;
private final String TAG = "ActionRepoImpl";
Repository repository;
Git git;
// Internal method
private Git getGit() {
if (this.git == null) {
logger.debug(TAG, "getGit: git is null. Creating new Git instance");
this.git = new Git(repository);
}
return this.git;
}
@Override
public void setRepository(Repository repository) {
this.repository = repository;
}
@Override
public Repository getRepository() {
if (repository == null) {
logger.warn(TAG, "getRepository: repository is null. Throwing RuntimeException");
throw new RuntimeException("リポジトリが設定されていません");
}
return repository;
}
@Override
public String getRepositoryName() {
return repository.getDirectory().getParentFile().getName();
}
@Override
public String[] getUnstagedFiles() {
Git git = getGit();
try {
return git.status().call().getUntracked().toArray(new String[0]);
} catch (Exception e) { // TODO-rca: エラーハンドリング
logger.error(TAG, "getUnstagedFiles: " + e.getMessage());
return new String[0];
}
}
@Override
public String[] getStagedFiles() {
Git git = getGit();
try {
return git.status().call().getAdded().toArray(new String[0]);
} catch (Exception e) { // TODO-rca: エラーハンドリング
logger.error(TAG, "getStagedFiles: " + e.getMessage());
return new String[0];
}
}
@Override
public void stageFile(String path) {
Git git = getGit();
try {
git.add().addFilepattern(path).call();
} catch (Exception e) { // TODO-rca: エラーハンドリング
logger.error(TAG, "stageFile: " + e.getMessage());
}
}
@Override
public void unstageFile(String path) {
Git git = getGit();
try {
git.reset().addPath(path).call();
} catch (Exception e) { // TODO-rca: エラーハンドリング
logger.error(TAG, "unstageFile: " + e.getMessage());
}
}
@Override
public void commit(String message) {
Git git = getGit();
try {
git.commit().setMessage(message).call();
} catch (Exception e) { // TODO-rca: エラーハンドリング
logger.error(TAG, "commit: " + e.getMessage());
}
}
}

55
source/src/main/java/one/nem/lacerta/source/jgit/impl/JGitRepositoryImpl.java
View File

@ -1,55 +0,0 @@
package one.nem.lacerta.source.jgit.impl;
import one.nem.lacerta.source.jgit.JGitRepository;
import javax.inject.Inject;
import one.nem.lacerta.utils.repository.DeviceInfoUtils;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryBuilder;
public class JGitRepositoryImpl implements JGitRepository {
private final DeviceInfoUtils deviceInfoUtils;
@Inject
public JGitRepositoryImpl(DeviceInfoUtils deviceInfoUtils) {
this.deviceInfoUtils = deviceInfoUtils;
}
@Override
public Repository getRepository(String id) {
RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
repositoryBuilder.setGitDir(deviceInfoUtils.getExternalStorageDirectory().resolve(id).resolve(".git").toFile());
repositoryBuilder.setMustExist(true);
try {
return repositoryBuilder.build();
} catch (Exception e) {
return null;
}
}
@Override
public Repository createRepository(String id) {
RepositoryBuilder repositoryBuilder = new RepositoryBuilder();
repositoryBuilder.setGitDir(deviceInfoUtils.getExternalStorageDirectory().resolve(id).resolve(".git").toFile());
repositoryBuilder.setMustExist(false);
try {
return repositoryBuilder.build();
} catch (Exception e) {
return null;
}
}
@Override
public void deleteRepository(String id) {
// TODO-rca: 未実装
}
@Override
public boolean repositoryExists(String id) {
return false; // TODO-rca: 未実装
}
}

0
source/src/main/java/one/nem/lacerta/source/jgit/impl/placeholder
View File

15
source/src/main/java/one/nem/lacerta/source/jgit/module/JGitRepositoryModule.java
View File

@ -1,15 +0,0 @@
package one.nem.lacerta.source.jgit.module;
import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.components.SingletonComponent;
import one.nem.lacerta.source.jgit.JGitRepository;
@Module
@InstallIn(SingletonComponent.class)
abstract public class JGitRepositoryModule {
@Binds
public abstract JGitRepository bindManageRepo(one.nem.lacerta.source.jgit.impl.JGitRepositoryImpl manageRepoImpl);
}

0
source/src/main/java/one/nem/lacerta/source/jgit/module/placeholder
View File