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.
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
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.
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.
Jakub Tymejczyk