Commit Graph

1165 Commits

Author SHA1 Message Date
WindLi001
1795a27ae3 Fix translation error of Chinese UI. The "detach_image" should be "解除面孔标记", but not "修改面孔命名". 2023-02-09 15:15:51 +08:00
Viktor Strate Kløvedal
1795ff13be Merge pull request #795 from Ajnasz/transaction-error
fix transaction already commited error
2023-02-08 13:34:41 +01:00
Lajos Koszti
1f8664d7f8 fix transaction already commited error
I encountered with the following error:

> 2023/02/05 07:33:00 /app/scanner/face_detection/face_detector.go:92 sql: transaction has already been committed or rolled back
> [0.042ms] [rows:0] SELECT * FROM `media` WHERE `media`.`id` = 823 ORDER BY `media`.`id` LIMIT 1
> 2023/02/05 07:33:00 ERROR: Error detecting faces in image (/photos/Borzsony2017/DSC_0028.NEF): sql: transaction has already been committed or rolled back

It turned out it comes from the api/routes/photos.go

I found a very similar code in album_scanner.go.
The difference I saw was that while in the single photo request the
transaction passed to the `scanner_tasks.Tasks.BeforeProcessMedia` call,
in the album_scann.go the transaction created after this call and
created from the context which returned by `BeforeProcessMedia`.

Another difference was that in the `ProcessSingleMedia` call the
`AfterProcessMedia` call was called with the same - db transaction -
context, in the album_scanner it was called outside of the transaction.

I changed the logic by merging the two behavior:
Create the transaction from the context of `BeforeProcessMedia` and also
use the transaction context in the `AfterProcessMedia`.
After the change the error disappeared.

So to have it in a common place I extracted that logic into a function
and use for both the single photo request and in the album scanner.

I did not go more deeper to find out what's going on with the context
under the hood.
2023-02-05 09:05:05 +01:00
Viktor Strate Kløvedal
92bcba0334 Merge pull request #780 from queeup/master 2022-12-03 02:42:54 +01:00
queeup
a797170881 Add Turkish language 2022-12-02 15:32:49 +03:00
Viktor Strate Kløvedal
172bbebdd8 Merge pull request #774 from noel123007/chore/joe/add-globe-view
add globe view of mapbox in Places page
2022-11-27 21:32:10 +01:00
Joe
89a3830c17 chore: add mapbox globe view 2022-11-14 11:23:11 +05:30
Viktor Strate Kløvedal
c786217711 Merge pull request #752 from orellazri/timeline_reformatting
Restyle titles and spacing in timeline gallery
2022-10-09 20:38:01 +02:00
Orel
f54e6c7cb5 Restyle titles and spacing in timeline gallery
Restyle the title and album names so that the title will pop out more,
and decrease the horizontal spacing between photos in the same album.
2022-10-07 01:32:28 +03:00
Viktor Strate Kløvedal
b0bdf5414c Merge pull request #749 from rainpenber/config_improved_zh_CN_translation 2022-09-14 07:02:38 +02:00
ryanpenber
efbc54017b config🔧: Improved Simplified Chinese language translation
Modified the translation to fit the simplified Chinese user's habit
while paying respect to the predecessor

Change Explained:
- type 种类 (catagory) → 文件类型 (file type) or 格式 (file format)
- all of 'faces' 脸孔 (Traditional Chinese) → 面孔 (Simplified Chinese)
- search placeholder 搜寻 (Traditional Chinese) → 查找 (Simplified Chinese)
-  Simple and User-friendly Photo Gallery for Personal Servers
old: 简单及易用的照片库给个人服务器 (grammar mistake)
→ 为个人服务器 打造的 简单及易用的照片库 (put the "for..." part upfront)
- detach image:
分离照片脸孔 is confusing, may indicate to remove literal face from photo
解除标记:remove tag (from the photo)
- (scanner) jobs: 工作 ( has the meaning of employment in most scenario)
→  任务 (tasks)
- all of the 'iser':使用者 (correct but low word frequency) → 用户
- action:动作 (means movement in most scenario) → 操作 (operation)
- capabilities: 能力(capable of) → 权限 (access to)
- release: 释出版本(Traditional Chinese) → 发行版 (Simplified Chinese)

- add translation to the face label
- add translation to the preference page
- add translation to sidebar
- add translation to media EXIF info
- add translation to timeline filter

