Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
openEuler-Advisor
提交
e6e24492
O
openEuler-Advisor
项目概览
openeuler
/
openEuler-Advisor
通知
32
Star
4
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openEuler-Advisor
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e6e24492
编写于
6月 29, 2020
作者:
S
solarhu
提交者:
Gitee
6月 29, 2020
浏览文件
操作
浏览文件
下载
差异文件
!8 Wrong judgment of configuration file type, change of file name of generated database
Merge pull request !8 from gongzhengtang/master
上级
480cc375
777e14c4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
27 addition
and
22 deletion
+27
-22
packageship/.gitignore
packageship/.gitignore
+3
-1
packageship/packageship/application/apps/package/function/searchdb.py
...packageship/application/apps/package/function/searchdb.py
+6
-3
packageship/packageship/application/apps/package/view.py
packageship/packageship/application/apps/package/view.py
+3
-2
packageship/packageship/application/initsystem/data_import.py
...ageship/packageship/application/initsystem/data_import.py
+13
-11
packageship/packageship/system_config.py
packageship/packageship/system_config.py
+2
-5
未找到文件。
packageship/.gitignore
浏览文件 @
e6e24492
.DS_Store
*/.DS_Store
\ No newline at end of file
*/.DS_Store
*.pyc
*.vscode
\ No newline at end of file
packageship/packageship/application/apps/package/function/searchdb.py
浏览文件 @
e6e24492
...
...
@@ -13,11 +13,12 @@ from packageship.libs.dbutils import DBHelper
from
packageship.libs.log
import
Log
from
packageship.application.models.package
import
bin_pack
from
packageship.libs.exception
import
ContentNoneException
,
Error
from
packageship.system_config
import
DATABASE_
SUCCESS_FILE
from
packageship.system_config
import
DATABASE_
FILE_INFO
from
.constants
import
ResponseCode
LOGGER
=
Log
(
__name__
)
class
SearchDB
():
"""
Description: query in database
...
...
@@ -57,7 +58,8 @@ class SearchDB():
binary_list
.
remove
(
None
)
search_set
=
set
(
binary_list
)
if
not
search_set
:
LOGGER
.
logger
.
warning
(
"The input is None, please check the input value."
)
LOGGER
.
logger
.
warning
(
"The input is None, please check the input value."
)
return
result_list
for
db_name
,
data_base
in
self
.
db_object_dict
.
items
():
try
:
...
...
@@ -130,12 +132,13 @@ class SearchDB():
return
ResponseCode
.
DIS_CONNECTION_DB
,
None
return
ResponseCode
.
PACK_NAME_NOT_FOUND
,
None
,
None
,
None
def
db_priority
():
"""
return dbprioty
"""
try
:
with
open
(
DATABASE_
SUCCESS_FILE
,
'r'
,
encoding
=
'utf-8'
)
as
file_context
:
with
open
(
DATABASE_
FILE_INFO
,
'r'
,
encoding
=
'utf-8'
)
as
file_context
:
init_database_date
=
yaml
.
load
(
file_context
.
read
(),
Loader
=
yaml
.
FullLoader
)
...
...
packageship/packageship/application/apps/package/view.py
浏览文件 @
e6e24492
...
...
@@ -14,7 +14,7 @@ from packageship.libs.exception import Error
from
packageship.libs.exception
import
ContentNoneException
from
packageship.libs.exception
import
DataMergeException
from
packageship.libs.log
import
Log
from
packageship.system_config
import
DATABASE_
SUCCESS_FILE
from
packageship.system_config
import
DATABASE_
FILE_INFO
from
.function.constants
import
ResponseCode
from
.function.packages
import
get_packages
from
.function.packages
import
update_single_package
...
...
@@ -34,6 +34,7 @@ from .serialize import have_err_db_name
LOGGER
=
Log
(
__name__
)
#pylint: disable = no-self-use
class
Packages
(
Resource
):
'''
Description: interface for package info management
...
...
@@ -403,7 +404,7 @@ class Repodatas(Resource):
changeLog:
'''
try
:
with
open
(
DATABASE_
SUCCESS_FILE
,
'r'
,
encoding
=
'utf-8'
)
as
file_context
:
with
open
(
DATABASE_
FILE_INFO
,
'r'
,
encoding
=
'utf-8'
)
as
file_context
:
init_database_date
=
yaml
.
load
(
file_context
.
read
(),
Loader
=
yaml
.
FullLoader
)
if
init_database_date
is
None
:
...
...
packageship/packageship/application/initsystem/data_import.py
浏览文件 @
e6e24492
...
...
@@ -20,7 +20,7 @@ from packageship.application.models.temporarydb import src_requires
from
packageship.application.models.temporarydb
import
bin_package
from
packageship.application.models.temporarydb
import
bin_requiresment
from
packageship.application.models.temporarydb
import
bin_provides
from
packageship.system_config
import
DATABASE_
SUCCESS_FILE
from
packageship.system_config
import
DATABASE_
FILE_INFO
from
packageship.system_config
import
DATABASE_FOLDER_PATH
LOGGER
=
Log
(
__name__
)
...
...
@@ -74,7 +74,9 @@ class InitDataBase():
'The content of the database initialization configuration file cannot be empty'
)
if
not
isinstance
(
init_database_config
,
list
):
raise
TypeError
(
'wrong type of configuration file'
)
for
config_item
in
init_database_config
:
if
not
isinstance
(
config_item
,
dict
):
raise
TypeError
(
'wrong type of configuration file'
)
return
init_database_config
def
init_data
(
self
):
...
...
@@ -101,14 +103,14 @@ class InitDataBase():
'maintenance.information'
).
create_datum_database
()
for
database
in
self
.
config_file_datas
:
if
not
isinstance
(
database
,
dict
):
continue
if
not
database
.
get
(
'dbname'
):
continue
priority
=
database
.
get
(
'priority'
)
if
not
isinstance
(
priority
,
int
)
or
priority
<
0
or
priority
>
100
:
continue
status
=
database
.
get
(
'status'
)
if
status
not
in
[
'enable'
,
'disable'
]:
continue
# Initialization data
self
.
_init_data
(
database
)
...
...
@@ -496,9 +498,9 @@ class InitDataBase():
priority: priority
'''
try
:
if
not
os
.
path
.
exists
(
DATABASE_
SUCCESS_FILE
):
pathlib
.
Path
(
DATABASE_
SUCCESS_FILE
).
touch
()
with
open
(
DATABASE_
SUCCESS_FILE
,
'a+'
,
encoding
=
'utf8'
)
as
file_context
:
if
not
os
.
path
.
exists
(
DATABASE_
FILE_INFO
):
pathlib
.
Path
(
DATABASE_
FILE_INFO
).
touch
()
with
open
(
DATABASE_
FILE_INFO
,
'a+'
,
encoding
=
'utf8'
)
as
file_context
:
setting_content
=
[]
if
'database_content'
in
Kwargs
.
keys
():
content
=
Kwargs
.
get
(
'database_content'
)
...
...
@@ -521,8 +523,8 @@ class InitDataBase():
modify record:
'''
try
:
if
os
.
path
.
exists
(
DATABASE_
SUCCESS_FILE
):
os
.
remove
(
DATABASE_
SUCCESS_FILE
)
if
os
.
path
.
exists
(
DATABASE_
FILE_INFO
):
os
.
remove
(
DATABASE_
FILE_INFO
)
except
(
IOError
,
Error
)
as
exception_msg
:
LOGGER
.
logger
.
error
(
exception_msg
)
return
False
...
...
@@ -542,14 +544,14 @@ class InitDataBase():
if
del_result
:
try
:
file_read
=
open
(
DATABASE_
SUCCESS_FILE
,
'r'
,
encoding
=
'utf-8'
)
file_read
=
open
(
DATABASE_
FILE_INFO
,
'r'
,
encoding
=
'utf-8'
)
_databases
=
yaml
.
load
(
file_read
.
read
(),
Loader
=
yaml
.
FullLoader
)
for
database
in
_databases
:
if
database
.
get
(
'database_name'
)
==
db_name
:
_databases
.
remove
(
database
)
# Delete the successfully imported database configuration node
with
open
(
DATABASE_
SUCCESS_FILE
,
'w+'
,
encoding
=
'utf-8'
)
as
file_context
:
with
open
(
DATABASE_
FILE_INFO
,
'w+'
,
encoding
=
'utf-8'
)
as
file_context
:
yaml
.
safe_dump
(
_databases
,
file_context
)
except
(
IOError
,
Error
)
as
del_config_error
:
LOGGER
.
logger
.
error
(
del_config_error
)
...
...
packageship/packageship/system_config.py
浏览文件 @
e6e24492
...
...
@@ -19,11 +19,8 @@ SYS_CONFIG_PATH = os.path.join('/', 'etc', 'pkgship', 'package.ini')
# data file after successful data import
# DATABASE_SUCCESS_FILE = os.path.join(
# BASE_PATH, 'application', 'initsystem', 'import_success_databse.yaml')
DATABASE_SUCCESS_FILE
=
os
.
path
.
join
(
'/'
,
'var'
,
'run'
,
'import_success_database.yaml'
)
DATABASE_FILE_INFO
=
os
.
path
.
join
(
'/'
,
'var'
,
'run'
,
'database_file_info.yaml'
)
# If the path of the imported database is not specified in the configuration file, the
# configuration in the system is used by default
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录