Fix moving of file into library by koppor · Pull Request #12001 · JabRef/jabref

koppor · 2024-10-16T22:25:36Z

Fixes https://github.com/JabRef/jabref-issue-melting-pot/issues/630

Follow-up to #11576

Additionally:

We added support for modifier keys when dropping a file on an entry in the main table.
When dropping a file into the main table, after copy or move, the file is now renamed according to the configured patterns.

Mandatory checks

I own the copyright of the code submitted and I licence it under the MIT license
Change in CHANGELOG.md described in a way that is understandable for the average user (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 developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

If any error, no double entries in result set

Siedlerchr · 2024-10-17T06:10:01Z

Need to test under Mac, there was something about modifiers not working

koppor · 2024-10-17T06:18:03Z

Need to test under Mac, there was something about modifiers not working

Test is drag and drop with and without modifier keys>

outside file directory
inside file directory

Which means: 6 different manual test cases.

You can also add drag'n'drop from another volume, which makes then 9 test cases.

github-actions · 2024-10-17T06:44:17Z

The build of this PR is available at https://builds.jabref.org/pull/12001/merge.

github-actions · 2024-10-17T12:51:13Z

The build of this PR is available at https://builds.jabref.org/pull/12001/merge.

github-actions · 2024-10-17T18:29:57Z

The build of this PR is available at https://builds.jabref.org/pull/12001/merge.

github-actions · 2024-10-17T21:09:56Z

The build of this PR is available at https://builds.jabref.org/pull/12001/merge.

Siedlerchr · 2024-10-20T17:15:56Z

Mac only supports copy https://bugs.openjdk.org/browse/JDK-8264172

…elting-630

InAnYan · 2024-10-23T09:58:52Z

I've only done 3 test cases with a .bib file outside of the PDFs files directory.

The PR works!

(Linux Mint)

koppor · 2024-10-23T12:03:39Z

One needs to check whether the file indexing works - or causes trouble... I would bet it works, because I first handle the file on the file system and then add it to jabref which then indexes it...

# Conflicts: # src/main/java/org/jabref/gui/entryeditor/EntryEditor.java # src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java # src/main/java/org/jabref/gui/maintable/MainTable.java # src/main/java/org/jabref/gui/preview/PreviewPanel.java

github-actions

Your code currently does not meet JabRef's code guidelines.
We use Checkstyle to identify issues.
The tool reviewdog already placed comments on GitHub to indicate the places. See the tab "Files" in you PR.
Please carefully follow the setup guide for the codestyle.
Afterwards, please run checkstyle locally and fix the issues.

You can check review dog's comments at the tab "Files changed" of your pull request.

LoayGhreeb · 2024-10-23T13:46:33Z

Fixed compilation errors, removed IndexManager from ImportHandler, and removed the index blocker.
Tested, the indexing works without issues.

github-actions · 2024-10-23T15:12:20Z

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

koppor · 2024-10-23T15:36:55Z

@LoayGhreeb Thank you for fixing! Then we can go ahead!

koppor added 7 commits October 16, 2024 23:06

Fix comments

bdd871d

Improve comment

2f14437

Fix variable name

c43604c

Add list of entries to ImportFilesResultItemViewModel

fd617a0

If any error, no double entries in result set

Fix support to move files into library

395543b

Handle existing files in the case of "Copy"

65c1eb7

Add link to PR

b36b7d8

koppor added 2 commits October 17, 2024 08:18

Merge remote-tracking branch 'origin/main' into fix-melting-630

a8fd477

Fix mocking for CitationsRelationTabViewModelTest

df626a4

Merge remote-tracking branch 'origin/main' into fix-melting-630

af40b8d

Merge remote-tracking branch 'origin/main' into fix-melting-630

3523d1c

Merge remote-tracking branch 'origin/main' into fix-melting-630

0d61ce7

BaronMac08 mentioned this pull request Oct 20, 2024

Show a progress indicator when dragging and dropping PDF files to JabRef #12035

Closed

7 tasks

Siedlerchr reviewed Oct 20, 2024

View reviewed changes

Comment thread src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java Outdated

Siedlerchr reviewed Oct 20, 2024

View reviewed changes

Comment thread src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java Outdated

koppor added 8 commits October 20, 2024 20:50

Use Files.isSameFile

59f38fb

Merge branch 'main' into fix-melting-630

69f142d

Clean filenames at "getValidFileName"

bf3c303

Add JavaDoc comment

af78347

Rewrite LinkedFileHandler to do the renaming, too

f0ba422

Remove unused method

0b2d27a

Introduce DragDrop.handleDropOfFiles (to avoid code duplication)

cf59fc1

Group file related methods together (in BibEntry)

0d200eb

koppor added 6 commits October 21, 2024 12:49

Refine CHANGELOG.md

ccfb397

Avoid double-addition when linking files

b1b06d1

Fix condition

2f552b3

Fix flag

a884568

Add notification also on move/copy if file exists

84c2f52

Merge branch 'fix-melting-630' of github.com:JabRef/jabref into fix-m…

5fa7653

…elting-630

This comment was marked as outdated.

Sign in to view

koppor added 4 commits October 21, 2024 14:48

Fix checkstyle error

a206fcd

Merge branch 'main' into fix-melting-630

8cf71ca

Streamline code

5856894

Fix target directory creation

8a086ff

github-actions Bot reviewed Oct 23, 2024

View reviewed changes

Fix compilation, and remove Index Manager from ImportHandler

6533615

Remove IndexManager from EntryEditor

65d2f75

This comment was marked as resolved.

Sign in to view

Update CommentsTabTest.java

5c329fe

koppor added the automerge PR is tagged with that label will be merged if workflows are green label Oct 23, 2024

jabref-machine approved these changes Oct 23, 2024

View reviewed changes

koppor added this pull request to the merge queue Oct 23, 2024

Merged via the queue into main with commit 650d4a2 Oct 23, 2024

koppor deleted the fix-melting-630 branch October 23, 2024 15:48

This was referenced Oct 23, 2024

Show an informative progress indicator when dragging and dropping PDF files to JabRef #12068

Closed

Follow-up #12035 and #12068: Show an informative progress indicator when dragging and dropping PDF files to JabRef #12072

Merged

Uh oh!

Conversation

koppor commented Oct 16, 2024

Mandatory checks

Uh oh!

Siedlerchr commented Oct 17, 2024

Uh oh!

koppor commented Oct 17, 2024

Uh oh!

github-actions Bot commented Oct 17, 2024

Uh oh!

github-actions Bot commented Oct 17, 2024

Uh oh!

github-actions Bot commented Oct 17, 2024

Uh oh!

github-actions Bot commented Oct 17, 2024

Uh oh!

Uh oh!

Uh oh!

Siedlerchr commented Oct 20, 2024

Uh oh!

This comment was marked as outdated.

Uh oh!

InAnYan commented Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

LoayGhreeb commented Oct 23, 2024

Uh oh!

This comment was marked as resolved.

Uh oh!

github-actions Bot commented Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

InAnYan commented Oct 23, 2024 •

edited

Loading

github-actions Bot commented Oct 23, 2024 •

edited

Loading