Skip to content

Commit 155596b

Browse files
fix: pass inp and out flags through paramsLookupMap to get correct flag for cli
1 parent ba05c63 commit 155596b

File tree

7 files changed

+61
-34
lines changed

7 files changed

+61
-34
lines changed

lib/models/settings_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class SettingsModel {
224224
static Map<String, String> get paramsLookUpMap {
225225
return {
226226
'out': '-out=',
227-
'in': '-in=',
227+
'inp': '-in=',
228228
'outputfilename': '-o',
229229
'fixptsjumps': '-fixptsjumps',
230230
'append': '--append',

lib/repositories/settings_repository.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class SettingsRepository {
6262
settings.enabledtextfields.forEach((param) {
6363
if (!{'encoder', 'rollUp', 'out', 'inp'}.contains(param.keys.first)) {
6464
// no --encoder direct -latin1 or -utf8
65-
// -out=format
65+
// -out=format // no space
6666
paramsList.add(SettingsModel.paramsLookUpMap[param.keys.first]!);
6767
}
6868
if (param.keys.first == 'outputfilename' && filePath.isNotEmpty) {
@@ -71,7 +71,8 @@ class SettingsRepository {
7171
} else if ({'encoder', 'rollUp'}.contains(param.keys.first)) {
7272
paramsList.add('-' + param.values.first);
7373
} else if (param.keys.first == 'out' || param.keys.first == 'inp') {
74-
paramsList.add('-' + param.keys.first + '=' + param.values.first);
74+
paramsList.add(SettingsModel.paramsLookUpMap[param.keys.first]! +
75+
param.values.first);
7576
} else if (dropdownListMap.keys.contains(param.keys.first)) {
7677
/// this part handles the dropdown menus, ccx takes in arg xmltv 3 ,
7778
/// which is the same as "Both" option in the GUI, if the enabled setting

lib/screens/dashboard/dashboard.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class LogsContainer extends StatelessWidget {
234234
Widget build(BuildContext context) {
235235
return BlocBuilder<ProcessBloc, ProcessState>(
236236
builder: (context, state) {
237-
WidgetsBinding.instance!.addPostFrameCallback(
237+
WidgetsBinding.instance.addPostFrameCallback(
238238
(_) {
239239
if (_scrollController.hasClients) {
240240
_scrollController.jumpTo(

linux/flutter/generated_plugins.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
88
window_size
99
)
1010

11+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
12+
)
13+
1114
set(PLUGIN_BUNDLED_LIBRARIES)
1215

1316
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1619
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1720
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1821
endforeach(plugin)
22+
23+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
24+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
25+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
26+
endforeach(ffi_plugin)

pubspec.lock

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "21.0.0"
10+
version: "31.0.0"
1111
analyzer:
1212
dependency: transitive
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.5.0"
17+
version: "2.8.0"
1818
args:
1919
dependency: transitive
2020
description:
@@ -77,7 +77,7 @@ packages:
7777
name: build_resolvers
7878
url: "https://pub.dartlang.org"
7979
source: hosted
80-
version: "2.0.1"
80+
version: "2.0.6"
8181
build_runner:
8282
dependency: "direct dev"
8383
description:
@@ -154,7 +154,7 @@ packages:
154154
name: collection
155155
url: "https://pub.dartlang.org"
156156
source: hosted
157-
version: "1.15.0"
157+
version: "1.16.0"
158158
convert:
159159
dependency: transitive
160160
description:
@@ -196,7 +196,7 @@ packages:
196196
name: dart_style
197197
url: "https://pub.dartlang.org"
198198
source: hosted
199-
version: "2.0.0"
199+
version: "2.2.1"
200200
equatable:
201201
dependency: "direct main"
202202
description:
@@ -217,7 +217,7 @@ packages:
217217
name: fake_async
218218
url: "https://pub.dartlang.org"
219219
source: hosted
220-
version: "1.2.0"
220+
version: "1.3.0"
221221
ffi:
222222
dependency: transitive
223223
description:
@@ -292,7 +292,7 @@ packages:
292292
name: flutter_bloc
293293
url: "https://pub.dartlang.org"
294294
source: hosted
295-
version: "7.1.0"
295+
version: "7.2.0"
296296
flutter_markdown:
297297
dependency: "direct main"
298298
description:
@@ -351,7 +351,7 @@ packages:
351351
name: hive_generator
352352
url: "https://pub.dartlang.org"
353353
source: hosted
354-
version: "1.1.0"
354+
version: "1.1.3"
355355
http:
356356
dependency: "direct main"
357357
description:
@@ -393,7 +393,7 @@ packages:
393393
name: js
394394
url: "https://pub.dartlang.org"
395395
source: hosted
396-
version: "0.6.3"
396+
version: "0.6.4"
397397
json_annotation:
398398
dependency: transitive
399399
description:
@@ -406,8 +406,8 @@ packages:
406406
description:
407407
path: "."
408408
ref: HEAD
409-
resolved-ref: "08a12e657de9ee43159f01abb79135e54ad82546"
410-
url: "git://github.com/Techno-Disaster/flutter_localstorage.git"
409+
resolved-ref: "13d667d5022b9e5d88b8585481f77016e31fe63d"
410+
url: "git@github.com:Techno-Disaster/flutter_localstorage.git"
411411
source: git
412412
version: "4.0.0+1"
413413
logging:
@@ -431,6 +431,13 @@ packages:
431431
url: "https://pub.dartlang.org"
432432
source: hosted
433433
version: "0.12.11"
434+
material_color_utilities:
435+
dependency: transitive
436+
description:
437+
name: material_color_utilities
438+
url: "https://pub.dartlang.org"
439+
source: hosted
440+
version: "0.1.4"
434441
meta:
435442
dependency: transitive
436443
description:
@@ -458,7 +465,7 @@ packages:
458465
path: "."
459466
ref: HEAD
460467
resolved-ref: b3a0b2372366b0dd99c61446b331200f0af90962
461-
url: "git://github.com/Techno-Disaster/navigation_rail.git"
468+
url: "git@github.com:Techno-Disaster/navigation_rail.git"
462469
source: git
463470
version: "1.6.0-dev.1"
464471
nested:
@@ -488,7 +495,7 @@ packages:
488495
name: path
489496
url: "https://pub.dartlang.org"
490497
source: hosted
491-
version: "1.8.0"
498+
version: "1.8.1"
492499
path_drawing:
493500
dependency: transitive
494501
description:
@@ -560,12 +567,12 @@ packages:
560567
source: hosted
561568
version: "4.0.2"
562569
platform:
563-
dependency: transitive
570+
dependency: "direct main"
564571
description:
565572
name: platform
566573
url: "https://pub.dartlang.org"
567574
source: hosted
568-
version: "3.0.0"
575+
version: "3.1.0"
569576
plugin_platform_interface:
570577
dependency: transitive
571578
description:
@@ -588,12 +595,12 @@ packages:
588595
source: hosted
589596
version: "4.2.1"
590597
provider:
591-
dependency: transitive
598+
dependency: "direct main"
592599
description:
593600
name: provider
594601
url: "https://pub.dartlang.org"
595602
source: hosted
596-
version: "5.0.0"
603+
version: "6.0.3"
597604
pub_semver:
598605
dependency: transitive
599606
description:
@@ -647,14 +654,14 @@ packages:
647654
name: source_gen
648655
url: "https://pub.dartlang.org"
649656
source: hosted
650-
version: "1.0.0"
657+
version: "1.2.2"
651658
source_helper:
652659
dependency: transitive
653660
description:
654661
name: source_helper
655662
url: "https://pub.dartlang.org"
656663
source: hosted
657-
version: "1.1.0"
664+
version: "1.3.2"
658665
source_map_stack_trace:
659666
dependency: transitive
660667
description:
@@ -675,7 +682,7 @@ packages:
675682
name: source_span
676683
url: "https://pub.dartlang.org"
677684
source: hosted
678-
version: "1.8.1"
685+
version: "1.8.2"
679686
stack_trace:
680687
dependency: transitive
681688
description:
@@ -717,21 +724,21 @@ packages:
717724
name: test
718725
url: "https://pub.dartlang.org"
719726
source: hosted
720-
version: "1.17.12"
727+
version: "1.20.2"
721728
test_api:
722729
dependency: transitive
723730
description:
724731
name: test_api
725732
url: "https://pub.dartlang.org"
726733
source: hosted
727-
version: "0.4.3"
734+
version: "0.4.9"
728735
test_core:
729736
dependency: transitive
730737
description:
731738
name: test_core
732739
url: "https://pub.dartlang.org"
733740
source: hosted
734-
version: "0.4.2"
741+
version: "0.4.11"
735742
timing:
736743
dependency: transitive
737744
description:
@@ -801,7 +808,7 @@ packages:
801808
name: vector_math
802809
url: "https://pub.dartlang.org"
803810
source: hosted
804-
version: "2.1.1"
811+
version: "2.1.2"
805812
vm_service:
806813
dependency: transitive
807814
description:
@@ -842,8 +849,8 @@ packages:
842849
description:
843850
path: "plugins/window_size"
844851
ref: HEAD
845-
resolved-ref: "3da6d7b8011be38412c815c6a1832377b7d47a78"
846-
url: "git://github.com/google/flutter-desktop-embedding.git"
852+
resolved-ref: "5c51870ced62a00e809ba4b81a846a052d241c9f"
853+
url: "git@github.com:google/flutter-desktop-embedding.git"
847854
source: git
848855
version: "0.1.0"
849856
xdg_directories:
@@ -868,5 +875,5 @@ packages:
868875
source: hosted
869876
version: "3.1.0"
870877
sdks:
871-
dart: ">=2.14.0 <3.0.0"
878+
dart: ">=2.17.0-0 <3.0.0"
872879
flutter: ">=2.0.0"

pubspec.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@ dependencies:
2525
http: ^0.13.3
2626
localstorage:
2727
git:
28-
url: git://github.com/Techno-Disaster/flutter_localstorage.git
28+
url: git@github.com:Techno-Disaster/flutter_localstorage.git
2929
navigation_rail:
3030
git:
31-
url: git://github.com/Techno-Disaster/navigation_rail.git
31+
url: git@github.com:Techno-Disaster/navigation_rail.git
3232
path_provider: ^2.0.2
3333
percent_indicator: ^3.0.1
3434
url_launcher: ^6.0.9
3535
window_size:
3636
git:
37-
url: git://github.com/google/flutter-desktop-embedding.git
37+
url: git@github.com:google/flutter-desktop-embedding.git
3838
path: plugins/window_size
39+
provider: ^6.0.3
40+
platform: ^3.1.0
41+
3942
dev_dependencies:
4043
flutter_test:
4144
sdk: flutter

windows/flutter/generated_plugins.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
88
window_size
99
)
1010

11+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
12+
)
13+
1114
set(PLUGIN_BUNDLED_LIBRARIES)
1215

1316
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -16,3 +19,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1619
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1720
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1821
endforeach(plugin)
22+
23+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
24+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
25+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
26+
endforeach(ffi_plugin)

0 commit comments

Comments
 (0)