anthonycicc/UniPatcher
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added the ability to specify the output directory

Browse source
This commit is contained in:
Boris Timofeev 2017-01-13 14:44:26 +03:00
parent 61c5864e70
commit a3aa25f22d
13 changed files with 86 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/emunix/unipatcher/Settings.java
View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Boris Timofeev
Copyright (C) 2016, 2017 Boris Timofeev
This file is part of UniPatcher.
@ -64,4 +64,9 @@ public class Settings {
} else
return prefs.getString("patch_directory", "/");
}
public static String getOutputDir(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getString("output_directory", "");
}
}

63
app/src/main/java/org/emunix/unipatcher/WorkerService.java
View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2013-2016 Boris Timofeev
Copyright (C) 2013-2017 Boris Timofeev
This file is part of UniPatcher.
@ -63,16 +63,7 @@ public class WorkerService extends IntentService {
protected void onHandleIntent(Intent intent) {
// if user deny write storage permission
if (!Utils.hasStoragePermission(this)) {
Intent notificationIntent = new Intent(this, MainActivity.class);
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
Notification notify = new NotificationCompat.Builder(this)
.setContentTitle(getString(R.string.notify_error))
.setContentText(getString(R.string.permissions_storage_error_notify_access_denied))
.setSmallIcon(R.drawable.ic_stat_patching)
.setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT))
.setAutoCancel(true)
.build();
nm.notify(0, notify);
showErrorNotification(getString(R.string.permissions_storage_error_notify_access_denied));
return;
}
@ -111,6 +102,30 @@ public class WorkerService extends IntentService {
if(!fileExists(patchFile) || !fileExists(romFile))
return;
// create output dir
try {
if (!outputFile.getParentFile().exists()) {
FileUtils.forceMkdirParent(outputFile);
}
} catch (IOException | SecurityException e) {
String text = getString(R.string.notify_error_unable_to_create_directory, outputFile.getParent());
showErrorNotification(text);
return;
}
// check access to output dir
try {
if (!outputFile.getParentFile().canWrite()){
String text = getString(R.string.notify_error_unable_to_write_to_directory, outputFile.getParent());
showErrorNotification(text);
return;
}
} catch (SecurityException e) {
String text = getString(R.string.notify_error_unable_to_write_to_directory, outputFile.getParent());
showErrorNotification(text);
return;
}
String ext = FilenameUtils.getExtension(patchFile.getName()).toLowerCase(Locale.getDefault());
if ("ips".equals(ext))
patcher = new IPS(this, patchFile, romFile, outputFile);
@ -239,19 +254,25 @@ public class WorkerService extends IntentService {
private boolean fileExists(File f) {
if (!f.exists() || f.isDirectory()) {
Intent notificationIntent = new Intent(this, MainActivity.class);
String text = getString(R.string.notify_error_file_not_found).concat(": ").concat(f.getName());
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
Notification notify = new NotificationCompat.Builder(this)
.setContentTitle(getString(R.string.notify_error))
.setContentText(text)
.setSmallIcon(R.drawable.ic_stat_patching)
.setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT))
.setAutoCancel(true)
.build();
nm.notify(0, notify);
showErrorNotification(text);
return false;
}
return true;
}
private void showErrorNotification(String text) {
Intent notificationIntent = new Intent(this, MainActivity.class);
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
Notification notify = new NotificationCompat.Builder(this)
.setContentTitle(getString(R.string.notify_error))
.setContentText(text)
.setSmallIcon(R.drawable.ic_stat_patching)
.setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT))
.setAutoCancel(true)
.setStyle(new NotificationCompat.BigTextStyle()
.bigText(text))
.build();
nm.notify(0, notify);
}
}

