Commit graph

4600 commits

Author SHA1 Message Date
Abhinav 6b7c5f4cb2 fix spacing 2022-09-09 13:08:05 +05:30
Abhinav aee203adab remove filePath logging 2022-09-09 13:04:14 +05:30
Abhinav 4d32354275 fix getValidFilesToUpload check 2022-09-09 13:00:33 +05:30
Abhinav cdf532b477 dedupe files to be sent for uploads 2022-09-09 12:49:03 +05:30
Abhinav 7ecf2e22f4 add to debug log folder path and remove from sentry logs 2022-09-09 12:31:54 +05:30
Abhinav 638901d956 filterOutSystemFiles by own 2022-09-09 12:17:45 +05:30
Abhinav 938e896ce9 remove loader before existing 2022-09-09 12:17:01 +05:30
Abhinav cf914d975c ignore system files during uploads 2022-09-09 10:47:04 +05:30
Abhinav 45eabbf0c2 use push event helper instead of directly added event to queue 2022-09-09 09:23:01 +05:30
Abhinav 3609067243 Merge branch 'main' into fix-watch-folder-issues 2022-09-09 08:55:24 +05:30
Abhinav 2df32ba7f3 add Tooltip to watch mapping icon 2022-09-07 20:56:18 +05:30
Abhinav bd4b456bd1 fix NoMappingsContent font sizes 2022-09-07 20:50:35 +05:30
Abhinav 445da5e83e fix stale hasUnUploadedFiles 2022-09-07 20:40:39 +05:30
Abhinav cbe17dbd42 clear pickedUploadType after use so that it doesn't get used for drag and drop upload which doesn't set a upload type 2022-09-07 19:41:49 +05:30
Abhinav 7a3da0d3df clear watchFolderFiles after use 2022-09-07 19:09:15 +05:30
Abhinav 11c3647cd6 update background paper and overPaper colors 2022-09-07 11:29:54 +05:30
Abhinav Kumar f6fe0743bb
Merge pull request #583 from ente-io/watch
Watch Folders
2022-09-07 11:14:51 +05:30
Abhinav 5011f9b959 change case electron instance variable 2022-09-07 11:07:17 +05:30
Abhinav ba0f26a86d remove unused code 2022-09-07 10:56:04 +05:30
Abhinav c4e7535872 add a show on electron only check 2022-09-06 18:04:34 +05:30
Abhinav cb82ab255d fix diskFolderRemovedCallback 2022-09-06 17:57:28 +05:30
Abhinav 1cdfa9cb5e fix diskFolderRemovedCallback 2022-09-06 17:49:55 +05:30
Abhinav cb71d9ca7a fix getCollectionNameAndFolderPath 2022-09-06 17:49:30 +05:30
Abhinav Kumar 9c4a6339ec
Merge pull request #696 from ente-io/account-delete
Account delete
2022-09-06 17:14:31 +05:30
Abhinav a06c92d597 fix LinkButton 2022-09-06 17:03:25 +05:30
Abhinav 7fd5f31aa3 authenticate before showing delete confirmation screen 2022-09-06 16:52:24 +05:30
Abhinav f84f8f1ba7 remove space after email 2022-09-06 16:48:41 +05:30
Abhinav 73af3eb40c update link style 2022-09-06 16:47:21 +05:30
Abhinav 353bba2b6a fix feedback url 2022-09-06 16:40:36 +05:30
Abhinav 96b6769326 fix getCollectionNameAndFolderPath 2022-09-06 15:40:49 +05:30
Abhinav a02e80e31f update preCollectionCreationAction 2022-09-06 14:45:29 +05:30
Abhinav b784e87b56 add ignore duplicate upload event logic 2022-09-06 14:30:44 +05:30
Abhinav e23333deed fix user upload trigerred when user doesn't have any collection 2022-09-06 13:53:40 +05:30
Abhinav ed1a1af886 don't save for retry watchFolder upload files as they are already tracked 2022-09-06 11:47:29 +05:30
Abhinav 81f71ff4a7 rearrange variables 2022-09-06 10:47:48 +05:30
Abhinav 2589232dd9 rearrange variables 2022-09-06 10:46:29 +05:30
Abhinav e0ffb6e9f3 add error handling for on mount useEffect of AuthenticateUserModal 2022-09-06 10:43:41 +05:30
Abhinav f611ff2a6a add new line 2022-09-06 10:33:11 +05:30
Abhinav 520ec6b1e0 improve delete account modal 2022-09-05 22:08:47 +05:30
Abhinav bb358672eb convert decryptedChallenge to utf8 2022-09-05 22:08:21 +05:30
Abhinav 6ae569e921 fix deleteAccount api 2022-09-05 22:07:54 +05:30
Abhinav aa476b1014 dont auto opn 2022-09-05 21:21:19 +05:30
Abhinav 6d35de6a5d added solve challenge and delete account logic 2022-09-05 21:19:43 +05:30
Abhinav d6d505a0e8 add delete api 2022-09-05 21:19:23 +05:30
Abhinav fc2fe84726 improve verify master password form 2022-09-05 21:18:58 +05:30
Abhinav 921e05fbf7 added delete account modal 2022-09-05 21:17:49 +05:30
Abhinav 111e6f7116 create authenticate user modal 2022-09-05 21:17:30 +05:30
Abhinav dbfffdeb6c refactored credential into verify master password form 2022-09-05 21:16:51 +05:30
Abhinav aafc3af100 add getAccountDeleteChallenge api 2022-09-05 21:14:08 +05:30
Abhinav 8aab1cbd04 fix waitAndRun and better name 2022-09-05 19:29:03 +05:30
Abhinav Kumar 02afc0b9cb
Merge pull request #693 from ente-io/refactor-upload
Refactor upload
2022-09-05 15:44:00 +05:30
Abhinav 513c7cf167 fix uploadDone not runnign 2022-09-03 21:01:05 +05:30
Abhinav f8b0706d81 add files that can't be uploaded to ignored files 2022-09-03 20:38:25 +05:30
Abhinav 88d2654095 add local log 2022-09-03 19:30:44 +05:30
Abhinav 64e15798ad fix already upload file not getting added as synced file 2022-09-03 19:30:07 +05:30
Abhinav 1e43359414 make overflow menu background to over paper 2022-09-03 18:54:41 +05:30
Abhinav ea2d142d60 fix sizing and layout 2022-09-03 18:47:47 +05:30
Abhinav bcb0fe7ed8 make ui changes 2022-09-03 18:26:05 +05:30
Abhinav 75e28d0a37 made cancel button secondary 2022-09-03 18:05:11 +05:30
Abhinav 1fb2d10cce update max width 2022-09-03 18:03:39 +05:30
Abhinav 5628fbbb81 fix casing 2022-09-03 18:02:29 +05:30
Abhinav faac1e6f51 moved watch folder to top of utility section 2022-09-03 18:01:44 +05:30
Abhinav 9a12deebb0 don't update File Path 2022-09-03 17:42:01 +05:30
Abhinav 73c94d139e convert console logs to addlogLine 2022-09-03 17:40:33 +05:30
Abhinav 022826dfa6 use shouldAllowNewUpload to prevent uploads 2022-09-02 15:33:37 +05:30
Abhinav 6c95b6b26b add desktop proxied redirect url for desktop stripe checkout session 2022-09-02 11:40:29 +05:30
Abhinav dc65cbf7d8 minor fixes 2022-09-02 08:31:53 +05:30
Abhinav 1669d1a8b4 Merge branch 'cancel-upload-without-reload' into watch 2022-09-01 20:56:43 +05:30
Abhinav f97215742f merge same action cases 2022-09-01 20:55:05 +05:30
Abhinav da6626f514 add add missing UPLOAD_RESULT as no-op 2022-09-01 20:53:31 +05:30
Abhinav 209fc4fe54 set new created collection during upload to state 2022-09-01 20:32:18 +05:30
Abhinav e821ee726c return existing file for already uploaded case 2022-09-01 18:53:06 +05:30
Abhinav 1435a80096 skip cancelled upload error logging for both v1 and v2 putFile and putFilePart api 2022-09-01 18:16:27 +05:30
Abhinav 45a2f5056f refactor 2022-09-01 17:49:53 +05:30
Abhinav 0646a908e2 Merge branch 'cancel-upload-without-reload' into watch 2022-09-01 17:44:30 +05:30
Abhinav e444177d6a Merge branch 'refactor-upload' into cancel-upload-without-reload 2022-09-01 17:21:13 +05:30
Abhinav 3bbdc58920 rename 2022-09-01 16:47:49 +05:30
Abhinav 5e0bcb0a79 add comment explaining the useEffect 2022-09-01 16:45:48 +05:30
Abhinav 0efa4825ea rename web specific selectorFiles states 2022-09-01 16:39:46 +05:30
Abhinav c62242aabd pass only user owned collections as existingCollection to createAlbum 2022-09-01 16:25:32 +05:30
Abhinav a7ab0bb35e fix add symlink 2022-09-01 16:08:38 +05:30
Abhinav c7c56a06c7 add local logging 2022-09-01 16:08:12 +05:30
Abhinav ea02a98633 get user owned files 2022-09-01 14:38:57 +05:30
Abhinav 5667b1dc18 fix trashed and shared getting removed from ui file state 2022-09-01 14:35:43 +05:30
Abhinav 3c74653d1e fix retry 2022-09-01 14:20:09 +05:30
Abhinav a0f51e5157 fix decryptedFile undefined check 2022-09-01 14:10:40 +05:30
Abhinav 5fac8de289 fix groupFilesBasedOnParentFolder 2022-09-01 13:55:43 +05:30
Abhinav 4afd5f77b9 fix matching file logic
There is a case where the file is in multiple collection, one the current upload collection (say x ) and one another collection (say y).

