diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27b4ddb..f6cc403 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fetch-depth: 1 - uses: actions/setup-python@v1 with: - python-version: "3.12.8" + python-version: "3.12.9" - name: install dependencies and test run: | cd $GITHUB_WORKSPACE diff --git a/ci/run.py b/ci/run.py index 579ec25..b385041 100755 --- a/ci/run.py +++ b/ci/run.py @@ -54,7 +54,7 @@ def make_build_env(): _env_add('PATH', join(PREFIX, 'bin')) if on_github_actions(): - _env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.8/x64/lib/python3.12/site-packages')) + _env_add('PYTHONPATH', join(os.environ.get('RUNNER_TOOL_CACHE'), 'Python/3.12.9/x64/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, 'lib64', 'pkgconfig')) diff --git a/fileserver/option/option.go b/fileserver/option/option.go index 967a111..356a041 100644 --- a/fileserver/option/option.go +++ b/fileserver/option/option.go @@ -28,7 +28,6 @@ var ( Host string Port uint32 MaxUploadSize uint64 - MaxDownloadDirSize uint64 FsIdListRequestTimeout int64 // Block size for indexing uploaded files FixedBlockSize uint64 @@ -73,7 +72,6 @@ var ( func initDefaultOptions() { Host = "0.0.0.0" Port = 8082 - MaxDownloadDirSize = 100 * (1 << 20) FixedBlockSize = 1 << 23 MaxIndexingThreads = 1 WebTokenExpireTime = 7200 @@ -161,7 +159,7 @@ func parseFileServerSection(section *ini.Section) { if key, err := section.GetKey("max_upload_size"); err == nil { size, err := key.Uint() if err == nil { - MaxUploadSize = uint64(size) * (1 << 20) + MaxUploadSize = uint64(size) * 1000000 } } if key, err := section.GetKey("max_indexing_threads"); err == nil { diff --git a/python/seaserv/service.py b/python/seaserv/service.py index 733fbcd..085d80d 100644 --- a/python/seaserv/service.py +++ b/python/seaserv/service.py @@ -69,15 +69,15 @@ MAX_UPLOAD_FILE_SIZE = None # Defaults to no limit try: max_upload_size_mb = int(get_fileserver_option('max_upload_size', 0)) if max_upload_size_mb > 0: - MAX_UPLOAD_FILE_SIZE = max_upload_size_mb * (2 ** 20) + MAX_UPLOAD_FILE_SIZE = max_upload_size_mb * 1000000 except ValueError: pass -MAX_DOWNLOAD_DIR_SIZE = 100 * (2 ** 20) # Default max size of a downloadable dir +MAX_DOWNLOAD_DIR_SIZE = 100 * 1000000 # Default max size of a downloadable dir try: max_download_dir_size_mb = int(get_fileserver_option('max_download_dir_size', 0)) if max_download_dir_size_mb > 0: - MAX_DOWNLOAD_DIR_SIZE = max_download_dir_size_mb * (2 ** 20) + MAX_DOWNLOAD_DIR_SIZE = max_download_dir_size_mb * 1000000 except ValueError: pass diff --git a/server/upload-file.c b/server/upload-file.c index 5316c6e..d7a946e 100755 --- a/server/upload-file.c +++ b/server/upload-file.c @@ -241,7 +241,7 @@ check_tmp_file_list (GList *tmp_files, int *error_code) max_upload_size = seaf_cfg_manager_get_config_int64 (seaf->cfg_mgr, "fileserver", "max_upload_size"); if (max_upload_size > 0) - max_upload_size = max_upload_size * ((gint64)1 << 20); + max_upload_size = max_upload_size * 1000000; else max_upload_size = -1; diff --git a/server/zip-download-mgr.c b/server/zip-download-mgr.c index f89846f..965fea8 100644 --- a/server/zip-download-mgr.c +++ b/server/zip-download-mgr.c @@ -16,7 +16,7 @@ #define MAX_ZIP_THREAD_NUM 5 #define SCAN_PROGRESS_INTERVAL 24 * 3600 // 1 day #define PROGRESS_TTL 5 * 3600 // 5 hours -#define DEFAULT_MAX_DOWNLOAD_DIR_SIZE 100 * ((gint64)1 << 20) /* 100MB */ +#define DEFAULT_MAX_DOWNLOAD_DIR_SIZE 100 * 1000000 /* 100MB */ typedef struct ZipDownloadMgrPriv { pthread_mutex_t progress_lock; @@ -471,7 +471,7 @@ validate_download_size (DownloadObj *obj, GError **error) max_download_dir_size = seaf_cfg_manager_get_config_int64 (seaf->cfg_mgr, "fileserver", "max_download_dir_size"); if (max_download_dir_size > 0) - max_download_dir_size = max_download_dir_size * ((gint64)1 << 20); + max_download_dir_size = max_download_dir_size * 1000000; else max_download_dir_size = DEFAULT_MAX_DOWNLOAD_DIR_SIZE;