Refactor unlinked files #7209

Siedlerchr · 2020-12-20T17:53:09Z

create dialog in fxml and use a background task for import

Will fix #7205 and fix #7206

Scanning:

Importing:

Expanded results:

Finish GUI Dialog
Show results after Import in own dialog (see copy files)
Background Task for Import
Basic dialog structure in MVVM

Change in CHANGELOG.md described (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for UI changes)
Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

create dialog in fxml and use a background task for import

…dtask * upstream/master: Bump pdfbox from 2.0.21 to 2.0.22 (#7213) Bump fontbox from 2.0.21 to 2.0.22 (#7219) Bump archunit-junit5-api from 0.14.1 to 0.15.0 (#7220) Bump unoloader from 7.0.3 to 7.0.4 (#7214) Bump guava from 30.0-jre to 30.1-jre (#7218) Bump xmpbox from 2.0.21 to 2.0.22 (#7217) Bump classgraph from 4.8.94 to 4.8.97 (#7211) Bump byte-buddy-parent from 1.10.18 to 1.10.19 (#7216) Bump archunit-junit5-engine from 0.14.1 to 0.15.0 (#7215) Bump org.beryx.jlink from 2.22.3 to 2.23.0 (#7212) Add missing author Remove field check for journal abbrev in entry editor (#7208)

copy over some methods

TODO: Import Button does not yet work, always null

…dtask * upstream/master: Output java error on console, too (#7222) Speedup processResources (#7221) Fix ClipboardManager <-> Prefs ordering (#7224)

TODO: Progress not yet shown

…dtask * upstream/master: fxdocs changed their URL (#7230) New Crowdin updates (#7227) Fix some fetcher test (#7225)

adjust dialog

…dtask * upstream/master: add language mapping for chinese remove chinese content fix hamcrest link Add Traditional Chinese (#7240) Show development information Allow manual trigger of the deployment workflow Release v5.2 Adapt changelog for 5.2 release Update external-libraries.md checkstyle L10n master (#7235) fix fetcher architecture test Add missing author Add error dialog "Problem finding files" (#6842) Disable ACM, Google Scholar, JSTOR (#7229)

checkstyle

disable import button

…dtask * upstream/master: GitBook: [master] 5 pages and 25 assets modified New Crowdin updates (#7246)

Siedlerchr · 2021-01-15T20:36:48Z

Arrows are now changed to up and down

…dtask * upstream/master: Export urldate to MSOffice (#7357) Fix DOI fetcher and add documentation on fetcher trust levels (#6990)

calixtus · 2021-01-18T17:49:20Z

Worked a bit on the visuals and on mvvm-pattern.

calixtus · 2021-01-18T18:51:33Z

I took a more radical approach with the "Import" button. Since it does not close the dialog anymore, but opens imports and opens the import results pane, (AND was driving me nuts, since it was not found outside the constructor) I moved it up to the buttonbar.

Siedlerchr · 2021-01-21T19:29:23Z

Any more things left or can we merge? Think it looks good now

calixtus · 2021-01-21T21:51:09Z

I am biased, so i can't judge... 😉

koppor

I have some nitpicks 😇

src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialog.fxml

src/main/resources/l10n/JabRef_en.properties

config/checkstyle/suppressions.xml

tobiasdiez

A few remarks!

src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java

tobiasdiez · 2021-01-22T10:24:54Z

src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

    private final FileUpdateMonitor fileUpdateMonitor;
    private final ExternalFilesEntryLinker linker;
    private final ExternalFilesContentImporter contentImporter;
    private final UndoManager undoManager;
    private final StateManager stateManager;
+    private List<ImportFilesResultItemViewModel> results;


Still think this, why did you marked it as "resolved"?

src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

tobiasdiez · 2021-01-22T10:40:26Z

src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java

+        scanDirectoryValidator = new FunctionBasedValidator<>(directoryPath, isDirectory,
+                ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+
+        treeRootProperty.setValue(null);


You can use the EasyBind.OptionalProperty instead of handling with null values.

No, I think it's necessary to prevent showing any empty things

The optional property is similar to Optional. Just a nice wrapper so that you don't need null but have an isEmpty etc.

I took a closer look into the EasyBind package, although there is an OptionalBinding, there seems to be no OptionalProperty. I took the liberty to make this an ObjectProperty<Optional<FileNodeViewModel>>.

src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java

src/main/java/org/jabref/gui/util/FileFilterConverter.java

src/main/java/org/jabref/logic/l10n/Localization.java

…dtask * upstream/master: Upgrade citeproc to 3.x snapshot without graal (#7370) Fix Exception if no AzureInstrumentationKey is available (#7373) Update snapcraft source url (#7372) Fix checkstyle and adjust language GitBook: [master] 3 pages and 32 assets modified Add migration to special field (#7368) GitBook: [master] 5 pages and 29 assets modified Modify message at the duplicates found dialog (#7231) Fixes miss-parsed names in `AutomaticPersonsGroup` (#7228) Fix an issue where the password for a shared SQL database was only remembered if it was the same as the username (#7364) Fix harvard exporter by changing AuthorsFormatter (#7355) Bump styfle/cancel-workflow-action from 0.6.0 to 0.7.0 (#7363) Bump mockito-core from 3.7.0 to 3.7.7 (#7360) Bump org.beryx.jlink from 2.23.1 to 2.23.2 (#7361) Bump libreoffice from 7.0.3 to 7.0.4 (#7362) Export full month name instead of number in ms office (#7358)

…mporterbackgroundtask * upstream/importerbackgroundtask: Remove obsolete language key Refactored for mvvm pattern and optics # Conflicts: # src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java # src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java

and l10n

add explaination to checkstyle

Siedlerchr · 2021-01-23T16:20:28Z

Addressed all comments except for those Binding or Optional stuff, cause I can't get it to work...

tobiasdiez

OK thanks!

* upstream/master: (217 commits) Fix handling of URL in file field (JabRef#7347) Fix expansion of bracketed expressions in RegExpBasedFileFinder (JabRef#7338) Refactor unlinked files (JabRef#7209) Add pressing enter when the search field is focused as a way to trigger search (JabRef#7377) Upgrade citeproc to 3.x snapshot without graal (JabRef#7370) Fix Exception if no AzureInstrumentationKey is available (JabRef#7373) Update snapcraft source url (JabRef#7372) Fix checkstyle and adjust language GitBook: [master] 3 pages and 32 assets modified Add migration to special field (JabRef#7368) GitBook: [master] 5 pages and 29 assets modified Modify message at the duplicates found dialog (JabRef#7231) Fixes miss-parsed names in `AutomaticPersonsGroup` (JabRef#7228) Fix an issue where the password for a shared SQL database was only remembered if it was the same as the username (JabRef#7364) Fix harvard exporter by changing AuthorsFormatter (JabRef#7355) Bump styfle/cancel-workflow-action from 0.6.0 to 0.7.0 (JabRef#7363) Bump mockito-core from 3.7.0 to 3.7.7 (JabRef#7360) Bump org.beryx.jlink from 2.23.1 to 2.23.2 (JabRef#7361) Bump libreoffice from 7.0.3 to 7.0.4 (JabRef#7362) Export full month name instead of number in ms office (JabRef#7358) ... # Conflicts: # external-libraries.md # src/main/java/module-info.java # src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java

Siedlerchr added 24 commits December 20, 2020 18:52

[WIP] Refactor unlinked files

57f210e

create dialog in fxml and use a background task for import

add controller

803c56e

inject stuff

3685516

empty line

2cb8a2d

add progreess indicator

6bdb2c6

copy over some methods

finish export implementation

98770bb

TODO: Import Button does not yet work, always null

prepare background task for import

f3d2cca

Merge remote-tracking branch 'upstream/master' into importerbackgroun…

10db39a

…dtask * upstream/master: Output java error on console, too (#7222) Speedup processResources (#7221) Fix ClipboardManager <-> Prefs ordering (#7224)

prepare eception handling

9e89c91

add further logging

eb44469

add progrees indicator linkage

1a732cb

TODO: Progress not yet shown

Fix threading issues, report progress

f0b3f79

remove useless undo stuff

a05ba1f

Merge remote-tracking branch 'upstream/master' into importerbackgroun…

1d25e30

…dtask * upstream/master: fxdocs changed their URL (#7230) New Crowdin updates (#7227) Fix some fetcher test (#7225)

wire buttons to the viewModel

3f93cef

adjust dialog

show import results dialog view

e7dddd4

better error messages

b7fcd2f

Rename files, fix cancel, fix gui

ad50cc9

Cleanup

4e37d44

checkstyle

checkstyle

6f61e8e

fix checkstyle in md

2ae183d

Make table columns more wider

27cf98d

disable import button

Siedlerchr changed the title ~~[WIP] Refactor unlinked files~~ Refactor unlinked files Dec 26, 2020

Siedlerchr added 5 commits December 26, 2020 18:10

preapre localization

98c6a7f

fix typo

6219364

Merge remote-tracking branch 'upstream/master' into importerbackgroun…

ebd0457

…dtask * upstream/master: GitBook: [master] 5 pages and 25 assets modified New Crowdin updates (#7246)

fix md errors

f722286

fix l10n key

a1da392

Fix merge conflict

7ec2651

Siedlerchr and others added 3 commits January 17, 2021 13:58

Merge remote-tracking branch 'upstream/master' into importerbackgroun…

c11d0c3

…dtask * upstream/master: Export urldate to MSOffice (#7357) Fix DOI fetcher and add documentation on fetcher trust levels (#6990)

Set disable instead of visible

686af8f

Fixed jumping arrow

ef0cc31

Refactored for mvvm pattern and optics

b1ef474

This was referenced Jan 18, 2021

Implement better scaling of main table showing entries #7181

Closed

Replace PDFContentImporter by another library koppor/jabref#169

Closed

Remove obsolete language key

9b28692

koppor requested changes Jan 21, 2021

View reviewed changes

src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialog.fxml Outdated Show resolved Hide resolved

src/main/resources/l10n/JabRef_en.properties Outdated Show resolved Hide resolved

config/checkstyle/suppressions.xml Show resolved Hide resolved

tobiasdiez requested changes Jan 22, 2021

View reviewed changes

Siedlerchr added 6 commits January 22, 2021 19:17

refactor

4efa5b9

cleanup

7c41e9a

fix checkstyle

bc6c9e1

and l10n

move vars down to background task

443c14c

add explaination to checkstyle

tobiasdiez previously approved these changes Jan 23, 2021

View reviewed changes

Made treeRootProperty a property of Optional

ecaa23a

calixtus dismissed tobiasdiez’s stale review via ecaa23a January 24, 2021 10:42

l10n

6362584

Siedlerchr merged commit 86d52cd into master Jan 24, 2021

Siedlerchr deleted the importerbackgroundtask branch January 24, 2021 17:56

koobs mentioned this pull request Jan 25, 2021

Testing and review items for Refactor unlinked files (PR #7209) #7383

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor unlinked files #7209

Refactor unlinked files #7209

Siedlerchr commented Dec 20, 2020 •

edited

Loading

Siedlerchr commented Jan 15, 2021 •

edited

Loading

calixtus commented Jan 18, 2021

calixtus commented Jan 18, 2021

Siedlerchr commented Jan 21, 2021

calixtus commented Jan 21, 2021

koppor left a comment

tobiasdiez left a comment

tobiasdiez Jan 22, 2021

tobiasdiez Jan 22, 2021

Siedlerchr Jan 22, 2021

tobiasdiez Jan 22, 2021

calixtus Jan 24, 2021

Siedlerchr commented Jan 23, 2021

tobiasdiez left a comment

Refactor unlinked files #7209

Refactor unlinked files #7209

Conversation

Siedlerchr commented Dec 20, 2020 • edited Loading

Siedlerchr commented Jan 15, 2021 • edited Loading

calixtus commented Jan 18, 2021

calixtus commented Jan 18, 2021

Siedlerchr commented Jan 21, 2021

calixtus commented Jan 21, 2021

koppor left a comment

Choose a reason for hiding this comment

tobiasdiez left a comment

Choose a reason for hiding this comment

tobiasdiez Jan 22, 2021

Choose a reason for hiding this comment

tobiasdiez Jan 22, 2021

Choose a reason for hiding this comment

Siedlerchr Jan 22, 2021

Choose a reason for hiding this comment

tobiasdiez Jan 22, 2021

Choose a reason for hiding this comment

calixtus Jan 24, 2021

Choose a reason for hiding this comment

Siedlerchr commented Jan 23, 2021

tobiasdiez left a comment

Choose a reason for hiding this comment

Siedlerchr commented Dec 20, 2020 •

edited

Loading

Siedlerchr commented Jan 15, 2021 •

edited

Loading