-
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from Merrit/dev
Major refactor for DDD, split toggle active to separate package, bug fixes and performance improvements...
- Loading branch information
Showing
199 changed files
with
11,002 additions
and
2,116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| # Packaging output | ||
| *.AppImage | ||
| *.exe | ||
| *.snap | ||
| *.zsync | ||
| appimage-builder-cache | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export 'cubit/app_cubit.dart'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| import 'dart:async'; | ||
| import 'dart:io' as io; | ||
|
|
||
| import 'package:bloc/bloc.dart'; | ||
| import 'package:collection/collection.dart'; | ||
| import 'package:equatable/equatable.dart'; | ||
| import 'package:flutter/cupertino.dart'; | ||
| import 'package:native_platform/native_platform.dart'; | ||
| import 'package:nyrna/application/preferences/cubit/preferences_cubit.dart'; | ||
| import 'package:nyrna/infrastructure/preferences/preferences.dart'; | ||
| import 'package:nyrna/infrastructure/versions/versions.dart'; | ||
| import 'package:url_launcher/url_launcher.dart'; | ||
|
|
||
| part 'app_state.dart'; | ||
|
|
||
| /// Convenience access to the main app cubit. | ||
| late AppCubit appCubit; | ||
|
|
||
| class AppCubit extends Cubit<AppState> { | ||
| final NativePlatform _nativePlatform; | ||
| final Preferences _prefs; | ||
| final PreferencesCubit _prefsCubit; | ||
| final Versions _versionRepo; | ||
|
|
||
| AppCubit({ | ||
| required NativePlatform nativePlatform, | ||
| required Preferences prefs, | ||
| required PreferencesCubit prefsCubit, | ||
| required Versions versionRepository, | ||
| }) : _nativePlatform = nativePlatform, | ||
| _prefs = prefs, | ||
| _prefsCubit = prefsCubit, | ||
| _versionRepo = versionRepository, | ||
| super(AppState.initial()) { | ||
| appCubit = this; | ||
| _initialize(); | ||
| } | ||
|
|
||
| Future<void> _initialize() async { | ||
| await fetchData(); | ||
| emit(state.copyWith(loading: false)); | ||
| await _checkIsPortable(); | ||
| setAutoRefresh( | ||
| autoRefresh: _prefsCubit.state.autoRefresh, | ||
| refreshInterval: _prefsCubit.state.refreshInterval, | ||
| ); | ||
| await fetchVersionData(); | ||
| } | ||
|
|
||
| Future<void> _checkIsPortable() async { | ||
| final file = io.File('PORTABLE'); | ||
| final isPortable = await file.exists(); | ||
| emit(state.copyWith(isPortable: isPortable)); | ||
| } | ||
|
|
||
| Timer? _timer; | ||
|
|
||
| /// The timer which auto-refreshes the list of open windows. | ||
| void setAutoRefresh({ | ||
| required bool autoRefresh, | ||
| required int refreshInterval, | ||
| }) { | ||
| if (_timer != null) _timer?.cancel(); | ||
| if (autoRefresh) { | ||
| _timer = Timer.periodic( | ||
| Duration(seconds: refreshInterval), | ||
| (timer) => fetchData(), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| Future<void> fetchData() async { | ||
| await _fetchDesktop(); | ||
| await _fetchWindows(); | ||
| } | ||
|
|
||
| Future<void> _fetchDesktop() async { | ||
| final currentDesktop = await _nativePlatform.currentDesktop; | ||
| emit(state.copyWith(currentDesktop: currentDesktop)); | ||
| } | ||
|
|
||
| List<Window> _sortWindows(List<Window> windows) { | ||
| return windows.sortedBy( | ||
| (window) => window.process.executable.toLowerCase(), | ||
| ); | ||
| } | ||
|
|
||
| /// Populate the list of visible windows. | ||
| Future<void> _fetchWindows() async { | ||
| var windows = await _nativePlatform.windows(); | ||
| windows.removeWhere( | ||
| (window) => _filteredWindows.contains(window.process.executable), | ||
| ); | ||
| windows = await _checkWindowStatuses(windows); | ||
| final sortedWindows = _sortWindows(windows); | ||
| emit(state.copyWith(windows: sortedWindows)); | ||
| } | ||
|
|
||
| Future<ProcessStatus> _getProcessStatus(int pid) async { | ||
| final process = NativeProcess(pid); | ||
| final status = await process.status; | ||
| return status; | ||
| } | ||
|
|
||
| Future<List<Window>> _checkWindowStatuses(List<Window> windows) async { | ||
| final processedWindows = <Window>[]; | ||
| for (var window in windows) { | ||
| final existingWindow = state.windows.singleWhereOrNull( | ||
| (stateWindow) => stateWindow.id == window.id, | ||
| ); | ||
| if (existingWindow != null) { | ||
| processedWindows.add( | ||
| window.copyWith(process: existingWindow.process), | ||
| ); | ||
| } else { | ||
| final pid = window.process.pid; | ||
| final status = await _getProcessStatus(pid); | ||
| processedWindows.add( | ||
| window.copyWith( | ||
| process: window.process.copyWith(status: status), | ||
| ), | ||
| ); | ||
| } | ||
| } | ||
| return processedWindows; | ||
| } | ||
|
|
||
| Future<void> manualRefresh() async { | ||
| emit(state.copyWith(loading: true)); | ||
| await fetchData(); | ||
| emit(state.copyWith(loading: false)); | ||
| } | ||
|
|
||
| @visibleForTesting | ||
| Future<void> fetchVersionData() async { | ||
| final runningVersion = await _versionRepo.runningVersion(); | ||
| final latestVersion = await _versionRepo.latestVersion(); | ||
| final ignoredUpdate = _prefs.getString('ignoredUpdate'); | ||
| final updateHasBeenIgnored = (latestVersion == ignoredUpdate); | ||
| final updateAvailable = | ||
| (updateHasBeenIgnored) ? false : await _versionRepo.updateAvailable(); | ||
| emit(state.copyWith( | ||
| runningVersion: runningVersion, | ||
| updateVersion: latestVersion, | ||
| updateAvailable: updateAvailable, | ||
| )); | ||
| } | ||
|
|
||
| /// Toggle suspend / resume for the process associated with the given window. | ||
| Future<bool> toggle(Window window) async { | ||
| final pid = window.process.pid; | ||
| ProcessStatus status = await _getProcessStatus(pid); | ||
| bool success; | ||
| if (status == ProcessStatus.suspended) { | ||
| success = await _resume(window); | ||
| status = await _getProcessStatus(pid); | ||
| if (status != ProcessStatus.normal) success = false; | ||
| } else { | ||
| success = await _suspend(window); | ||
| status = await _getProcessStatus(pid); | ||
| if (status != ProcessStatus.suspended) success = false; | ||
| } | ||
| final updatedWindow = window.copyWith( | ||
| process: window.process.copyWith(status: status), | ||
| ); | ||
| final windows = List<Window>.from(state.windows); | ||
| windows.removeWhere((e) => e.id == window.id); | ||
| windows.add(updatedWindow); | ||
| final sortedWindows = _sortWindows(windows); | ||
| emit(state.copyWith(windows: sortedWindows)); | ||
| return success; | ||
| } | ||
|
|
||
| Future<bool> _resume(Window window) async { | ||
| final nativeProcess = NativeProcess(window.process.pid); | ||
| final success = await nativeProcess.resume(); | ||
| // Restore the window _after_ resuming or it might not restore. | ||
| await _nativePlatform.restoreWindow(window.id); | ||
| return (success) ? true : false; | ||
| } | ||
|
|
||
| Future<bool> _suspend(Window window) async { | ||
| // Minimize the window before suspending or it might not minimize. | ||
| await _nativePlatform.minimizeWindow(window.id); | ||
| // Small delay on Win32 to ensure the window actually minimizes. | ||
| // Doesn't seem to be necessary on Linux. | ||
| if (io.Platform.isWindows) { | ||
| await Future.delayed(Duration(milliseconds: 500)); | ||
| } | ||
| final nativeProcess = NativeProcess(window.process.pid); | ||
| final success = await nativeProcess.suspend(); | ||
| return (success) ? true : false; | ||
| } | ||
|
|
||
| Future<void> launchURL(String url) async { | ||
| await canLaunch(url) | ||
| ? await launch(url) | ||
| : throw 'Could not launch url: $url'; | ||
| } | ||
| } | ||
|
|
||
| /// System-level or non-app executables. Nyrna shouldn't show these. | ||
| List<String> _filteredWindows = [ | ||
| 'nyrna.exe', | ||
| 'ApplicationFrameHost.exe', // Manages UWP (Universal Windows Platform) apps | ||
| 'explorer.exe', // Windows File Explorer | ||
| 'googledrivesync.exe', | ||
| 'LogiOverlay.exe', // Logitech Options | ||
| 'PenTablet.exe', // XP-PEN driver | ||
| 'perfmon.exe', // Resource Monitor | ||
| 'Rainmeter.exe', | ||
| 'SystemSettings.exe', // Windows system settings | ||
| 'Taskmgr.exe', // Windows Task Manager | ||
| 'TextInputHost.exe', // Microsoft Text Input Application | ||
| 'WinStore.App.exe', // Windows Store | ||
| ]; |
Oops, something went wrong.