mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-01 21:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the file-related helper methods to a FileUtils class.

Browse Source
This commit is contained in:
Reece H. Dunn
2013-09-17 12:37:54 +01:00
parent 8731c237af
commit bbad97c194
3 changed files with 82 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/com/reecedunn/espeak/DownloadVoiceData.java
+11 -37
View File
@@ -93,7 +93,7 @@ public class DownloadVoiceData extends Activity {
@Override
protected Integer doInBackground(Void... params) {
clearContents(CheckVoiceData.getDataPath(mContext));
FileUtils.rmdir(CheckVoiceData.getDataPath(mContext));
final InputStream stream = mContext.getResources().openRawResource(mRawResId);
final ZipInputStream zipStream = new ZipInputStream(new BufferedInputStream(stream));
@@ -134,7 +134,7 @@ public class DownloadVoiceData extends Activity {
if (entry.isDirectory()) {
outputFile.mkdirs();
doChmod(outputFile);
FileUtils.chmod(outputFile);
continue;
}
@@ -142,26 +142,24 @@ public class DownloadVoiceData extends Activity {
outputFile.getParentFile().mkdirs();
final FileOutputStream outputStream = new FileOutputStream(outputFile);
while (!isCancelled() && ((bytesRead = zipStream.read(buffer)) != -1)) {
outputStream.write(buffer, 0, bytesRead);
try {
while (!isCancelled() && ((bytesRead = zipStream.read(buffer)) != -1)) {
outputStream.write(buffer, 0, bytesRead);
}
} finally {
outputStream.close();
}
outputStream.close();
zipStream.closeEntry();
// Make sure the output file is readable.
doChmod(outputFile);
FileUtils.chmod(outputFile);
}
final String version = CheckVoiceData.readContent(mContext.getResources().openRawResource(R.raw.espeakdata_version));
final String version = FileUtils.read(mContext.getResources().openRawResource(R.raw.espeakdata_version));
final File outputFile = new File(mOutput, "espeak-data/version");
mExtractedFiles.add(outputFile);
final FileOutputStream outputStream = new FileOutputStream(outputFile);
outputStream.write(version.getBytes(), 0, version.length());
outputStream.close();
doChmod(outputFile);
FileUtils.write(outputFile, version);
}
private void removeExtractedFiles() {
@@ -173,29 +171,5 @@ public class DownloadVoiceData extends Activity {
mExtractedFiles.clear();
}
private static void doChmod(File file) {
try {
Runtime.getRuntime().exec("/system/bin/chmod 755 " + file.getAbsolutePath());
} catch (IOException e) {
e.printStackTrace();
}
}
private static void clearContents(File directory) {
if (!directory.exists() || !directory.isDirectory()) {
return;
}
final File[] children = directory.listFiles();
for (File child : children) {
if (child.isDirectory()) {
clearContents(child);
}
child.delete();
}
}
}
}