Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Memri
Flutter App for Memri
Commits
9d407de2
Commit
9d407de2
authored
3 years ago
by
Erfan Jazeb Nikoo
Browse files
Options
Download
Email Patches
Plain Diff
CU-2703c9x_Implement-logger_Erfan-Jazeb-Nikoo
- Used the new logger instead of print
parent
708aa619
Pipeline
#6148
passed with stages
in 5 minutes and 54 seconds
Changes
21
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
lib/controllers/address_book_controller.dart
+3
-2
lib/controllers/address_book_controller.dart
lib/controllers/app_controller.dart
+2
-1
lib/controllers/app_controller.dart
lib/controllers/cvu_controller.dart
+4
-3
lib/controllers/cvu_controller.dart
lib/controllers/cvu_lookup_controller.dart
+7
-6
lib/controllers/cvu_lookup_controller.dart
lib/controllers/database_query.dart
+4
-3
lib/controllers/database_query.dart
lib/controllers/syncing/sync_controller.dart
+7
-6
lib/controllers/syncing/sync_controller.dart
lib/core/apis/auth/authentication_web.dart
+3
-2
lib/core/apis/auth/authentication_web.dart
lib/core/cvu/cvu_action.dart
+19
-18
lib/core/cvu/cvu_action.dart
lib/core/services/database/demo_data.dart
+5
-4
lib/core/services/database/demo_data.dart
lib/core/services/settings.dart
+3
-2
lib/core/services/settings.dart
lib/models/database/item_edge_record.dart
+2
-1
lib/models/database/item_edge_record.dart
lib/models/database/item_record.dart
+8
-7
lib/models/database/item_record.dart
lib/models/ui/memri_text_editor_model.dart
+3
-2
lib/models/ui/memri_text_editor_model.dart
lib/utils/extensions/icon_data.dart
+2
-1
lib/utils/extensions/icon_data.dart
lib/widgets/components/ace_editor/mobile.dart
+3
-2
lib/widgets/components/ace_editor/mobile.dart
lib/widgets/components/ace_editor/unsupported.dart
+3
-2
lib/widgets/components/ace_editor/unsupported.dart
lib/widgets/components/ace_editor/web.dart
+2
-1
lib/widgets/components/ace_editor/web.dart
lib/widgets/components/html_view/html_view_kit_mobile.dart
+2
-1
lib/widgets/components/html_view/html_view_kit_mobile.dart
lib/widgets/components/image_files/file_drop_zone_web.dart
+5
-4
lib/widgets/components/image_files/file_drop_zone_web.dart
test/CVU/cvu_validator_test.dart
+2
-1
test/CVU/cvu_validator_test.dart
with
89 additions
and
69 deletions
+89
-69
lib/controllers/address_book_controller.dart
+
3
-
2
View file @
9d407de2
import
'package:flutter_contact/contacts.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/controllers/file_storage/file_storage_controller.dart'
;
...
...
@@ -55,7 +56,7 @@ class AddressBookController {
db:
db
.
databasePool
);
}
catch
(
e
)
{
//TODO: what should we do with invalid phone numbers?
print
(
e
);
AppLogger
.
err
(
e
);
}
}
...
...
@@ -247,7 +248,7 @@ class AddressBookController {
await
newFileItem
.
setPropertyValue
(
"filename"
,
PropertyDatabaseValueString
(
fileName
),
db:
dbController
);
}
catch
(
e
)
{
print
(
e
.
toString
());
AppLogger
.
err
(
e
.
toString
());
}
await
ItemEdgeRecord
(
sourceRowID:
newImageItem
.
rowId
,
name:
"file"
,
targetRowID:
newFileItem
.
rowId
)
...
...
This diff is collapsed.
Click to expand it.
lib/controllers/app_controller.dart
+
2
-
1
View file @
9d407de2
...
...
@@ -4,6 +4,7 @@ import 'dart:async';
import
'dart:isolate'
;
import
'package:flutter/foundation.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/cvu_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/controllers/file_storage/file_storage_controller.dart'
;
...
...
@@ -231,7 +232,7 @@ class AppController {
}
return
_podConnectionConfig
!
;
}
on
Exception
catch
(
error
)
{
print
(
error
);
AppLogger
.
err
(
error
);
return
null
;
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/controllers/cvu_controller.dart
+
4
-
3
View file @
9d407de2
...
...
@@ -4,6 +4,7 @@ import 'dart:convert';
import
'package:flutter/material.dart'
;
import
'package:flutter/services.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/cvu_lookup_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
...
...
@@ -40,7 +41,7 @@ class CVUController {
definitions
=
await
CVUController
.
parseCVU
();
}
}
catch
(
error
)
{
print
(
error
);
AppLogger
.
err
(
error
);
definitions
=
[];
}
}
...
...
@@ -62,7 +63,7 @@ class CVUController {
await
updateDefinition
(
revertingDefinition
,
defaultDefinition
.
parsed
);
});
}
catch
(
error
)
{
print
(
error
);
AppLogger
.
err
(
error
);
definitions
=
[];
}
}
...
...
@@ -107,7 +108,7 @@ class CVUController {
var
validStoredDefinitions
=
(
await
ItemRecord
.
fetchWithRowIDs
(
storedDefinitionIds
))
.
where
((
item
)
=
>
item
.
type
==
"CVUStoredDefinition"
);
if
(
validStoredDefinitions
.
length
!=
1
)
{
print
(
"Error! Could not find valid stored definition for:
${definition.queryStr}
"
);
AppLogger
.
err
(
"Error! Could not find valid stored definition for:
${definition.queryStr}
"
);
return
;
}
var
storedDefinition
=
validStoredDefinitions
.
first
;
...
...
This diff is collapsed.
Click to expand it.
lib/controllers/cvu_lookup_controller.dart
+
7
-
6
View file @
9d407de2
import
'dart:convert'
;
import
'package:html/parser.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/core/cvu/resolving/cvu_context.dart'
;
import
'package:memri/core/services/database/property_database_value.dart'
;
...
...
@@ -1114,7 +1115,7 @@ class CVULookupController {
return
await
resolve
<
double
>(
expression:
expression
.
lhs
,
context:
context
,
db:
db
)
??
await
resolve
<
double
>(
expression:
expression
.
rhs
,
context:
context
,
db:
db
);
}
else
if
(
expression
is
CVUExpressionNodeNegation
)
{
print
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeAddition
)
{
return
(
await
resolve
<
double
>(
expression:
expression
.
lhs
,
context:
context
,
db:
db
)
??
0
)
+
...
...
@@ -1156,7 +1157,7 @@ class CVULookupController {
return
await
resolve
<
int
>(
expression:
expression
.
lhs
,
context:
context
,
db:
db
)
??
await
resolve
<
int
>(
expression:
expression
.
rhs
,
context:
context
,
db:
db
);
}
else
if
(
expression
is
CVUExpressionNodeNegation
)
{
print
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeAddition
)
{
return
(
await
resolve
<
int
>(
expression:
expression
.
lhs
,
context:
context
,
db:
db
)
??
0
)
+
...
...
@@ -1200,13 +1201,13 @@ class CVULookupController {
??
await
resolve
<
String
>(
expression:
expression
.
rhs
,
context:
context
,
db:
db
);
}
else
if
(
expression
is
CVUExpressionNodeNegation
)
{
print
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use ! operator on non-boolean value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeAddition
)
{
return
(
await
resolve
<
String
>(
expression:
expression
.
lhs
,
context:
context
,
db:
db
)
??
""
)
+
(
await
resolve
<
String
>(
expression:
expression
.
rhs
,
context:
context
,
db:
db
)
??
""
);
}
else
if
(
expression
is
CVUExpressionNodeSubtraction
)
{
print
(
"CVU Expression error: Should not use - operator on string value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use - operator on string value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeConstant
)
{
return
expression
.
value
.
asString
();
...
...
@@ -1242,10 +1243,10 @@ class CVULookupController {
bool
?
res
=
await
resolve
<
bool
>(
expression:
expression
.
expression
,
context:
context
,
db:
db
);
return
res
==
null
?
res
:
!
res
;
}
else
if
(
expression
is
CVUExpressionNodeAddition
)
{
print
(
"CVU Expression error: Should not use + operator on bool value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use + operator on bool value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeSubtraction
)
{
print
(
"CVU Expression error: Should not use - operator on bool value"
);
AppLogger
.
err
(
"CVU Expression error: Should not use - operator on bool value"
);
return
null
;
}
else
if
(
expression
is
CVUExpressionNodeConstant
)
{
return
expression
.
value
.
asBool
();
...
...
This diff is collapsed.
Click to expand it.
lib/controllers/database_query.dart
+
4
-
3
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@ import 'package:equatable/equatable.dart';
import
'package:flutter/material.dart'
;
import
'package:json_annotation/json_annotation.dart'
;
import
'package:json_annotation/json_annotation.dart'
as
annotation
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/cvu_lookup_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
...
...
@@ -384,7 +385,7 @@ class DatabaseQueryConfig extends ChangeNotifier with EquatableMixin {
"LEFT JOIN
$tableName
as grouping ON items.row_id = grouping.item AND grouping.name = '
${groupByProperties[0]}
'"
;
groupBy
=
"grouping.value"
;
}
else
{
print
(
"Error: Unknown property
${groupByProperties[0]}
for
${itemTypes.first}
"
);
AppLogger
.
err
(
"Error: Unknown property
${groupByProperties[0]}
for
${itemTypes.first}
"
);
}
}
...
...
@@ -493,13 +494,13 @@ class DatabaseQueryConfig extends ChangeNotifier with EquatableMixin {
targetType
??=
dbController
.
schema
.
expectedTargetType
(
itemTypes
.
first
,
sortEdgeName
!
);
if
(
targetType
==
null
)
{
print
(
"No target type for
$sortEdgeName
"
);
AppLogger
.
warn
(
"No target type for
$sortEdgeName
"
);
return
conditions
;
}
SchemaValueType
?
schemaValueType
=
dbController
.
schema
.
expectedPropertyType
(
targetType
,
sortPropertyCondition
!
);
if
(
schemaValueType
==
null
)
{
print
(
"No schema type for property
$sortPropertyCondition
"
);
AppLogger
.
warn
(
"No schema type for property
$sortPropertyCondition
"
);
return
conditions
;
}
ItemRecordPropertyTable
itemRecordPropertyTable
=
...
...
This diff is collapsed.
Click to expand it.
lib/controllers/syncing/sync_controller.dart
+
7
-
6
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@
import
'dart:convert'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/controllers/file_storage/file_storage_controller.dart'
;
...
...
@@ -150,7 +151,7 @@ class SyncController {
await
setState
(
SyncControllerState
.
failed
);
throw
Exception
(
"Pod doesn't respond"
);
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
false
;
}
},
...
...
@@ -194,7 +195,7 @@ class SyncController {
var
sha256
=
fileItemRecordToDownload
[
"sha256"
];
var
fileName
=
fileItemRecordToDownload
[
"fileName"
];
print
(
"Downloading File:
$fileName
"
);
AppLogger
.
info
(
"Downloading File:
$fileName
"
);
await
downloadFile
(
sha256
,
fileName
,
(
error
)
async
{
if
(
error
!=
null
)
{
...
...
@@ -506,7 +507,7 @@ class SyncController {
var
networkCall
=
await
request
.
execute
(
connectionConfig
);
var
error
;
if
(
networkCall
.
statusCode
!=
200
)
{
print
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
AppLogger
.
err
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
error
=
networkCall
.
reasonPhrase
;
}
await
completion
(
error
);
...
...
@@ -524,7 +525,7 @@ class SyncController {
var
networkCall
=
await
request
.
execute
(
currentConnection
!
);
var
error
;
if
(
networkCall
.
statusCode
!=
200
)
{
print
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
AppLogger
.
err
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
error
=
networkCall
.
reasonPhrase
;
}
if
(
completion
!=
null
)
await
completion
(
Utf8Decoder
()
.
convert
(
networkCall
.
bodyBytes
),
error
);
...
...
@@ -551,7 +552,7 @@ class SyncController {
await
completion
(
Utf8Decoder
()
.
convert
(
networkCall
.
bodyBytes
),
null
);
return
;
}
print
(
"ERROR:
${networkCall.statusCode}
$error
on file
$fileURL
"
);
AppLogger
.
err
(
"ERROR:
${networkCall.statusCode}
$error
on file
$fileURL
"
);
}
if
(
completion
!=
null
)
await
completion
(
Utf8Decoder
()
.
convert
(
networkCall
.
bodyBytes
),
error
);
}
...
...
@@ -570,7 +571,7 @@ class SyncController {
var
error
;
if
(
networkCall
.
statusCode
!=
200
)
{
print
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
AppLogger
.
err
(
"ERROR:
${networkCall.statusCode}
${networkCall.reasonPhrase}
"
);
error
=
networkCall
.
reasonPhrase
;
}
if
(
completion
!=
null
)
await
completion
(
error
);
...
...
This diff is collapsed.
Click to expand it.
lib/core/apis/auth/authentication_web.dart
+
3
-
2
View file @
9d407de2
import
'dart:math'
;
import
'dart:typed_data'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/core/apis/auth/auth_key.dart'
;
import
'package:memri/models/database/item_record.dart'
;
import
'package:pointycastle/export.dart'
;
...
...
@@ -45,8 +46,8 @@ class Authentication {
var
publicKey
=
keyPair
.
publicKey
as
ECPublicKey
;
var
privateKeyStr
=
privateKey
.
d
!.
toRadixString
(
16
);
var
publicKeyStr
=
publicKey
.
Q
!.
x
!.
toBigInteger
()
!.
toRadixString
(
16
);
print
(
publicKeyStr
);
print
(
dbKey
);
AppLogger
.
info
(
publicKeyStr
);
AppLogger
.
info
(
dbKey
);
return
GeneratedKeys
(
privateKey:
privateKeyStr
,
publicKey:
publicKeyStr
,
dbKey:
dbKey
);
}
...
...
This diff is collapsed.
Click to expand it.
lib/core/cvu/cvu_action.dart
+
19
-
18
View file @
9d407de2
...
...
@@ -5,6 +5,7 @@ import 'dart:convert';
import
'package:flutter/material.dart'
;
import
'package:flutter/services.dart'
;
import
'package:http/http.dart'
as
http
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/cvu_controller.dart'
;
import
'package:memri/controllers/cvu_lookup_controller.dart'
;
...
...
@@ -334,7 +335,7 @@ class CVUActionOpenLink extends CVUAction {
context:
context
,
lookup:
CVULookupController
(),
db:
db
,
properties:
vars
);
var
url
=
await
resolver
.
string
(
"link"
);
if
(
url
!=
null
)
{
await
canLaunch
(
url
)
?
await
launch
(
url
)
:
print
(
'Could not launch
$url
'
);
await
canLaunch
(
url
)
?
await
launch
(
url
)
:
AppLogger
.
err
(
'Could not launch
$url
'
);
}
}
}
...
...
@@ -442,7 +443,7 @@ class CVUActionNavigateBack extends CVUAction {
if
(
pageLabel
!=
null
)
{
var
sceneController
=
pageController
.
sceneController
;
while
(
pageLabel
!.
startsWith
(
"~"
)
&&
sceneController
.
parentSceneController
!=
null
)
{
print
(
pageLabel
);
AppLogger
.
info
(
pageLabel
);
sceneController
=
sceneController
.
parentSceneController
!
;
pageLabel
=
pageLabel
.
substring
(
1
);
}
...
...
@@ -498,7 +499,7 @@ class CVUActionAddItem extends CVUAction {
try
{
await
item
.
save
(
db
.
databasePool
);
}
catch
(
error
)
{
print
(
"ERROR Adding item: "
+
error
.
toString
());
AppLogger
.
err
(
"ERROR Adding item: "
+
error
.
toString
());
}
var
itemRowId
=
item
.
rowId
;
...
...
@@ -636,7 +637,7 @@ class CVUActionOpenPlugin extends CVUAction {
var
pluginNameValue
=
vars
[
"pluginName"
];
if
(
pluginValue
==
null
&&
pluginNameValue
==
null
)
{
print
(
"Plugin data missing"
);
AppLogger
.
warn
(
"Plugin data missing"
);
return
;
}
String
?
pluginName
;
...
...
@@ -647,7 +648,7 @@ class CVUActionOpenPlugin extends CVUAction {
if
(
plugin
==
null
)
{
pluginName
=
await
lookup
.
resolve
<
String
>(
value:
pluginNameValue
,
context:
context
,
db:
db
);
if
(
pluginName
==
null
)
{
print
(
"Plugin data missing"
);
AppLogger
.
warn
(
"Plugin data missing"
);
return
;
}
...
...
@@ -659,7 +660,7 @@ class CVUActionOpenPlugin extends CVUAction {
}
if
(
plugin
==
null
)
{
print
(
"Plugin data missing"
);
AppLogger
.
warn
(
"Plugin data missing"
);
return
;
}
if
(
pluginName
==
null
)
{
...
...
@@ -720,7 +721,7 @@ class CVUActionPluginRun extends CVUAction {
containerValue
==
null
||
pluginModuleValue
==
null
||
pluginNameValue
==
null
)
{
print
(
"Not all params provided for PluginRun"
);
AppLogger
.
warn
(
"Not all params provided for PluginRun"
);
return
;
}
var
configValue
=
vars
[
"config"
];
...
...
@@ -765,7 +766,7 @@ class CVUActionPluginRun extends CVUAction {
await
PluginHandler
.
run
(
plugin:
plugin
,
runner:
pluginRunItem
,
pageController:
pageController
,
context:
context
);
}
catch
(
error
)
{
print
(
"Error starting plugin:
$error
"
);
AppLogger
.
err
(
"Error starting plugin:
$error
"
);
}
}
}
...
...
@@ -824,7 +825,7 @@ class CVUActionSync extends CVUAction {
pageController
.
isInEditMode
.
value
=
false
;
}
catch
(
error
)
{
print
(
"Error starting sync:
$error
"
);
AppLogger
.
err
(
"Error starting sync:
$error
"
);
}
}
}
...
...
@@ -883,7 +884,7 @@ class CVUActionDelete extends CVUAction {
}
subjectItem
??=
context
.
currentItem
;
if
(
subjectItem
==
null
)
{
print
(
"No subject item for property "
+
(
subjectVal
?.
value
?.
toString
()
??
""
));
AppLogger
.
warn
(
"No subject item for property "
+
(
subjectVal
?.
value
?.
toString
()
??
""
));
return
;
}
...
...
@@ -951,7 +952,7 @@ class CVUActionLink extends CVUAction {
if
(
currentEdge
.
name
==
edgeType
)
{
var
result
=
await
currentEdge
.
delete
();
if
(
result
!=
true
)
{
print
(
AppLogger
.
err
(
"ERROR CVUAction_link: item:
${subjectItems[0]!.type}
with id:
${subjectItems[0]!.rowId}
edge id:
${currentEdge.selfRowID}
"
);
return
;
}
...
...
@@ -1019,7 +1020,7 @@ class CVUActionUnlink extends CVUAction {
var
result
=
await
edge
.
delete
();
if
(
result
!=
true
)
{
print
(
AppLogger
.
err
(
"ERROR CVUAction_Unlink: item:
${subjectItem.type}
with id:
${subjectItem.rowId}
edge id:
${edge.selfRowID}
"
);
return
;
}
...
...
@@ -1056,7 +1057,7 @@ class CVUActionStar extends CVUAction {
try
{
await
currentItem
.
setPropertyValue
(
prop
,
PropertyDatabaseValueBool
(
!
currentVal
));
}
catch
(
error
)
{
print
(
AppLogger
.
err
(
"ERROR CVUAction_Star: item:
${currentItem.type}
with id:
${currentItem.rowId}
error:
$error
"
);
}
}
...
...
@@ -1240,7 +1241,7 @@ class CVUActionSetProperty extends CVUAction {
ItemRecord
?
subjectItem
=
await
lookup
.
resolve
<
ItemRecord
>(
value:
subjectVal
,
context:
context
,
db:
db
);
if
(
subjectItem
==
null
)
{
print
(
"No subject item for property "
+
subjectVal
?.
value
);
AppLogger
.
warn
(
"No subject item for property "
+
subjectVal
?.
value
);
return
;
}
String
?
property
;
...
...
@@ -1452,17 +1453,17 @@ class CVUActionCreateLabelingTask extends CVUAction {
}
var
dataset
=
await
resolver
.
item
(
"dataset"
);
if
(
dataset
==
null
)
{
print
(
"CreateLabelingTask error: dataset not resolved"
);
AppLogger
.
warn
(
"CreateLabelingTask error: dataset not resolved"
);
return
;
}
var
datasetType
=
await
dataset
.
edgeItem
(
"datasetType"
,
db:
db
);
if
(
datasetType
==
null
)
{
print
(
"CreateLabelingTask error: dataset type not resolved"
);
AppLogger
.
warn
(
"CreateLabelingTask error: dataset type not resolved"
);
return
;
}
var
query
=
(
await
datasetType
.
propertyValue
(
"queryStr"
))
?.
asString
();
if
(
query
==
null
)
{
print
(
"CreateLabelingTask error: couldn't find query from dataset type"
);
AppLogger
.
warn
(
"CreateLabelingTask error: couldn't find query from dataset type"
);
return
;
}
var
decodedQuery
=
jsonDecode
(
query
);
...
...
@@ -1505,7 +1506,7 @@ class CVUActionCreateLabelingTask extends CVUAction {
cvu
+=
'
\n
}
\n
}
\n
}'
;
var
cvuID
=
await
CVUController
.
storeDefinition
(
cvu
,
db
);
if
(
cvuID
==
null
)
{
print
(
"CreateLabelingTask error: definition haven't saved"
);
AppLogger
.
warn
(
"CreateLabelingTask error: definition haven't saved"
);
return
;
}
var
newVars
=
Map
.
of
(
vars
);
...
...
This diff is collapsed.
Click to expand it.
lib/core/services/database/demo_data.dart
+
5
-
4
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@ import 'dart:convert';
import
'dart:math'
;
import
'package:flutter/services.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/constants/app_settings.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
...
...
@@ -51,7 +52,7 @@ class DemoData {
if
(
isRunningTests
)
{
throw
(
string
);
}
else
{
print
(
string
);
AppLogger
.
err
(
string
);
}
}
...
...
@@ -121,7 +122,7 @@ class DemoData {
throw
(
string
);
}
else
{
// Notify developer of error in demo data, but continue
print
(
string
);
AppLogger
.
err
(
string
);
}
}
...
...
@@ -224,7 +225,7 @@ class DemoData {
throw
(
string
);
}
else
{
// Notify developer of error in demo data, but continue
print
(
string
);
AppLogger
.
err
(
string
);
}
}
...
...
@@ -235,7 +236,7 @@ class DemoData {
}
if
(
types
[
itemType
]
==
null
)
{
print
(
"
$itemType
not in schema"
);
AppLogger
.
warn
(
"
$itemType
not in schema"
);
return
[];
}
...
...
This diff is collapsed.
Click to expand it.
lib/core/services/settings.dart
+
3
-
2
View file @
9d407de2
import
'dart:convert'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/core/services/database/property_database_value.dart'
;
import
'package:memri/models/database/database.dart'
;
...
...
@@ -30,7 +31,7 @@ class Settings {
}
}
}
catch
(
error
)
{
print
(
"Could not fetch setting '
$path
':
$error
"
);
AppLogger
.
err
(
"Could not fetch setting '
$path
':
$error
"
);
}
return
null
;
...
...
@@ -87,7 +88,7 @@ class Settings {
await
setSetting
(
searchPaths
[
0
],
value
);
_fire
(
searchPaths
[
0
],
value
);
}
catch
(
error
)
{
print
(
error
);
AppLogger
.
err
(
error
);
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/models/database/item_edge_record.dart
+
2
-
1
View file @
9d407de2
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/core/apis/pod/pod_payloads.dart'
;
...
...
@@ -192,7 +193,7 @@ class ItemEdgeRecord {
}
}
print
(
"ERROR: Could not locate edge for synced edge:
$syncedEdge
"
);
AppLogger
.
err
(
"ERROR: Could not locate edge for synced edge:
$syncedEdge
"
);
}
}
}
This diff is collapsed.
Click to expand it.
lib/models/database/item_record.dart
+
8
-
7
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@ import 'dart:async';
import
'package:equatable/equatable.dart'
;
import
'package:json_annotation/json_annotation.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/app_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
import
'package:memri/controllers/file_storage/file_storage_controller.dart'
;
...
...
@@ -225,7 +226,7 @@ class ItemRecord with EquatableMixin {
if
(
item
==
null
)
return
null
;
return
ItemRecord
.
fromItem
(
item
);
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
null
;
}
}
...
...
@@ -237,7 +238,7 @@ class ItemRecord with EquatableMixin {
if
(
item
==
null
)
return
null
;
return
ItemRecord
.
fromItem
(
item
);
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
null
;
}
}
...
...
@@ -252,7 +253,7 @@ class ItemRecord with EquatableMixin {
.
map
((
item
)
=
>
ItemRecord
.
fromItem
(
item
))
.
toList
();
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
[];
}
}
...
...
@@ -263,7 +264,7 @@ class ItemRecord with EquatableMixin {
List
<
Item
>
items
=
await
db
.
databasePool
.
itemRecordFetchWithRowIDs
(
ids
);
return
items
.
map
((
item
)
=
>
ItemRecord
.
fromItem
(
item
))
.
toList
();
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
[];
}
}
...
...
@@ -311,7 +312,7 @@ class ItemRecord with EquatableMixin {
return
edgeRecords
;
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
[];
}
}
...
...
@@ -359,7 +360,7 @@ class ItemRecord with EquatableMixin {
return
edgeRecords
;
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
[];
}
}
...
...
@@ -931,7 +932,7 @@ class ItemRecord with EquatableMixin {
targetRowID:
privateKeyItem
.
rowId
)
.
save
(
db
);
}
catch
(
error
)
{
print
(
"ERROR: setOwnerAndDBKey
$error
"
);
AppLogger
.
err
(
"ERROR: setOwnerAndDBKey
$error
"
);
throw
Exception
(
"Error deleting existing db keys"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/models/ui/memri_text_editor_model.dart
+
3
-
2
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@ import 'dart:ui';
import
'package:html/dom.dart'
;
import
'package:html/parser.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/constants/cvu/cvu_color.dart'
;
class
MemriTextEditorModel
{
...
...
@@ -30,7 +31,7 @@ class MemriTextEditorModel {
var
body
=
doc
.
body
?.
innerHtml
??
""
;
return
[
title
,
body
];
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
[
null
,
string
];
}
}
...
...
@@ -44,7 +45,7 @@ class MemriTextEditorModel {
titleElement
.
text
=
await
title
??
""
;
return
titleElement
.
outerHtml
+
(
doc
.
body
?.
innerHtml
??
""
);
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
await
body
;
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/utils/extensions/icon_data.dart
+
2
-
1
View file @
9d407de2
import
'package:flutter/material.dart'
;
import
'package:memri/constants/app_logger.dart'
;
extension
MemriIcon
on
IconData
{
static
IconData
getByName
(
String
iconName
)
{
...
...
@@ -96,7 +97,7 @@ extension MemriIcon on IconData {
case
'refresh'
:
return
Icons
.
refresh
;
default
:
print
(
"Unknown icon
$iconName
"
);
AppLogger
.
warn
(
"Unknown icon
$iconName
"
);
return
Icons
.
contact_support_rounded
;
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/widgets/components/ace_editor/mobile.dart
+
3
-
2
View file @
9d407de2
import
'package:flutter/material.dart'
;
import
'package:memri/constants/app_logger.dart'
;
class
AceEditorController
{
String
?
_content
;
...
...
@@ -11,10 +12,10 @@ class AceEditorController {
AceEditorController
(
this
.
onResultReceived
,
{
this
.
validate
});
updateEditorContent
(
String
?
newContent
)
{
print
(
"Error: not implemented now"
);
AppLogger
.
err
(
"Error: not implemented now"
);
}
requestEditorData
()
{
print
(
"Error: not implemented now"
);
AppLogger
.
err
(
"Error: not implemented now"
);
}
}
This diff is collapsed.
Click to expand it.
lib/widgets/components/ace_editor/unsupported.dart
+
3
-
2
View file @
9d407de2
import
'package:flutter/material.dart'
;
import
'package:memri/constants/app_logger.dart'
;
class
AceEditorController
{
String
?
_content
;
...
...
@@ -11,10 +12,10 @@ class AceEditorController {
AceEditorController
(
this
.
onResultReceived
,
{
this
.
validate
});
updateEditorContent
(
String
?
newContent
)
{
print
(
"Error: not implemented now"
);
AppLogger
.
err
(
"Error: not implemented now"
);
}
requestEditorData
()
{
print
(
"Error: not implemented now"
);
AppLogger
.
err
(
"Error: not implemented now"
);
}
}
This diff is collapsed.
Click to expand it.
lib/widgets/components/ace_editor/web.dart
+
2
-
1
View file @
9d407de2
...
...
@@ -2,6 +2,7 @@ import 'dart:convert';
import
'dart:html'
as
html
;
import
'package:flutter/material.dart'
;
import
'package:memri/constants/app_logger.dart'
;
class
AceEditorController
{
String
?
_content
;
...
...
@@ -61,7 +62,7 @@ class AceEditorController {
var
annotations
=
await
validate
!.
call
(
_validatedContent
);
_postMessage
(
action:
"updateValidation"
,
data:
{
"annotations"
:
annotations
});
}
catch
(
error
)
{
print
(
error
);
AppLogger
.
err
(
error
);
}
break
;
...
...
This diff is collapsed.
Click to expand it.
lib/widgets/components/html_view/html_view_kit_mobile.dart
+
2
-
1
View file @
9d407de2
...
...
@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
import
'package:flutter/gestures.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter/services.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:webview_flutter/webview_flutter.dart'
;
class
HtmlViewUIKit
extends
StatefulWidget
{
...
...
@@ -57,7 +58,7 @@ class _HtmlViewUIKitState extends State<HtmlViewUIKit> {
await
_webViewController
.
runJavascript
(
jsContent
);
await
_webViewController
.
runJavascript
(
getContentLoaderString
());
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/widgets/components/image_files/file_drop_zone_web.dart
+
5
-
4
View file @
9d407de2
...
...
@@ -6,6 +6,7 @@ import 'package:dotted_border/dotted_border.dart';
import
'package:flutter/gestures.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter_dropzone/flutter_dropzone.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/constants/cvu/cvu_font.dart'
;
import
'package:memri/controllers/file_storage/file_storage_controller.dart'
;
import
'package:memri/core/services/database/property_database_value.dart'
;
...
...
@@ -88,7 +89,7 @@ class _FileDropZoneState extends State<FileDropZone> {
setState
(()
{});
});
reader
.
onError
.
listen
((
event
)
{
print
(
'there was an error'
);
AppLogger
.
err
(
'there was an error'
);
});
reader
.
readAsArrayBuffer
(
file
);
}
...
...
@@ -99,7 +100,7 @@ class _FileDropZoneState extends State<FileDropZone> {
builder:
(
context
)
=
>
DropzoneView
(
operation:
DragOperation
.
copy
,
onCreated:
(
ctrl
)
=
>
controller
=
ctrl
,
onError:
(
ev
)
=
>
print
(
'Zone error:
$ev
'
),
onError:
(
ev
)
=
>
AppLogger
.
err
(
'Zone error:
$ev
'
),
onHover:
()
{
setState
(()
=
>
highlighted
=
true
);
},
...
...
@@ -126,10 +127,10 @@ class _FileDropZoneState extends State<FileDropZone> {
}
else
if
(
mime
.
startsWith
(
"image/"
))
{
await
saveImage
(
fileName
,
fileData
);
}
else
{
print
(
"Not resolved file type"
);
AppLogger
.
warn
(
"Not resolved file type"
);
}
}
catch
(
e
)
{
print
(
e
);
AppLogger
.
err
(
e
);
}
}
...
...
This diff is collapsed.
Click to expand it.
test/CVU/cvu_validator_test.dart
+
2
-
1
View file @
9d407de2
import
'package:flutter_test/flutter_test.dart'
;
import
'package:memri/constants/app_logger.dart'
;
import
'package:memri/controllers/cvu_controller.dart'
;
import
'package:memri/controllers/cvu_lookup_controller.dart'
;
import
'package:memri/controllers/database_controller.dart'
;
...
...
@@ -28,7 +29,7 @@ validate(String snippet, {errors = 0, warnings = 0, CVUParseErrors? parseError})
expect
(
validator
.
errors
.
length
,
errors
);
expect
(
validator
.
warnings
.
length
,
warnings
);
}
else
{
print
((
validator
.
errors
+
validator
.
warnings
)
AppLogger
.
err
((
validator
.
errors
+
validator
.
warnings
)
.
map
((
annotation
)
=
>
annotation
.
message
)
.
join
(
"
\n
"
));
expect
(
result
,
true
);
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets