Show an informative progress indicator when dragging and dropping PDF files to JabRef by BaronMac08 · Pull Request #12068 · JabRef/jabref

BaronMac08 · 2024-10-23T21:30:48Z

Closes #8738

Builds upon: the branch fix-melting-630 merged at #12001

Modifications:

Dragging and dropping several PDF files into JabRef will be one large import rather than one small import for every file

Additions:

Added informative messages about the ongoing progress of the big import by building upon the BackgroundTask progress indicator
Added shortenFileName(fileName, maxLength) in StringUtil to shorten and prominently display the files being imported
Added one new unit test for validating StringUtil.shortenFileName()

UI Screenshots after modifications and additions:

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

…issue-8738 # Conflicts: # src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

…elting-630

# Conflicts: # buildres/abbrv.jabref.org # src/main/resources/csl-styles

…sue-8738

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

… for language consistency Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

…ortenFileName

# 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

…tenFileName

koppor · 2024-10-23T21:50:35Z

This PR is a follow-up to #12035. We need the magic of https://blog.flupp.de/posts/git-and-squashed-prs/. I will try.

# Conflicts: # src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java

koppor · 2024-10-23T22:04:55Z

@BaronMac08 Seeing the diff at https://github.com/JabRef/jabref/pull/12035/files, I would propose:

Close this pull request
Fetch upstream/main
Create a new branch fiix-8738 based on upstream/main
Apply the changes listed at ttps://github.com/Show a progress indicator when dragging and dropping PDF files to JabRef #12035/files manually using your IDE
Commit and push
Create pull request.

koppor · 2024-10-23T22:07:10Z

Internal note:

I could not do "git magic", because following command hangs:

git commit-tree 9dc82bc2931d1474ea656835bbe192dc1e54cea4 -p 650d4a248a49c08ca1a51278 -p fix-melting-630

BaronMac08 · 2024-10-23T22:08:32Z

@BaronMac08 Seeing the diff at https://github.com/JabRef/jabref/pull/12035/files, I would propose:

Close this pull request

Fetch upstream/main

Create a new branch fiix-8738 based on upstream/main

Apply the changes listed at ttps://github.com/Show a progress indicator when dragging and dropping PDF files to JabRef #12035/files manually using your IDE

Commit and push

Create pull request.

Thank you @koppor. I will follow the suggested solution and open a new pull request.

…hen dragging and dropping PDF files to JabRef (#12072) * Updated changes following up for pull requests #12035 and #12068 * Updated CHANGELOG.md to display correct pull request * Updated StringUtil.shortenFileName to handle maxLength null case and added unit tests for maxLength null cases * Updated CHANGELOG.md to follow format and be more concise * Moved shortenFileName() to FileUtil * Refactored FileUtil.shortenFileName to better use of maxLength and Updated progress messages for Importing, Indexing files. --------- Co-authored-by: Baron Mac <u7874720@anu.edu.au>

koppor and others added 30 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

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

Refactored importFilesInBackground and Processing, Indexing messages

2a0a3cd

Merge remote-tracking branch 'upstream/fix-melting-630' into fix-for-…

b4aac00

…issue-8738 # Conflicts: # src/main/java/org/jabref/gui/externalfiles/ImportHandler.java

Merge remote-tracking branch 'upstream/main' into fix-for-issue-8738

e05e3b3

Switched to import all files' entries at once

92208a2

Update CHANGELOG.md with information about new changes

d2a7cb3

Remove trailing spaces in CHANGELOG.md

8a18e61

Update keys in JabRef_en.properties for localization consistency

16bd17e

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

Remove unused methods

c343a9b

Refine CHANGELOG.md

ccfb397

Avoid double-addition when linking files

b1b06d1

koppor and others added 19 commits October 21, 2024 13:10

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

Fix checkstyle error

a206fcd

Merge branch 'main' into fix-melting-630

8cf71ca

Added StringUtil.shortenFileName() to handle long filenames

4535c8e

Update localization keys and Unit tests for StringUtil.shortenFileName()

0aea294

Streamline code

5856894

Fix target directory creation

8a086ff

Merge remote-tracking branch 'origin/main' into fix-for-issue-8738

1d6b988

# Conflicts: # buildres/abbrv.jabref.org # src/main/resources/csl-styles

Merge remote-tracking branch 'origin/fix-melting-630' into fix-for-is…

3761f73

…sue-8738

Update CHANGELOG.md removing technical casing and terms

a4daa69

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

Added Localization.lang in org.jabref.gui.externalfiles.ImportHandler…

28811f5

… for language consistency Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>

Refactored comments and file's extension extraction for StringUtil.sh…

23b00de

…ortenFileName

Refactored shortenFileName test into @ParameterizedTest using @CsvSource

a0bc115

Refactored extension handling and unit test cases for StringUtil.shor…

4291ffd

…tenFileName

Updated CHANGELOG.md to correct Pull Request

00d2262

BaronMac08 marked this pull request as ready for review October 23, 2024 21:33

BaronMac08 mentioned this pull request Oct 23, 2024

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

Closed

7 tasks

Merge branch 'fix-melting-630' into fix-for-issue-8738

ceea376

# Conflicts: # src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java

BaronMac08 closed this Oct 23, 2024

BaronMac08 mentioned this pull request Oct 24, 2024

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

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

Show an informative progress indicator when dragging and dropping PDF files to JabRef #12068
BaronMac08 wants to merge 50 commits into
JabRef:mainfrom
BaronMac08:fix-for-issue-8738

BaronMac08 commented Oct 23, 2024

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

BaronMac08 commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

BaronMac08 commented Oct 23, 2024

Mandatory checks

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

koppor commented Oct 23, 2024

Uh oh!

BaronMac08 commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants