Lucas/stock-pignon
1
0
Fork 0
mirror of https://github.com/lucasroyerdev/stock-pignon.git synced 2026-05-10 02:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: create empty output files to avoid error in control server at the first use

Browse Source
This commit is contained in:
lucasroyerdev
2026-01-19 12:27:08 +01:00
parent cca2183e3d
commit 5e69a13487
1 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
app/src/main/java/com/stock/pignon/MainActivity.java
View File

@@ -93,12 +93,12 @@ public class MainActivity extends AppCompatActivity {
// On met l'URL directement dans le sous-titre de l'ActionBar // On met l'URL directement dans le sous-titre de l'ActionBar
if (getSupportActionBar() != null) { if (getSupportActionBar() != null) {
getSupportActionBar().setSubtitle("🟢 Serveur actif : " + url); getSupportActionBar().setSubtitle("🟢 Server online : " + url);
} }
Log.i(TAG, "Serveur démarré sur : " + url); Log.i(TAG, "Server started on : " + url);
} catch (IOException e) { } catch (IOException e) {
if (getSupportActionBar() != null) { if (getSupportActionBar() != null) {
getSupportActionBar().setSubtitle("🔴 Erreur serveur : Port 8080 occupé"); getSupportActionBar().setSubtitle("🔴 Server error : port 8080 busy");
} }
} }
} }
@@ -115,7 +115,7 @@ public class MainActivity extends AppCompatActivity {
super.onDestroy(); super.onDestroy();
if (server != null) { if (server != null) {
server.stop(); server.stop();
Log.i(TAG, "Serveur arrêté."); Log.i(TAG, "Server stopped.");
} }
} }
@@ -268,8 +268,6 @@ public class MainActivity extends AppCompatActivity {
ImageLoader.loadImage(mainImage, "_velo", 800,800); ImageLoader.loadImage(mainImage, "_velo", 800,800);
} }
// --- Button Actions (linked via android:onClick in XML) ---
public void emptyCart(View view) { public void emptyCart(View view) {
CartActionHelper.emptyCart(cartList, this); CartActionHelper.emptyCart(cartList, this);
} }
@@ -283,24 +281,65 @@ public class MainActivity extends AppCompatActivity {
} }
private void copyAssetsIfEmpty() { private void copyAssetsIfEmpty() {
File folder = new File(Environment.getExternalStorageDirectory(), Config.EXTERNAL_DIR_NAME); File rootDir = new File(Environment.getExternalStorageDirectory(), Config.EXTERNAL_DIR_NAME);
// First safety : is folder already in sdcard ? // Create root folder if not found
if (!folder.exists()) { if (!rootDir.exists()) {
// Second safety : are we able to create folder ? if (!rootDir.mkdirs()) {
if (folder.mkdirs()) { Log.e("MainActivity", "Can't create root dir." + rootDir.getAbsolutePath());
// Copy JSON file return;
copyFileFromAssets(Config.INPUT_JSON_NAME, new File(folder, Config.INPUT_JSON_NAME)); }
}
// Copy images subfolder // Check pieces.json
File imgFolder = new File(folder, Config.IMAGES_SUBDIR_NAME); File inputJson = new File(rootDir, Config.INPUT_JSON_NAME);
if (imgFolder.mkdirs()) { if (!inputJson.exists()) {
copyFolderFromAssets(Config.IMAGES_SUBDIR_NAME, imgFolder); Log.i("MainActivity", "pieces.json not found, copying it...");
} copyFileFromAssets(Config.INPUT_JSON_NAME, inputJson);
} else {
Log.d("MainActivity", "Keep existing pieces.json");
}
// Check stock.json and stock.csv output files to avoid control server error
checkOrCreateEmptyFile(new File(rootDir, Config.OUPUT_JSON_NAME), "[]");
checkOrCreateEmptyFile(new File(rootDir, Config.OUPUT_CSV_NAME), "");
// Check images folder
File imgDir = new File(rootDir, Config.IMAGES_SUBDIR_NAME);
if (!imgDir.exists()) {
if (!imgDir.mkdirs()) {
Log.e("MainActivity", "Can't create images dir.");
return;
}
}
// Copy images only if not found
String[] filesInImgDir = imgDir.list();
if (filesInImgDir == null || filesInImgDir.length == 0) {
Log.i("MainActivity", "Images folder empty. Installing images...");
copyFolderFromAssets(Config.IMAGES_SUBDIR_NAME, imgDir);
} else {
Log.d("MainActivity", "Keep existing images.");
}
}
/**
* Create a file with default content if not found
*/
private void checkOrCreateEmptyFile(File file, String defaultContent) {
if (!file.exists()) {
try (FileOutputStream fos = new FileOutputStream(file)) {
fos.write(defaultContent.getBytes());
Log.d(TAG, "Initialisation de : " + file.getName());
} catch (IOException e) {
Log.e(TAG, "Erreur lors de l'initialisation de " + file.getName(), e);
} }
} }
} }
/**
* Copy folder from assets
*/
private void copyFolderFromAssets(String assetDirName, File destDir) { private void copyFolderFromAssets(String assetDirName, File destDir) {
try { try {
String[] files = getAssets().list(assetDirName); String[] files = getAssets().list(assetDirName);
@@ -316,25 +355,28 @@ public class MainActivity extends AppCompatActivity {
} }
} }
} catch (IOException e) { } catch (IOException e) {
Log.e("MainActivity", "Erreur listing assets: " + assetDirName, e); Log.e("MainActivity", "Listing assets error: " + assetDirName, e);
} }
} }
/**
* Copy file from assets
*/
private void copyFileFromAssets(String assetName, File destFile) { private void copyFileFromAssets(String assetName, File destFile) {
// Optimized read // Optimized read
// Try-with-resources ensures streams are automatically closed, avoid memory leaks // Try-with-resources ensures streams are automatically closed, avoid memory leaks
try (InputStream in = getAssets().open(assetName); try (InputStream in = getAssets().open(assetName);
OutputStream out = new FileOutputStream(destFile)) { OutputStream out = new FileOutputStream(destFile)) {
byte[] buffer = new byte[1024]; byte[] buffer = new byte[8192];
int read; int read;
while ((read = in.read(buffer)) != -1) { while ((read = in.read(buffer)) != -1) {
out.write(buffer, 0, read); out.write(buffer, 0, read);
} }
Log.d("MainActivity", "Succès : " + assetName + " copié."); Log.d("MainActivity", "Success : " + assetName + " copied.");
} catch (IOException e) { } catch (IOException e) {
Log.e("MainActivity", "Erreur copie asset: " + assetName, e); Log.e("MainActivity", "Can't copy asset: " + assetName, e);
} }
} }
@@ -355,7 +397,7 @@ public class MainActivity extends AppCompatActivity {
} }
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Erreur IP", e); Log.e(TAG, "IP error", e);
} }
return "127.0.0.1"; return "127.0.0.1";
} }