ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-02-11 19:36:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1395 from iBotPeaches/issue/1394

Browse Source 
Refactor ExtFile to brut.j.dir
This commit is contained in:
Connor Tumbleson 2016-12-29 09:34:37 -05:00 committed by GitHub
commit 0571cccaff
19 changed files with 92 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -22,7 +22,7 @@ import brut.androlib.res.AndrolibResources;
import brut.androlib.res.data.ResPackage;
import brut.androlib.res.data.ResTable;
import brut.androlib.res.data.ResUnknownFiles;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.androlib.res.xml.ResXmlPatcher;
import brut.androlib.src.SmaliBuilder;
import brut.androlib.src.SmaliDecoder;
@ -31,7 +31,6 @@ import brut.directory.*;
import brut.util.BrutIO;
import brut.util.OS;
import java.io.*;
import java.nio.file.Files;
import java.util.*;
import java.util.logging.Logger;
import java.util.regex.Pattern;

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
View File

@ -26,7 +26,7 @@ import brut.androlib.meta.VersionInfo;
import brut.androlib.res.AndrolibResources;
import brut.androlib.res.data.ResPackage;
import brut.androlib.res.data.ResTable;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.androlib.res.xml.ResXmlPatcher;
import brut.common.BrutException;
import brut.directory.DirectoryException;

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
View File

@ -25,7 +25,7 @@ import brut.androlib.res.data.*;
import brut.androlib.res.decoder.*;
import brut.androlib.res.decoder.ARSCDecoder.ARSCData;
import brut.androlib.res.decoder.ARSCDecoder.FlagsOffset;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.androlib.res.util.ExtMXSerializer;
import brut.androlib.res.util.ExtXmlSerializer;
import brut.androlib.res.xml.ResValuesXmlSerializable;

41
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/util/ExtFile.java
View File

