Skip to content

Commit cfaab6c

Browse files
cfsmp3claude
cfsmp3
and
claude
authored
refactor: Code quality improvements and testing (#73)
* refactor: Code quality improvements and testing Quick Wins: - Fix typo: orignalList -> originalList - Add logger package for proper logging - Replace all print statements with logger calls - Fix silent catch blocks with proper error logging Error Handling: - Add comprehensive HTTP error handling in updater_bloc - Add response status validation and null checks - Add proper try-catch with logging throughout Refactoring: - Refactor triple-nested BlocBuilders in start_stop_button using context.select - Extract button logic into separate _handlePress method - Clean up process_tile.dart catch blocks Accessibility: - Add Tooltip to start/stop button - Add semantic labels to icons - Add Tooltip and Semantics to add files button - Add const constructors where applicable Testing: - Add comprehensive tests for DashboardBloc (5 tests) - Add comprehensive tests for ProcessBloc (4 tests) - Total: 14 passing tests 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: Improve CCExtractor binary path resolution - Fix path resolution to check bundled executable first, then fall back to system PATH (was incorrectly detecting non-executable files) - Add debug logging to extraction process for troubleshooting - Log CCExtractor stdout/stderr output for visibility 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * style: Apply dart format 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * style: Format test file 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * ci: Update GitHub Actions to latest versions - Update actions/checkout from v2.3.4 to v4 - Update subosito/flutter-action from v1.5.3 to v2 - Update actions/upload-artifact from v2 to v4 - Pin Flutter version to 3.27.2 for consistency 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * ci: Remove deprecated flutter config commands Desktop support is enabled by default in Flutter 3.x, no need to explicitly enable it. Also fix apt-get to run update first. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * ci: Fix Windows build output path for Flutter 3.x Flutter 3.x outputs Windows builds to build/windows/x64/runner/Release instead of build/windows/runner/Release. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 50e5f3a commit cfaab6c

16 files changed

Lines changed: 530 additions & 277 deletions

‎.github/workflows/create_artifacts.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Check out repository
17-
uses: actions/checkout@v2.3.4
17+
uses: actions/checkout@v4
1818
- name: Install Flutter
19-
uses: subosito/flutter-action@v1.5.3
19+
uses: subosito/flutter-action@v2
2020
with:
21+
flutter-version: '3.27.2'
2122
channel: 'stable'
2223
- name: Flutter format
2324
run: |
@@ -34,48 +35,48 @@ jobs:
3435
runs-on: windows-latest
3536
steps:
3637
- name: Check out repository
37-
uses: actions/checkout@v2.3.4
38+
uses: actions/checkout@v4
3839
- name: Install Flutter
39-
uses: subosito/flutter-action@v1.5.3
40+
uses: subosito/flutter-action@v2
4041
with:
42+
flutter-version: '3.27.2'
4143
channel: 'stable'
42-
- name: Enable desktop support
43-
run: flutter config --enable-windows-desktop
4444
- name: Build Windows app
4545
run: flutter build windows
4646
- name: Copy VC redistributables
4747
run: |
4848
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140.dll') .
4949
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140.dll') .
5050
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140_1.dll') .
51-
working-directory: ./build/windows/runner/Release
51+
working-directory: ./build/windows/x64/runner/Release
5252
- name: Create artifact
53-
uses: actions/upload-artifact@v2
53+
uses: actions/upload-artifact@v4
5454
with:
5555
name: CCExtractor Flutter GUI Windows
5656
path: |
57-
./build/windows/runner/Release/*.exe
58-
./build/windows/runner/Release/*.dll
59-
./build/windows/runner/Release/data
57+
./build/windows/x64/runner/Release/*.exe
58+
./build/windows/x64/runner/Release/*.dll
59+
./build/windows/x64/runner/Release/data
6060
6161
build_linux:
6262
needs: flutter_test
6363
runs-on: ubuntu-latest
6464
steps:
6565
- name: Check out repository
66-
uses: actions/checkout@v2.3.4
66+
uses: actions/checkout@v4
6767
- name: Install Flutter
68-
uses: subosito/flutter-action@v1.5.3
68+
uses: subosito/flutter-action@v2
6969
with:
70+
flutter-version: '3.27.2'
7071
channel: 'stable'
71-
- name: Enable desktop support
72+
- name: Install Linux build dependencies
7273
run: |
73-
flutter config --enable-linux-desktop
74-
sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev --fix-missing
74+
sudo apt-get update
75+
sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev
7576
- name: Build Linux app
7677
run: flutter build linux
7778
- name: Create artifact
78-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v4
7980
with:
8081
name: CCExtractor Flutter GUI Linux
8182
path: ./build/linux/x64/release/bundle/

‎.github/workflows/create_releases.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,45 @@ jobs:
1010
runs-on: windows-latest
1111
steps:
1212
- name: Check out repository
13-
uses: actions/checkout@v2.3.4
13+
uses: actions/checkout@v4
1414
- name: Install Flutter
15-
uses: subosito/flutter-action@v1.5.3
15+
uses: subosito/flutter-action@v2
1616
with:
17+
flutter-version: '3.27.2'
1718
channel: 'stable'
18-
- name: Enable desktop support
19-
run: flutter config --enable-windows-desktop
2019
- name: Build Windows app
2120
run: flutter build windows
2221
- name: Copy VC redistributables
2322
run: |
2423
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\msvcp140.dll') .
2524
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140.dll') .
2625
Copy-Item (vswhere -latest -find 'VC\Redist\MSVC\*\x64\*\vcruntime140_1.dll') .
27-
working-directory: ./build/windows/runner/Release
26+
working-directory: ./build/windows/x64/runner/Release
2827
- name: Create zip
2928
uses: papeloto/action-zip@v1
3029
with:
31-
files: ./build/windows/runner/Release/
30+
files: ./build/windows/x64/runner/Release/
3231
dest: ./windows.zip
3332
- name: Upload as asset
3433
uses: AButler/upload-release-assets@v2.0
3534
with:
3635
files: './windows.zip'
37-
repo-token: ${{ secrets.GITHUB_TOKEN }}
36+
repo-token: ${{ secrets.GITHUB_TOKEN }}
3837

3938
build_linux:
4039
runs-on: ubuntu-latest
4140
steps:
4241
- name: Check out repository
43-
uses: actions/checkout@v2.3.4
42+
uses: actions/checkout@v4
4443
- name: Install Flutter
45-
uses: subosito/flutter-action@v1.5.3
44+
uses: subosito/flutter-action@v2
4645
with:
46+
flutter-version: '3.27.2'
4747
channel: 'stable'
48-
- name: Enable desktop support
48+
- name: Install Linux build dependencies
4949
run: |
50-
flutter config --enable-linux-desktop
51-
sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev
50+
sudo apt-get update
51+
sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev
5252
- name: Build Linux app
5353
run: flutter build linux
5454
- name: Create zip
@@ -60,4 +60,4 @@ jobs:
6060
uses: AButler/upload-release-assets@v2.0
6161
with:
6262
files: './linux.zip'
63-
repo-token: ${{ secrets.GITHUB_TOKEN }}
63+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎lib/bloc/process_bloc/process_bloc.dart‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:file_selector/file_selector.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44

55
import 'package:ccxgui/repositories/ccextractor.dart';
6+
import 'package:ccxgui/utils/logger.dart';
67

78
part 'process_event.dart';
89
part 'process_state.dart';
@@ -12,7 +13,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
1213

1314
ProcessBloc()
1415
: super(ProcessState(
15-
orignalList: [],
16+
originalList: [],
1617
queue: [],
1718
processed: [],
1819
log: [],
@@ -41,10 +42,14 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
4142
}
4243

4344
void _extractNext(Emitter<ProcessState> emit) {
45+
logger.d(
46+
'_extractNext called - started: ${state.started}, current: ${state.current}, queue: ${state.queue.length}');
47+
4448
if (!state.started || state.current != null || state.queue.isEmpty) {
4549
if (state.queue.isEmpty) {
50+
logger.d('Queue is empty, resetting state');
4651
emit(state.copyWith(
47-
queue: state.orignalList,
52+
queue: state.originalList,
4853
processed: state.processed,
4954
started: false,
5055
progress: '0',
@@ -54,6 +59,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
5459
return;
5560
}
5661
final file = state.queue.first;
62+
logger.i('Starting extraction for: ${file.path}');
5763
emit(state.copyWith(
5864
current: file,
5965
queue: state.queue.skip(1).toList(),
@@ -69,12 +75,15 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
6975
)
7076
.then(
7177
(value) {
78+
logger.i('Extraction completed with exit code: $value');
7279
if (value != 0) {
7380
add(ProcessError(value));
7481
}
7582
add(ProcessFileComplete(file));
7683
},
77-
);
84+
).catchError((e, stackTrace) {
85+
logger.e('Extraction failed', error: e, stackTrace: stackTrace);
86+
});
7887
}
7988

8089
void _extractOnNetwork(String type, String location, String tcppassword,
@@ -102,7 +111,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
102111
void _extractFilesInSplitMode(Emitter<ProcessState> emit) {
103112
_extractor
104113
.extractFilesInSplitMode(
105-
state.orignalList,
114+
state.originalList,
106115
listenProgress: (progress) => add(ProcessFileExtractorProgress(progress)),
107116
listenOutput: (line) => add(ProcessFileExtractorOutput(line)),
108117
listenVideoDetails: (videoDetails) =>
@@ -121,7 +130,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
121130
void _onStartAllProcess(StartAllProcess event, Emitter<ProcessState> emit) {
122131
emit(state.copyWith(
123132
current: state.current,
124-
processed: state.queue == state.orignalList ? [] : state.processed,
133+
processed: state.queue == state.originalList ? [] : state.processed,
125134
started: true,
126135
));
127136
_extractNext(emit);
@@ -136,10 +145,12 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
136145
void _onStopAllProcess(StopAllProcess event, Emitter<ProcessState> emit) {
137146
try {
138147
_extractor.cancelRun();
139-
} catch (_) {}
148+
} catch (e) {
149+
logger.w('Failed to cancel extractor run on stop all', error: e);
150+
}
140151
emit(state.copyWith(
141152
current: null,
142-
queue: state.orignalList,
153+
queue: state.originalList,
143154
processed: [],
144155
progress: '0',
145156
started: false,
@@ -149,25 +160,29 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
149160
void _onProcessKill(ProcessKill event, Emitter<ProcessState> emit) {
150161
try {
151162
_extractor.cancelRun();
152-
} catch (_) {}
163+
} catch (e) {
164+
logger.w('Failed to cancel extractor run on process kill', error: e);
165+
}
153166
emit(state.copyWith(
154167
current: state.current,
155-
orignalList:
156-
state.orignalList.where((element) => element != event.file).toList(),
168+
originalList:
169+
state.originalList.where((element) => element != event.file).toList(),
157170
queue: state.queue.where((element) => element != event.file).toList(),
158171
));
159172
}
160173

161174
void _onProcessRemoveAll(ProcessRemoveAll event, Emitter<ProcessState> emit) {
162175
try {
163176
_extractor.cancelRun();
164-
} catch (_) {}
177+
} catch (e) {
178+
logger.w('Failed to cancel extractor run on remove all', error: e);
179+
}
165180
emit(state.copyWith(
166181
current: null,
167182
progress: '0',
168183
processed: [],
169184
queue: [],
170-
orignalList: [],
185+
originalList: [],
171186
started: false,
172187
exitCode: null,
173188
log: [],
@@ -221,7 +236,7 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
221236
ProcessFilesSubmitted event, Emitter<ProcessState> emit) {
222237
emit(state.copyWith(
223238
current: state.current,
224-
orignalList: List.from(state.orignalList)..addAll(event.files),
239+
originalList: List.from(state.originalList)..addAll(event.files),
225240
processed: state.processed,
226241
queue: state.started || state.processed.isEmpty
227242
? state.queue.followedBy(event.files).toList()
@@ -233,8 +248,8 @@ class ProcessBloc extends Bloc<ProcessEvent, ProcessState> {
233248
ProcessFileRemoved event, Emitter<ProcessState> emit) {
234249
emit(state.copyWith(
235250
current: state.current,
236-
orignalList:
237-
state.orignalList.where((element) => element != event.file).toList(),
251+
originalList:
252+
state.originalList.where((element) => element != event.file).toList(),
238253
queue: state.queue.where((element) => element != event.file).toList(),
239254
));
240255
}

‎lib/bloc/process_bloc/process_state.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
part of 'process_bloc.dart';
22

33
class ProcessState extends Equatable {
4-
final List<XFile> orignalList;
4+
final List<XFile> originalList;
55
final List<XFile> processed;
66
final List<XFile> queue;
77
final List<String> log;
@@ -12,7 +12,7 @@ class ProcessState extends Equatable {
1212
final String? version;
1313
final int? exitCode;
1414
const ProcessState({
15-
required this.orignalList,
15+
required this.originalList,
1616
required this.queue,
1717
required this.processed,
1818
required this.videoDetails,
@@ -25,7 +25,7 @@ class ProcessState extends Equatable {
2525
});
2626

2727
ProcessState copyWith({
28-
List<XFile>? orignalList,
28+
List<XFile>? originalList,
2929
List<XFile>? processed,
3030
List<XFile>? queue,
3131
List<String>? log,
@@ -37,7 +37,7 @@ class ProcessState extends Equatable {
3737
int? exitCode,
3838
}) =>
3939
ProcessState(
40-
orignalList: orignalList ?? this.orignalList,
40+
originalList: originalList ?? this.originalList,
4141
queue: queue ?? this.queue,
4242
processed: processed ?? this.processed,
4343
log: log ?? this.log,
@@ -57,7 +57,7 @@ class ProcessState extends Equatable {
5757
started,
5858
progress,
5959
videoDetails,
60-
orignalList,
60+
originalList,
6161
version,
6262
exitCode,
6363
];

0 commit comments

Comments
 (0)