18
app/src/main/java/org/emunix/unipatcher/ui/fragment/PatchingFragment.java
View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2014, 2016 Boris Timofeev
Copyright (C) 2014, 2016, 2017 Boris Timofeev
This file is part of UniPatcher.
@ -191,7 +191,10 @@ public class PatchingFragment extends ActionFragment implements View.OnClickList
}
private String makeOutputPath(String fullname) {
String dir = FilenameUtils.getPath(fullname);
String dir = Settings.getOutputDir(getActivity());
if (dir.equals("")) { // get ROM directory
dir = FilenameUtils.getFullPath(fullname);
}
String baseName = FilenameUtils.getBaseName(fullname);
String ext = FilenameUtils.getExtension(fullname);
return FilenameUtils.concat(dir, baseName.concat(" [patched].").concat(ext));
@ -244,16 +247,17 @@ public class PatchingFragment extends ActionFragment implements View.OnClickList
@Override
public void onClick(DialogInterface dialog, int which) {
String newName = input.getText().toString();
if (newName.equals(romNameTextView.getText())) {
Toast.makeText(getActivity(), R.string.dialog_rename_error_same_name, Toast.LENGTH_LONG).show();
return;
}
if (newName.contains("/")) {
newName = newName.replaceAll("/", "_");
Toast.makeText(getActivity(), R.string.dialog_rename_error_invalid_chars, Toast.LENGTH_LONG).show();
}
String newPath = new File(outputPath).getParent().concat(File.separator).concat(newName);
if (FilenameUtils.equals(newPath, romPath)) {
Toast.makeText(getActivity(), R.string.dialog_rename_error_same_name, Toast.LENGTH_LONG).show();
return;
}
outputNameTextView.setText(newName);
outputPath = new File(romPath).getParent().concat(File.separator).concat(newName);
outputPath = newPath;
}
});
dialog.setNegativeButton(R.string.dialog_rename_cancel, new DialogInterface.OnClickListener() {

4
app/src/main/java/org/emunix/unipatcher/ui/fragment/SettingsFragment.java
View file

@ -1,5 +1,5 @@
/*
Copyright (C) 2016 Boris Timofeev
Copyright (C) 2016-2017 Boris Timofeev
This file is part of UniPatcher.
@ -36,7 +36,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
if (key.equals("theme")) {
if (key.equals("theme") || key.equals("output_directory")) {
Toast.makeText(getActivity(), R.string.settings_theme_message_restart_app, Toast.LENGTH_SHORT).show();
}
}

1
app/src/main/res/raw-it/changelog.md
View file

@ -1,6 +1,7 @@
#### 0.12 (January 15, 2017)
- Support APS patches (Nintendo 64 and Game Boy Advance)
- Added the ability to specify the output directory
#### 0.11 (25 Dicembre, 2016)

1
app/src/main/res/raw-pl/changelog.md
View file

@ -1,6 +1,7 @@
#### 0.12 (January 15, 2017)
- Support APS patches (Nintendo 64 and Game Boy Advance)
- Added the ability to specify the output directory
#### 0.11 (December 25, 2016)

1
app/src/main/res/raw-ru/changelog.md
View file

@ -1,6 +1,7 @@
#### 0.12 (15 января, 2017)
- Поддержка APS патчей (для Nintendo 64 и Game Boy Advance)
- Добавлена возможность указать каталог для сохранения ROM'ов
#### 0.11 (25 декабря, 2016)

1
app/src/main/res/raw/changelog.md
View file

@ -1,6 +1,7 @@
#### 0.12 (January 15, 2017)
- Support APS patches (Nintendo 64 and Game Boy Advance)
- Added the ability to specify the output directory
#### 0.11 (December 25, 2016)

4
app/src/main/res/values-it/strings.xml
View file

@ -60,6 +60,8 @@
<string name="notify_error_could_not_copy_file">Non si può copiare il file</string>
<string name="notify_error_file_not_found">File non trovato</string>
<string name="notify_error_not_enough_space">Spazio non sufficiente sul disco</string>
<string name="notify_error_unable_to_create_directory">Unable to create directory %1$s</string>
<string name="notify_error_unable_to_write_to_directory">Unable to write to directory %1$s</string>
<string name="notify_error_not_ips_patch">Patch IPS non valida</string>
<string name="notify_error_not_ups_patch">Patch UPS non valida</string>
<string name="notify_error_not_bps_patch">Patch BPS non valida</string>
@ -109,6 +111,8 @@
<string name="settings_remember_last_directories">Ricorda le ultime cartelle aperte</string>
<string name="settings_rom_directory">Specifica la cartella del ROM</string>
<string name="settings_patch_directory">Specifica le cartelle delle patch</string>
<string name="settings_output_directory">Specify output directory</string>
<string name="settings_output_directory_description">Otherwise ROM will be stored in the ROM directory</string>
<!-- Help activity -->
<string name="help_activity_title">Aiuto</string>

4
app/src/main/res/values-pl/strings.xml
View file

@ -60,6 +60,8 @@
<string name="notify_error_could_not_copy_file">Nie można skopiować pliku</string>
<string name="notify_error_file_not_found">Plik nie znaleziony</string>
<string name="notify_error_not_enough_space">Brak miejsca na Karcie Pamięci</string>
<string name="notify_error_unable_to_create_directory">Unable to create directory %1$s</string>
<string name="notify_error_unable_to_write_to_directory">Unable to write to directory %1$s</string>
<string name="notify_error_not_ips_patch">Niewłaściwa łatka IPS</string>
<string name="notify_error_not_ups_patch">Niewłaściwa łatka UPS</string>
<string name="notify_error_not_bps_patch">Niewłaściwa łatka BPS</string>
@ -109,6 +111,8 @@
<string name="settings_remember_last_directories">Zapamiętaj ostatnią otworzoną ścieżkę</string>
<string name="settings_rom_directory">Sprecyzuj ścieżkę Rom-ów</string>
<string name="settings_patch_directory">Sprecyzuj ścieżkę łatek</string>
<string name="settings_output_directory">Specify output directory</string>
<string name="settings_output_directory_description">Otherwise ROM will be stored in the ROM directory</string>
<!-- Help activity -->
<string name="help_activity_title">Pomoc</string>

4
app/src/main/res/values-ru/strings.xml
View file

@ -60,6 +60,8 @@
<string name="notify_error_could_not_copy_file">Не удалось скопировать файл</string>
<string name="notify_error_file_not_found">Файл не найден</string>
<string name="notify_error_not_enough_space">Не хватает места на диске</string>
<string name="notify_error_unable_to_create_directory">Не могу создать директорию %1$s</string>
<string name="notify_error_unable_to_write_to_directory">Не могу записать в директорию %1$s</string>
<string name="notify_error_not_ips_patch">Некорректный IPS патч</string>
<string name="notify_error_not_ups_patch">Некорректный UPS патч</string>
<string name="notify_error_not_bps_patch">Некорректный BPS патч</string>
@ -109,6 +111,8 @@
<string name="settings_remember_last_directories">Запоминать последнюю открытую директорию</string>
<string name="settings_rom_directory">Укажите директорию с ROM\'ами</string>
<string name="settings_patch_directory">Укажите директорию с патчами</string>
<string name="settings_output_directory">Укажите директорию для сохранения</string>
<string name="settings_output_directory_description">Иначе ROM будет сохранён в директорию с ROM\'ами</string>
<!-- Help activity -->
<string name="help_activity_title">Помощь</string>

4
app/src/main/res/values/strings.xml
View file

@ -60,6 +60,8 @@
<string name="notify_error_could_not_copy_file">Could not copy file</string>
<string name="notify_error_file_not_found">File not found</string>
<string name="notify_error_not_enough_space">Not enough space on the disk</string>
<string name="notify_error_unable_to_create_directory">Unable to create directory %1$s</string>
<string name="notify_error_unable_to_write_to_directory">Unable to write to directory %1$s</string>
<string name="notify_error_not_ips_patch">Not a valid IPS patch</string>
<string name="notify_error_not_ups_patch">Not a valid UPS patch</string>
<string name="notify_error_not_bps_patch">Not a valid BPS patch</string>
@ -109,6 +111,8 @@
<string name="settings_remember_last_directories">Remember last opened directories</string>
<string name="settings_rom_directory">Specify ROM\'s directory</string>
<string name="settings_patch_directory">Specify patches directory</string>
<string name="settings_output_directory">Specify output directory</string>
<string name="settings_output_directory_description">Otherwise ROM will be stored in the ROM directory</string>
<!-- Help activity -->
<string name="help_activity_title">Help</string>

5
app/src/main/res/xml/preferences.xml
View file

@ -27,5 +27,10 @@
android:key="patch_directory"
android:title="@string/settings_patch_directory"
android:defaultValue="/" />
<EditTextPreference
android:key="output_directory"
android:title="@string/settings_output_directory"
android:summary="@string/settings_output_directory_description"
android:defaultValue="" />
</PreferenceCategory>
</PreferenceScreen>