haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-10 11:48:53 +00:00
Code Issues Releases Wiki Activity

Get dot from the end of the string (#757)

Browse Source 
* Get dot from the end of the string

* Upgrade ci python

---------

Co-authored-by: Heran Yang <heran.yang@seafile.com>
This commit is contained in:
feiniks
2025-05-09 14:36:25 +08:00
committed by GitHub
parent fde8864542
commit af4b73515c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-python@v1 - uses: actions/setup-python@v1
with: with:
python-version: "3.12.9" python-version: "3.12.10"
- name: install dependencies and test - name: install dependencies and test
run: | run: |
cd $GITHUB_WORKSPACE cd $GITHUB_WORKSPACE

2
ci/run.py
View File

@@ -54,7 +54,7 @@ def make_build_env():
_env_add('PATH', join(PREFIX, 'bin')) _env_add('PATH', join(PREFIX, 'bin'))
if on_github_actions(): if on_github_actions():
_env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.9/x64/lib/python3.12/site-packages')) _env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.10/x64/lib/python3.12/site-packages'))
_env_add('PYTHONPATH', join(PREFIX, 'lib/python3.12/site-packages')) _env_add('PYTHONPATH', join(PREFIX, 'lib/python3.12/site-packages'))
_env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib', 'pkgconfig')) _env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib', 'pkgconfig'))
_env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib64', 'pkgconfig')) _env_add('PKG_CONFIG_PATH', join(PREFIX, 'lib64', 'pkgconfig'))

4
fileserver/fileop.go
View File

@@ -932,7 +932,7 @@ func genUniqueFileName(fileName string, fileList []string) string {
var uniqueName string var uniqueName string
var name string var name string
i := 1 i := 1
dot := strings.Index(fileName, ".") dot := strings.LastIndex(fileName, ".")
if dot < 0 { if dot < 0 {
name = fileName name = fileName
} else { } else {
@@ -2334,7 +2334,7 @@ func genUniqueName(fileName string, entries []*fsmgr.SeafDirent) string {
var uniqueName string var uniqueName string
var name string var name string
i := 1 i := 1
dot := strings.Index(fileName, ".") dot := strings.LastIndex(fileName, ".")
if dot < 0 { if dot < 0 {
name = fileName name = fileName
} else { } else {