we might get y collection's file and we will try to add a symlink for it in collection x and that will return a no-op from the server , and we would show the file as uploaded, instead of showing it as ignored already in collection.
2022-09-01 13:53:34 +05:30
Abhinav 8f7714b07f filter non user and trashed files from existing files 2022-09-01 13:43:11 +05:30
Abhinav 412e035e85 rename and comment pickedUploadType 2022-09-01 13:33:01 +05:30
Abhinav f29262c2b6 fix check of when to update existing files 2022-09-01 13:29:35 +05:30
Abhinav 294e167b9b rename analysisResult to importSuggestion 2022-09-01 12:45:43 +05:30
Abhinav 9cc2a6e361 better naming and comment for logic 2022-09-01 11:29:12 +05:30
Abhinav 815111890b open DeleteAccountModal from sidebar 2022-08-31 18:16:22 +05:30
Abhinav 506002499e pass handleUploadError as checkForBreakingError to putFilePart and putFile's retryHTppCall checkForBreakingError util 2022-08-31 16:22:32 +05:30
Abhinav e109b1e0f0 refactored code 2022-08-31 15:53:59 +05:30
Abhinav 454e8b2459 close progress bar if result list doesn't have any file and upload is cancelled 2022-08-31 15:51:39 +05:30
Abhinav eb6c395902 don't retry if when error is upload_cancelled 2022-08-31 14:29:51 +05:30
Abhinav 18b382f213 reset cancelUpload state when preparing for new upload 2022-08-31 14:26:35 +05:30
Abhinav 6662779c57 fix UPLOAD_STAGE_MESSAGE 2022-08-31 14:19:35 +05:30
Abhinav 62f9e8f1f8 refactor 2022-08-31 14:13:14 +05:30
Abhinav c704e9ed4b fix http request cancel cancelCancelledUploadRequest 2022-08-31 14:12:20 +05:30
Abhinav dce6d847a6 minor changes 2022-08-31 14:06:15 +05:30
Abhinav 92b1ae8746 add cancel with reload logic 2022-08-31 13:20:43 +05:30
Abhinav a961dd16cc dont need setUploadTypeSelectorView 2022-08-31 12:54:00 +05:30
Abhinav 4dd8b3b49d Merge branch 'refactor-upload' into watch 2022-08-31 12:45:28 +05:30
Abhinav 9acc58fba2 remove unneeded syncWithRemote 2022-08-31 12:20:10 +05:30
Abhinav 96cffbe70f don't allow to open uploader if upload already running 2022-08-31 11:39:01 +05:30
Abhinav 84412b84e7 fix added symlink file not showing up 2022-08-31 11:29:10 +05:30
Abhinav 336be411cf moved electronFiles and webFilesS state to uploader Component 2022-08-31 11:17:16 +05:30
Abhinav da39180c59 remove empty import 2022-08-31 10:20:31 +05:30
Abhinav 198172bfa5 temp 2022-08-30 16:09:01 +05:30
Abhinav 66162c5267 fix minor issues 2022-08-30 15:45:46 +05:30
Abhinav 9eecec6d04 refactor upload 2022-08-30 14:45:47 +05:30
Abhinav cfcfbb876f remove unneeded function 2022-08-30 14:30:11 +05:30
Abhinav 913995d55b add reason message to axios request cancellation 2022-08-30 13:15:44 +05:30
Abhinav 33fee37783 handle upload_result.cancelled in post upload action 2022-08-30 13:15:23 +05:30
Abhinav 50f02a6fc2 rename and move post upload complete logic to uploadFiles function 2022-08-30 12:28:41 +05:30
Abhinav fabf7a2b4a rename to cancelUpload and update cancellation logic 2022-08-30 11:53:31 +05:30
Abhinav 2013de81a7 created new uploadPausingService and move pausing logic to uploader where ever possible 2022-08-30 11:18:01 +05:30
Abhinav 1f257f8ed7 remove unreachable return 2022-08-30 10:37:13 +05:30
Abhinav dcbe3a084c rename 2022-08-29 17:50:08 +05:30
Abhinav 3630635d8a move setupWatcherFunctions to init and fix sync of intial watch folder files 2022-08-29 17:23:44 +05:30
Abhinav 48029d7aa8 fix build 2022-08-29 16:59:37 +05:30
Abhinav 7f8ca59c25 add upload to seperate album symbol 2022-08-29 16:59:17 +05:30
Abhinav 2fa74a399e add logic to check if folder has nested Folders 2022-08-29 16:58:46 +05:30
Abhinav c8393f6f24 fix folderPath check 2022-08-29 15:16:20 +05:30
Abhinav 4a344c941f rename doesFolderExists to isFolder 2022-08-29 11:52:00 +05:30
Abhinav a0feb50bff remove reload from cancelling logic 2022-08-29 11:35:18 +05:30
Abhinav 5e7473e966 upload files with dot in names too 2022-08-29 11:07:13 +05:30
Abhinav dcb2534b99 refactor code 2022-08-29 10:55:44 +05:30
Abhinav 6a1963146b revert testing changes 2022-08-29 10:41:00 +05:30
Abhinav 352db11ef3 fix build 2022-08-29 10:32:37 +05:30
Abhinav d75d82af1a Merge branch 'add-electron-types' into watch 2022-08-29 10:11:32 +05:30
Abhinav cb491047dd Merge branch 'main' into add-electron-types 2022-08-29 10:03:44 +05:30
Abhinav Kumar ba279d3138
Merge pull request #692 from ente-io/fix-collection-file-count
Fix collection file count
2022-08-27 19:57:54 +05:30
Abhinav 6d7ef3d842 fix naming 2022-08-27 17:50:49 +05:30
Abhinav 1cc48655c8 restructure and rename 2022-08-27 17:37:15 +05:30
Abhinav 680b796e6c update getCollectionsFileCount to get count for trash, archived and all Section 2022-08-27 15:28:57 +05:30
Abhinav 617a607878 only group actual collection 2022-08-27 15:28:12 +05:30
Abhinav 45aee68c36 use a common user instead fo reading user from local storage for each call to isSharedFile 2022-08-27 15:26:47 +05:30
Abhinav 8ceea8b3c3 fix archived section counting file multiple times if it is in multiple collections 2022-08-27 14:38:09 +05:30
Vishnu Mohandas 8ddfb64149
Fix typo 2022-08-27 14:09:33 +05:30
Abhinav 416debc74e better types and follow types 2022-08-27 10:20:34 +05:30
Abhinav 03b0c4128f add ElectronAPIs types 2022-08-27 10:07:01 +05:30
Vishnu Mohandas b74f723016
Merge pull request #689 from ente-io/fix-public-collection-video-download
fix downloadFile for video download
2022-08-26 18:47:45 +05:30
Abhinav ad588fbdab fix downloadFile for video download 2022-08-26 18:43:30 +05:30
Abhinav 354642c834 update to use the new apis 2022-08-26 16:29:54 +05:30
Abhinav 0e0acdf218 remove getElectronFile api 2022-08-26 15:04:43 +05:30
Vishnu Mohandas c57195b94c
Merge pull request #688 from ente-io/fix-changed-email-not-synced
update user email with the synced user details email
2022-08-26 14:34:51 +05:30