#709 Text Export to Single File with custom filename: fixed

This commit is contained in:
honfika@gmail.com
2014-11-24 21:07:31 +01:00
parent 1cf0c28c74
commit e40d2cb13d
4 changed files with 18 additions and 4 deletions

View File

@@ -135,6 +135,9 @@ public class Configuration {
@ConfigurationCategory("export")
public static final ConfigurationItem<Boolean> openFolderAfterFlaExport = null;
@ConfigurationCategory("export")
public static final ConfigurationItem<String> overrideTextExportFileName = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("debug")
public static final ConfigurationItem<Boolean> useDetailedLogging = null;

View File

@@ -29,6 +29,7 @@ import com.jpexs.decompiler.flash.tags.base.BoundedTag;
import com.jpexs.decompiler.flash.tags.base.TextTag;
import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.Path;
import com.jpexs.helpers.utf8.Utf8Helper;
import java.io.File;
import java.io.FileOutputStream;
@@ -84,8 +85,14 @@ public class TextExporter {
}
if (settings.singleFile) {
final File file = new File(outdir + File.separator
+ (settings.mode == TextExportMode.FORMATTED ? TEXT_EXPORT_FILENAME_FORMATTED : TEXT_EXPORT_FILENAME_PLAIN));
String fileName = Configuration.overrideTextExportFileName.get();
if (fileName != null) {
String swfName = Path.getFileNameWithoutExtension(new File(tags.get(0).getSwf().getShortFileName()));
fileName = fileName.replace("{fileName}", swfName);
} else {
fileName = settings.mode == TextExportMode.FORMATTED ? TEXT_EXPORT_FILENAME_FORMATTED : TEXT_EXPORT_FILENAME_PLAIN;
}
final File file = new File(outdir + File.separator + fileName);
try (FileOutputStream fos = new FileOutputStream(file)) {
for (final Tag t : tags) {
if (t instanceof TextTag) {

View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.helpers;
import java.io.File;
@@ -65,7 +66,7 @@ public class Path {
int i = s.lastIndexOf('.');
if (i > 0 && i < s.length() - 1) {
if (i > 0 && i < s.length() - 1) {
ext = s.substring(0, i);
}
return ext;
}