@ -13,50 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package brut.androlib.res.util;
import brut.directory.Directory;
import brut.directory.DirectoryException;
import brut.directory.FileDirectory;
import brut.directory.ZipRODirectory;
import java.io.File;
import java.net.URI;
/**
* @author Ryszard Wiśniewski <brut.alll@gmail.com>
*/
public class ExtFile extends File {
public class ExtFile extends brut.directory.ExtFile {
public ExtFile(File file) {
super(file.getPath());
}
public ExtFile(URI uri) {
super(uri);
}
public ExtFile(File parent, String child) {
super(parent, child);
}
public ExtFile(String parent, String child) {
super(parent, child);
}
public ExtFile(String pathname) {
super(pathname);
}
public Directory getDirectory() throws DirectoryException {
if (mDirectory == null) {
if (isDirectory()) {
mDirectory = new FileDirectory(this);
} else {
mDirectory = new ZipRODirectory(this);
}
}
return mDirectory;
}
private Directory mDirectory;
}

4
brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java
View File

@ -18,14 +18,12 @@ package brut.androlib.src;
import brut.androlib.AndrolibException;
import brut.androlib.mod.SmaliMod;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.directory.DirectoryException;
import java.io.*;
import java.util.List;
import java.util.logging.Logger;
import org.antlr.runtime.RecognitionException;
import org.apache.commons.io.IOUtils;
import org.jf.dexlib2.Opcodes;
import org.jf.dexlib2.writer.builder.DexBuilder;
import org.jf.dexlib2.writer.io.FileDataStore;

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/AndResGuardTest.java
View File

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import java.io.File;

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeJarTest.java
View File

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

5
brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
@ -31,7 +31,6 @@ import org.custommonkey.xmlunit.*;
import org.junit.*;
import static org.junit.Assert.*;
import org.junit.rules.ExpectedException;
import org.xml.sax.SAXException;
import javax.imageio.ImageIO;
@ -420,7 +419,7 @@ public class BuildAndDecodeTest {
String location = tmp + path;
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + location);
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir, location);
Set<String> files = fileDirectory.getFiles(true);
for (String filename : files) {

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/DebugTagRetainedTest.java
View File

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/DoubleExtensionUnknownFileTest.java
View File

@ -17,7 +17,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.apache.commons.lang3.StringUtils;

5
brut.apktool/apktool-lib/src/test/java/brut/androlib/LargeIntsInManifestTest.java
View File

@ -16,15 +16,12 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import org.custommonkey.xmlunit.*;

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/MissingVersionManifestTest.java
View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

3
brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java
View File

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/ReferenceVersionCodeTest.java
View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

3
brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java
View File

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

8
brut.apktool/apktool-lib/src/test/java/brut/androlib/TestUtils.java
View File

@ -98,7 +98,11 @@ public abstract class TestUtils {
URL dirURL = class_.getClassLoader().getResource(dirPath);
if (dirURL != null && dirURL.getProtocol().equals("file")) {
DirUtil.copyToDir(new FileDirectory(dirURL.getFile()), out);
try {
DirUtil.copyToDir(new FileDirectory(dirURL.getFile()), out);
} catch (UnsupportedEncodingException ex) {
throw new BrutException(ex);
}
return;
}
@ -111,10 +115,10 @@ public abstract class TestUtils {
String jarPath;
try {
jarPath = URLDecoder.decode(dirURL.getPath().substring(5, dirURL.getPath().indexOf("!")), "UTF-8");
DirUtil.copyToDir(new FileDirectory(jarPath), out);
} catch (UnsupportedEncodingException ex) {
throw new BrutException(ex);
}
DirUtil.copyToDir(new FileDirectory(jarPath), out);
}
}

2
brut.apktool/apktool-lib/src/test/java/brut/androlib/UnknownCompressionTest.java
View File

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

58
brut.j.dir/src/main/java/brut/directory/ExtFile.java Normal file
View File

@ -0,0 +1,58 @@
/**
* Copyright 2014 Ryszard Wiśniewski <brut.alll@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package brut.directory;
import java.io.File;
import java.net.URI;
/**
* @author Ryszard Wiśniewski <brut.alll@gmail.com>
*/
public class ExtFile extends File {
public ExtFile(File file) {
super(file.getPath());
}
public ExtFile(URI uri) {
super(uri);
}
public ExtFile(File parent, String child) {
super(parent, child);
}
public ExtFile(String parent, String child) {
super(parent, child);
}
public ExtFile(String pathname) {
super(pathname);
}
public Directory getDirectory() throws DirectoryException {
if (mDirectory == null) {
if (isDirectory()) {
mDirectory = new FileDirectory(this);
} else {
mDirectory = new ZipRODirectory(this);
}
}
return mDirectory;
}
private Directory mDirectory;
}

20
brut.j.dir/src/main/java/brut/directory/FileDirectory.java
View File

@ -16,20 +16,20 @@
package brut.directory;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.*;
import java.net.URLDecoder;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
public class FileDirectory extends AbstractDirectory {
private File mDir;
public FileDirectory(String dir) throws DirectoryException {
this(new File(dir));
public FileDirectory(ExtFile dir, String folder) throws DirectoryException, UnsupportedEncodingException {
this(new File(dir.toString().replaceAll("%20", " "), folder));
}
public FileDirectory(String dir) throws DirectoryException, UnsupportedEncodingException {
this(new File(URLDecoder.decode(dir, "UTF-8")));
}
public FileDirectory(File dir) throws DirectoryException {
@ -79,7 +79,7 @@ public class FileDirectory extends AbstractDirectory {
protected void removeFileLocal(String name) {
new File(generatePath(name)).delete();
}
private String generatePath(String name) {
return getDir().getPath() + separator + name;
}
@ -87,7 +87,7 @@ public class FileDirectory extends AbstractDirectory {
private void loadAll() {
mFiles = new LinkedHashSet<String>();
mDirs = new LinkedHashMap<String, AbstractDirectory>();
File[] files = getDir().listFiles();
for (int i = 0; i < files.length; i++) {
File file = files[i];