translation media EXIF info reference:
https://bbs.zol.com.cn/dcbbs/d167_107631.html
2022-09-14 10:49:08 +08:00
PJ-Watson
1a05b353e6 Merge branch 'eadisor-add_swipe_gesture'
Small changes between the original branch by eadisor and the master branch prevented this from being a straightforward merge (photoGalleryReducer -> mediaGalleryReducer). Also bumped the version number of react-swipeable to avoid a breaking version change further down the line.
2022-08-12 07:06:13 +01:00
PJ-Watson
0d106274d2 Manual merge of changes from react-swipeable branch, update react-swipeable version 2022-08-12 07:00:05 +01:00
PJ-Watson
4169a2c102 Merge branch 'master' into add_swipe_gesture 2022-08-12 15:42:18 +10:00
PJ-Watson
5c1bbf9065 Fixed ScanAlbum failing silently.
2.3.12 -> 2.3.13 restructured ScanAlbum so that errors were returned rather than raising a ScannerError directly - this ensures that the errors are logged correctly.
2022-08-12 02:18:59 +01:00
PJ-Watson
c8a9331f69 Merge pull request #728 from PJ-Watson/thumbnail_testing
Add support for .CR3 photos
2022-08-11 15:11:52 +10:00
PJ-Watson
7715865309 Add support for .CR3 photos. 2022-08-10 07:43:39 +01:00
Viktor Strate Kløvedal
ced9e3209f Merge pull request #725 from PJ-Watson/thumbnail_testing
Thumbnail Rendering Options
2022-08-09 10:15:08 +02:00
PJ-Watson
ca889d02bd Fixed site_info_test - missing model import. 2022-08-09 06:43:25 +01:00
PJ-Watson
3e780dbe48 Changed downsampling method to custom type. 2022-08-09 06:09:55 +01:00
PJ-Watson
866a3b4c1d Fixed ui test (default export). 2022-08-05 20:56:38 +01:00
PJ-Watson
31025f7616 Updated ui layout. 2022-08-05 20:35:00 +01:00
PJ-Watson
1c784fa5e9 Simple api test 2022-08-05 19:40:26 +01:00
PJ-Watson
ccf4e30639 Including ui test 2022-08-05 19:39:06 +01:00
PJ-Watson
5c4eeef870 Introduce thumbnail filtering options. 2022-08-05 19:37:55 +01:00
viktorstrate
446ef9a464 Remove regenerator-runtime from UI v2.3.13 2022-07-13 21:45:06 +02:00
Viktor Strate Kløvedal
a17a680457 Merge pull request #715 from photoview/ui-gql-fragments
Refactor UI: Add graphql fragments + eslint
2022-07-13 18:08:31 +02:00
viktorstrate
4c9e9a2b9a Make eslint check for typescript errors
Fix errors after making eslint more strict
2022-07-13 18:02:06 +02:00
viktorstrate
b0512d7128 Add MediaGalleryFields fragment 2022-07-13 15:10:00 +02:00
Viktor Strate Kløvedal
4177b4fb33 Merge pull request #649 from photoview/rework-scanner-internals
Split up scanner into separate tasks + update dependencies for UI, API, Dockerfile
2022-07-08 18:10:12 +02:00
viktorstrate
0a73484474 Attempt to fix Docker again 2022-07-08 17:56:52 +02:00
viktorstrate
831e24f654 Fix API tests 2022-07-08 17:44:03 +02:00
viktorstrate
214aa389fb Fix Docker builds 2022-07-08 16:49:46 +02:00
viktorstrate
d1a92afe0f Fix UI tests by replacing jest with vitest 2022-07-08 15:23:34 +02:00
viktorstrate
fdcf0cfd05 Update UI deps + replace create-react-app with vite 2022-07-08 00:33:35 +02:00
viktorstrate
a5d152f0c0 Make scanner tasks share ctx 2022-07-07 22:00:05 +02:00
viktorstrate
f512db6c32 Merge branch 'master' into rework-scanner-internals 2022-07-07 19:58:30 +02:00
viktorstrate
248d858592 Add Basque language
Thank you to Xabi for the translation
2022-07-05 15:11:49 +02:00
Viktor Strate Kløvedal
548eeed81c Merge pull request #707 from nathanrdodson/master
Following breadcrumbs now closes sidebar
2022-06-30 11:27:09 +02:00
Nathan Dodson
29516a3b49 Following breadcrumbs closes sidebar 2022-06-29 15:59:37 -05:00
Viktor Strate Kløvedal
8d78c58859 Update sponsors 2022-03-29 22:29:42 +02:00
Viktor Strate Kløvedal
d4f30795fd Merge pull request #668 from jmc265/adding-image-description
Adding image description to sidebar
2022-03-28 18:51:48 +02:00
Viktor Strate Kløvedal
e2e23c9e6f Merge pull request #664 from Goppai/fix-setting-crash
fix switching page causes setting to crash
2022-03-28 18:48:26 +02:00
viktorstrate
447f05185f Fix scanner queue tests 2022-03-28 18:43:00 +02:00
James Cross
501c50e259 Adding image description to sidebar 2022-03-28 16:08:30 +01:00
“boz”
4aca022b38 update ScannerConcurrentWorkers.test 2022-03-24 16:51:19 +08:00
“boz”
23b02e65bd delete eject 2022-03-24 16:45:42 +08:00
“boz”
ec77bc7fb1 add ScannerConcurrentWorkers.test 2022-03-24 16:42:16 +08:00
“boz”
cb5eb0e24c add eject 2022-03-23 15:56:13 +08:00
“boz”
639dcf0f07 fix switching page causes setting to crash 2022-03-23 14:21:13 +08:00