mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity

Bug511-Bosh #144

Closed
bosh wants to merge 10 commits from Bug511-Bosh into Alpha-snapshot20230621OK
pull from: Bug511-Bosh
merge into: mrlan:Alpha-snapshot20230621OK
Conversation 5 Commits 10 Files Changed 7
bosh commented 2024-06-17 14:29:19 +08:00

Modified: WordFreq.py ; wordfreqCMD.py
Created: test_bug511_Bosh.py

Modified: WordFreq.py ; wordfreqCMD.py Created: test_bug511_Bosh.py
bosh added 69 commits 2024-06-17 14:29:20 +08:00
a0ddf4bdad 上传文件至 'app/static/js' 
修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词，单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。
dca76969eb 解决程序源文件更新了，但是 docker container 中的程序源文件没有更新的问题 
问题出在 build.sh 中的 --mount type=volume,src=englishpal-db,target=/app 。
运行 docker container 时，会将整个 englishpal-db 对应的文件夹 /var/lib/docker/volumes/englishpal-db/_data
下面的内容拷贝到  docker container 里面的 /app 文件夹下面。

然而，/var/lib/docker/volumes/englishpal-db/_data 下面的源程序文件并不是最新的（比如其 main.py 是 7月17日的）。
将 target=/app 改为 target=/app/db。即可解决问题。
1b211f107d Speed up loading next article 
The key change is replacing "d1 = load_freq_history(path_prefix + 'static/frequency/ferquency.p)" with "d1 = load_freq_history(user_word_list)"
in function get_today_article() from Article.py.  Now, with a user_word_list of size about 500, the next article can be loaded within 100ms.
The new d1 is much smaller than the old one, therefore the following computation "d3 = get_difficulty_level_for_user(d1, d2)" is much faster.
The students did not feel that loading next article is slow; this is because their frequency.p is quite small.

Also log information in app/log.txt
mrlan changed title from Bug511-Bosh to Bug511-Bosh 2024-06-18 10:08:36 +08:00
mrlan changed target branch from master to Alpha-snapshot20230621OK 2024-06-18 10:08:36 +08:00
mrlan commented 2024-06-18 10:10:39 +08:00
Owner

@bosh

Please resolve the conflict.

@bosh Please resolve the conflict.
bosh commented 2024-06-19 05:52:21 +08:00
Poster

OK

OK
bosh added 2 commits 2024-06-20 02:36:44 +08:00
bosh added 1 commit 2024-06-20 02:49:21 +08:00
bosh closed this pull request 2024-06-20 02:52:26 +08:00
bosh reopened this pull request 2024-06-20 02:52:55 +08:00
bosh added 1 commit 2024-06-20 03:06:00 +08:00
bosh added 1 commit 2024-06-20 03:23:59 +08:00
bosh changed title from Bug511-Bosh to Bug511-Bosh 2024-06-20 03:26:12 +08:00
bosh commented 2024-06-20 03:27:49 +08:00
Poster

Teacher I have an issue. The files are identical, however there is still a conflict.

Teacher I have an issue. The files are identical, however there is still a conflict.
bosh commented 2024-06-20 03:29:55 +08:00
Poster

I havent even touch app/templates/userpage_get.html before. I check them in WinMerge, they are identical. Perhaps there is a mistep, could you please highlight it.

I havent even touch app/templates/userpage_get.html before. I check them in WinMerge, they are identical. Perhaps there is a mistep, could you please highlight it.
mrlan commented 2024-06-20 07:55:39 +08:00
Owner

@bosh

I suggest that you base your bugfix branch on Alpha-snapshot20230621OK, not on Alpha-snapshot20230621 (which was polluted by an unauthorized merge).

@bosh I suggest that you base your bugfix branch on Alpha-snapshot20230621OK, not on Alpha-snapshot20230621 (which was polluted by an unauthorized merge).
bosh added 1 commit 2024-06-27 02:46:38 +08:00
bosh closed this pull request 2024-06-27 02:48:29 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mrlan/EnglishPal#144
There is no content yet.
Delete Branch "Bug511-Bosh"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?