mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-05 07:48:05 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes #87

Browse Source
This commit is contained in:
Collin Smith
2020-07-10 22:18:45 -07:00
parent 81377986b9
commit 518ce4fb2e
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/src/com/riiablo/codec/excel/Excel.java
View File

@ -1,21 +1,7 @@
package com.riiablo.codec.excel; package com.riiablo.codec.excel;
import com.google.common.io.LittleEndianDataInputStream;
import android.support.annotation.CallSuper; import android.support.annotation.CallSuper;
import com.google.common.io.LittleEndianDataInputStream;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.GdxRuntimeException;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.ObjectIntMap;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectSet;
import com.badlogic.gdx.utils.StreamUtils;
import com.riiablo.util.ClassUtils;
import org.apache.commons.io.IOUtils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@ -29,6 +15,19 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import org.apache.commons.io.IOUtils;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.GdxRuntimeException;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.ObjectIntMap;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectSet;
import com.badlogic.gdx.utils.StreamUtils;
import com.riiablo.util.ClassUtils;
public abstract class Excel<T extends Excel.Entry> implements Iterable<T> { public abstract class Excel<T extends Excel.Entry> implements Iterable<T> {
public static final String TAG = "Excel"; public static final String TAG = "Excel";
@ -50,6 +49,8 @@ public abstract class Excel<T extends Excel.Entry> implements Iterable<T> {
private static final ObjectSet EMPTY_SET = new ObjectSet<>(); private static final ObjectSet EMPTY_SET = new ObjectSet<>();
private static final ObjectIntMap EMPTY_MAP = new ObjectIntMap<>(); private static final ObjectIntMap EMPTY_MAP = new ObjectIntMap<>();
public static boolean preserveOrder = false;
public static final ObjectSet<String> EXPANSION = ObjectSet.with("Expansion"); public static final ObjectSet<String> EXPANSION = ObjectSet.with("Expansion");
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -90,6 +91,7 @@ public abstract class Excel<T extends Excel.Entry> implements Iterable<T> {
ObjectIntMap<String> STRING_TO_ID = EMPTY_MAP; ObjectIntMap<String> STRING_TO_ID = EMPTY_MAP;
IntMap<T> entries = new IntMap<>(); IntMap<T> entries = new IntMap<>();
Array<Entry> orderedEntries = new Array<>(Entry.class);
public static <T extends Excel> T load(Class<T> excelClass, FileHandle txt) { public static <T extends Excel> T load(Class<T> excelClass, FileHandle txt) {
return load(excelClass, txt, Excel.<String>emptySet()); return load(excelClass, txt, Excel.<String>emptySet());
@ -318,6 +320,7 @@ public abstract class Excel<T extends Excel.Entry> implements Iterable<T> {
} }
} }
if (preserveOrder) excel.orderedEntries.add(entry);
putIndex(primaryKey, primaryKeyType, j++, index, excel, entry); putIndex(primaryKey, primaryKeyType, j++, index, excel, entry);
} }
@ -401,10 +404,20 @@ public abstract class Excel<T extends Excel.Entry> implements Iterable<T> {
Class binClass = Class.forName(binClassName); Class binClass = Class.forName(binClassName);
Method writeBin = binClass.getMethod("writeBin", entryClass, DataOutput.class); Method writeBin = binClass.getMethod("writeBin", entryClass, DataOutput.class);
int size = size(); if (preserveOrder) {
out.writeInt(size); Entry[] items = orderedEntries.items;
for (Entry entry : this) { int size = orderedEntries.size;
writeBin.invoke(null, entry, out); out.writeInt(size);
for (int i = 0; i < size; i++) {
Entry entry = items[i];
writeBin.invoke(null, entry, out);
}
} else {
int size = size();
out.writeInt(size);
for (Entry entry : this) {
writeBin.invoke(null, entry, out);
}
} }
} catch (Throwable t) { } catch (Throwable t) {
throw new GdxRuntimeException("Failed to write bin for " + excelClass, t); throw new GdxRuntimeException("Failed to write bin for " + excelClass, t);

1
tools/src/com/riiablo/codec/excel/BinGenerationTool.java
View File

@ -33,6 +33,7 @@ public class BinGenerationTool extends ApplicationAdapter {
@Override @Override
public void create() { public void create() {
Excel.preserveOrder = true;
try { try {
Package pkg = Package.getPackage(args[0]); Package pkg = Package.getPackage(args[0]);
Gdx.app.log(TAG, "package=" + pkg.getName()); Gdx.app.log(TAG, "package=" + pkg.getName());