New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: add direct xftp upload/download commands #3781

Merged

epoberezkin merged 37 commits into master from ab/direct-xftp

Feb 19, 2024

Contributor

dpwiz commented Feb 5, 2024

No description provided.


          chat: add direct xftp upload/download commands

dpwiz force-pushed the ab/direct-xftp branch from 7ffa281 to 2728509 Compare

February 5, 2024 20:14

dpwiz added 2 commits

February 6, 2024 20:39


          adapt to FileDescriptionURI record

fc80915


          bump simplexmq

2dae0af

epoberezkin changed the title ~~chat: add direct xftp upload/download commands~~ core: add direct xftp upload/download commands

dpwiz added 3 commits

February 13, 2024 19:14


          Merge remote-tracking branch 'origin/master' into ab/direct-xftp

ad79bfe


          add description uploading

b2fa151


          filter URIs by size

7ccabe9

dpwiz marked this pull request as ready for review

February 13, 2024 20:14

dpwiz requested a review from epoberezkin as a code owner

February 13, 2024 20:14

dpwiz added 3 commits

February 13, 2024 22:32


          cleanup

2a66b40


          add file meta to events

8a191d0


          remove focus

db905c4

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

dpwiz added 3 commits

February 14, 2024 13:40


          auto-redirect when no URI fits

92569e3


          send "upload complete" event with the original file id

e522c2e


          remove description upload command

3b87503

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/Migrations/M20240214_redirect_file_id.hs Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

spaced4ndy added 3 commits

February 14, 2024 17:50


          add index

5867dc7


          refactor

b92d4cd


          update simplexmq

e2a7447

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/Store/Files.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/Store/Files.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/View.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

tests/ChatTests/Files.hs Outdated Show resolved Hide resolved

dpwiz and others added 2 commits

February 14, 2024 18:59


          Apply suggestions from code review

863962d

Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>


          fix /fc command for non-chat uploads

0b06ac8

fix

673856a

epoberezkin reviewed

View reviewed changes

src/Simplex/Chat/View.hs Outdated Show resolved Hide resolved

epoberezkin reviewed

View reviewed changes

src/Simplex/Chat/View.hs Outdated Show resolved Hide resolved


          rename (tests fail)

epoberezkin reviewed

View reviewed changes

src/Simplex/Chat.hs Show resolved Hide resolved

spaced4ndy and others added 9 commits

February 15, 2024 13:45


          num recipients

011148d


          update messages

6a6534f


          split "file complete" events for chats and standalone

b33fd23


          restore xftpSndFileRedirect

65ac62c


          remove unused store error

09974b2


          add send/cancel test

056f685


          untangle standalone views

9257a75


          fix confused id

2ecc0d9


          fix /fc and /fs

901569a

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/Store/Files.hs Outdated Show resolved Hide resolved

dpwiz added 5 commits

February 16, 2024 17:12


          resolve comments

6e432a1


          misc fixes

360c339


          bump simplexmq

edff527


          Merge remote-tracking branch 'origin/master' into ab/direct-xftp

731e17a


          fix build

46bdcd1

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat/Store/Files.hs

@@ @@ -698,7 +698,7 @@ getRcvFileTransfer_ db userId fileId = do @@
                           FSCancelled -> ft name . RFSCancelled <$> rfi_
                     where
                       standaloneName_ = case (connId_, agentRcvFileId, filePath_) of
-                        (Nothing, Just _, Just _) -> Just "direct" -- filePath marks files that are accepted from contact or, in this case, set by createRcvDirectFileTransfer
+                        (Nothing, Just _, Just _) -> Just "" -- filePath marks files that are accepted from contact or, in this case, set by createRcvDirectFileTransfer

Contributor

spaced4ndy Feb 16, 2024

not sure I understand how this comment relates to files accepted from contact if it's for standalone files

spaced4ndy reviewed

View reviewed changes

src/Simplex/Chat.hs Outdated Show resolved Hide resolved

dpwiz and others added 4 commits

February 17, 2024 18:40


          handle redirect errors independently

901e72c


          Merge remote-tracking branch 'origin/master' into ab/direct-xftp

3fa2b19


          fix missing file status in tests

cb0198e


          Merge branch 'master' into ab/direct-xftp

e88760e

epoberezkin merged commit daf67c0 into master

5 of 7 checks passed

epoberezkin deleted the ab/direct-xftp branch

February 19, 2024 10:21

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment