From 7931eb97b9356e91f3aeae0475640c2203ff7792 Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sat, 25 Nov 2023 17:06:18 -0800 Subject: [PATCH] feat: updated logs (#1526) --- .../views/installer/installer_viewmodel.dart | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index 01226fac65..53a03040d4 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -179,18 +179,48 @@ class InstallerViewModel extends BaseViewModel { } } + void _trimLogs(List logLines, String keyword, String? newString) { + final lineCount = logLines.where((line) => line.endsWith(keyword)).length; + final index = logLines.indexWhere((line) => line.endsWith(keyword)); + if (newString != null && lineCount > 0) { + logLines.insert(index, newString.replaceAll('{lineCount}', lineCount.toString())); + } + logLines.removeWhere((lines) => lines.endsWith(keyword)); + } + + dynamic _getPatchOptionValue(String patchName, Option option) { + final Option? savedOption = _managerAPI.getPatchOption(_app.packageName, patchName, option.key); + if (savedOption != null) { + return savedOption.value; + } else { + return option.value; + } + } + + String _formatPatches(List patches) { + if (patches.isEmpty) { + return 'None'; + } + return patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${_getPatchOptionValue(p.name, o)}').join(", ")}]')).toList().join(', '); + } + Future copyLogs() async { final info = await AboutInfo.getInfo(); - dynamic getValue(String patchName, Option option) { - final Option? savedOption = - _managerAPI.getPatchOption(_app.packageName, patchName, option.key); - if (savedOption != null) { - return savedOption.value; - } else { - return option.value; - } - } + // Trim out extra lines + final logsTrimmed = logs.split('\n'); + _trimLogs(logsTrimmed, 'succeeded', 'Applied {lineCount} patches'); + _trimLogs(logsTrimmed, '.dex', 'Compiled {lineCount} dex files'); + + // Get patches added / removed + final defaultPatches = _patcherAPI.getFilteredPatches(_app.packageName).where((p) => !p.excluded).toList(); + final patchesAdded = _patches.where((p) => !defaultPatches.contains(p)).toList(); + final patchesRemoved = defaultPatches.where((p) => !_patches.contains(p)).toList(); + + // Options changed + final patchesChanged = defaultPatches.where((p) => _patches.contains(p) && p.options.any((o) => _getPatchOptionValue(p.name, o) != o.value)).toList(); + + // Add Info final formattedLogs = [ '- Device Info', 'ReVanced Manager: ${info['version']}', @@ -203,7 +233,10 @@ class InstallerViewModel extends BaseViewModel { '\n- Patch Info', 'App: ${_app.packageName} v${_app.version}', 'Patches version: ${_managerAPI.patchesVersion}', - 'Patches: ${_patches.map((p) => p.name + (p.options.isEmpty ? '' : ' [${p.options.map((o) => '${o.title}: ${getValue(p.name, o)}').join(", ")}]')).toList().join(", ")}', + 'Patches added: ${_formatPatches(patchesAdded)}', + 'Patches removed: ${_formatPatches(patchesRemoved)}', + 'Options changed: ${_formatPatches(patchesChanged)}', + '\n- Settings', 'Allow changing patch selection: ${_managerAPI.isPatchesChangeEnabled()}', 'Version compatibility check: ${_managerAPI.isVersionCompatibilityCheckEnabled()}', @@ -212,7 +245,7 @@ class InstallerViewModel extends BaseViewModel { 'Integration source: ${_managerAPI.getIntegrationsRepo()}', '\n- Logs', - logs, + logsTrimmed.join('\n'), ]; Clipboard.setData(ClipboardData(text: formattedLogs.join('\n')));