chore: 更改项目名称和文件目录

Dockerfile

@@ -14,7 +14,7 @@ RUN pip install supervisor \
 	&& echo '[include]\nfiles = /etc/supervisor/conf.d/*.conf' >> /etc/supervisord.conf \
 	&& mkdir -p /var/log/supervisor
 
-COPY ./isc_video_record ./isc_video_record
+COPY ils_common_video ./isc_video_record
 COPY ./tests ./tests
 COPY ./__init__.py ./__init__.py
 COPY ./setup.cfg ./setup.cfg

docker-compose.yaml

@@ -32,14 +32,14 @@ services:
             - 5001:5001
         volumes:
             - /var/log/event_vss:/var/log/event_vss
-        command: python isc_video_record/app.py
+        command: python ils_common_video/app.py
     isc-recorder:
         container_name: isc-recorder
         build:
             context: .
         volumes:
             - /var/log/event_vss:/var/log/event_vss
-        command: isc_video_record recorder
+        command: ils_common_video recorder
     isc-merger:
         container_name: isc-merger
         build:
@@ -47,4 +47,4 @@ services:
         volumes:
             - /data/videos/isc-record:/data/videos/isc-record
             - /var/log/event_vss:/var/log/event_vss
-        command: isc_video_record merger
+        command: ils_common_video merger

isc_video_record/app.py → ils_common_video/app.py

@@ -4,7 +4,7 @@ from flask import Flask, jsonify, request
 
 
 from intelab_python_sdk.logger import log, log_init
-from isc_video_record.db import influxdb
+from ils_common_video.db import influxdb
 
 
 log_init('api-server', True, '/var/log/event_vss')

isc_video_record/const.py → ils_common_video/const.py

 LAST_CHECK_TIME_KEY = 'hk_isc:recorder:camera:{}'
 PROCESSING_CAMERA_KEY = 'hk_isc:processing:camera:{}'
 PROCESSING_TOTAL_KEY = 'hk_isc:recording:processing:total'
+
+ACCOUNT_TOKEN_KEY = 'eviz:account:app_key:{}:token'
+DEVICE_SERIAL_KEY = 'eviz:account:device:{}'

isc_video_record/merger.py → ils_common_video/isc_video/merger.py

@@ -4,15 +4,15 @@ import time
 
 from datetime import datetime, timedelta
 
-from isc_video_record.db import influxdb
+from ils_common_video.db import influxdb
 
 from intelab_python_sdk.logger import log
 
-from isc_video_record.db import rabbitmq_connect, mysql
-from isc_video_record.db.mysql import get_camera_info, insert_video_info
-from isc_video_record.utils.alarm_utils import send_alarm_to_developer
-from isc_video_record.utils.api_helper import IntelabApiHelper, PlaybackUrlException
-from isc_video_record.utils.pre_event import PreEvent
+from ils_common_video.db import rabbitmq_connect, mysql
+from ils_common_video.db.mysql import get_camera_info, insert_video_info
+from ils_common_video.utils.alarm_utils import send_alarm_to_developer
+from ils_common_video.utils.api_helper import IntelabApiHelper, PlaybackUrlException
+from ils_common_video.utils.pre_event import PreEvent
 
 api_helper = IntelabApiHelper()
 

isc_video_record/recorder.py → ils_common_video/isc_video/recorder.py

@@ -12,14 +12,14 @@ from intelab_python_sdk.logger import log_init, log
 from intelab_python_sdk.ffmpeg.ffmpeg_concat import concat
 from intelab_python_sdk.ffmpeg.ffmpeg_prune import prune as ffmpeg_prune
 
-from isc_video_record.db import rabbitmq_connect, redis_connect, influxdb
-from isc_video_record.const import PROCESSING_CAMERA_KEY
-from isc_video_record.utils.api_helper import IntelabApiHelper, PlaybackUrlException
-from isc_video_record.utils.isc_client import HikVisionClient
-from isc_video_record.utils import aliyun_oss
-from isc_video_record.utils.record_utils import record_thread, get_video_duration, time_to_seconds, judge_video_error
-from isc_video_record.utils.alarm_utils import send_alarm_to_developer
-from isc_video_record.db import mysql
+from ils_common_video.db import rabbitmq_connect, redis_connect, influxdb
+from ils_common_video.const import PROCESSING_CAMERA_KEY
+from ils_common_video.utils.api_helper import IntelabApiHelper, PlaybackUrlException
+from ils_common_video.utils.isc_client import HikVisionClient
+from ils_common_video.utils import aliyun_oss
+from ils_common_video.utils.record_utils import record_thread, get_video_duration, time_to_seconds, judge_video_error
+from ils_common_video.utils.alarm_utils import send_alarm_to_developer
+from ils_common_video.db import mysql
 
 tz = pytz.timezone('Asia/Shanghai')
 

isc_video_record/tasks.py → ils_common_video/isc_video/tasks.py

@@ -9,14 +9,14 @@ from datetime import datetime, timedelta
 from intelab_python_sdk.logger import log
 from oss2.exceptions import NoSuchKey
 
-from isc_video_record.db import redis_connect, mysql, influxdb
-from isc_video_record.utils.alarm_utils import send_markdown
-from isc_video_record.utils.record_utils import get_time_str
-from isc_video_record.const import LAST_CHECK_TIME_KEY, PROCESSING_CAMERA_KEY
-from isc_video_record.utils.excel_utils import gen_excel
-from isc_video_record.utils.aliyun_oss import oss_upload_file, oss_delete_file
-from isc_video_record.db.mysql import get_camera_info
-from isc_video_record.utils.api_helper import IntelabApiHelper
+from ils_common_video.db import redis_connect, mysql, influxdb
+from ils_common_video.utils.alarm_utils import send_markdown
+from ils_common_video.utils.record_utils import get_time_str
+from ils_common_video.const import LAST_CHECK_TIME_KEY, PROCESSING_CAMERA_KEY
+from ils_common_video.utils.excel_utils import gen_excel
+from ils_common_video.utils.aliyun_oss import oss_upload_file, oss_delete_file
+from ils_common_video.db.mysql import get_camera_info
+from ils_common_video.utils.api_helper import IntelabApiHelper
 
 
 api_helper = IntelabApiHelper()

isc_video_record/main.py → ils_common_video/main.py

@@ -25,16 +25,16 @@ def command_line_runner():
              thread=True)
 
     if args['worker'] == 'merger':
-        from isc_video_record.merger import EventMergerJob
+        from ils_common_video.isc_video.merger import EventMergerJob
         em = EventMergerJob()
         em.start()
 
     elif args['worker'] == 'recorder':
-        from isc_video_record.recorder import StreamRecorder
+        from ils_common_video.isc_video.recorder import StreamRecorder
         sr = StreamRecorder()
         sr.start()
     elif args['worker'] == 'tasks':
-        from isc_video_record.tasks import Tasks
+        from ils_common_video.isc_video.tasks import Tasks
         t = Tasks()
         t.start()
     else:

isc_video_record/utils/isc_client.py → ils_common_video/utils/isc_client.py

@@ -10,7 +10,7 @@ from time import mktime
 from email.utils import formatdate
 from requests.packages import urllib3
 from intelab_python_sdk.logger import log
-from isc_video_record.utils.api_helper import PlaybackUrlException
+from ils_common_video.utils.api_helper import PlaybackUrlException
 
 
 class HikVisionClient(object):

isc_video_record/utils/pre_event.py → ils_common_video/utils/pre_event.py

@@ -2,7 +2,7 @@ import pytz
 from datetime import timedelta
 from dateutil.parser import parse as dt_parse
 
-from isc_video_record.db import influxdb
+from ils_common_video.db import influxdb
 
 tz = pytz.timezone('Asia/Shanghai')
 

setup.py

@@ -23,7 +23,7 @@ requires = [
 ]
 
 setuptools.setup(
-    name='isc-video-record',
+    name='ils-common-video',
     version='1.0.0b17',
     description='ISC motion detection playback video stream recording service.',
     long_description=long_description,
@@ -39,7 +39,7 @@ setuptools.setup(
 
     entry_points={
         'console_scripts': [
-            'isc_video_record = isc_video_record.main:command_line_runner',
+            'ils_common_video = ils_common_video.main:command_line_runner',
         ]
     },
 )

tests/test_clean_data.py → tests/test_isc/test_clean_data.py

-from isc_video_record.db.mysql import query
+from ils_common_video.db.mysql import query
 
 
 @query(cursor_dict=True)

tests/test_clean_processing.py → tests/test_isc/test_clean_processing.py

-from isc_video_record.db.redis import redis_connect
-from isc_video_record.const import PROCESSING_CAMERA_KEY, PROCESSING_TOTAL_KEY
+from ils_common_video.db.redis import redis_connect
+from ils_common_video.const import PROCESSING_CAMERA_KEY, PROCESSING_TOTAL_KEY
 
 
 with redis_connect() as pipe:

tests/test_common_api.py → tests/test_isc/test_common_api.py

@@ -4,8 +4,8 @@ from datetime import datetime
 from intelab_python_sdk.logger import log_init
 from dynaconf import settings
 
-from isc_video_record.utils.isc_client import HikVisionClient
-from isc_video_record.utils.api_helper import IntelabApiHelper
+from ils_common_video.utils.isc_client import HikVisionClient
+from ils_common_video.utils.api_helper import IntelabApiHelper
 
 
 tz = pytz.timezone('Asia/Shanghai')

tests/test_devices.py → tests/test_isc/test_devices.py

 from dynaconf import settings
 
-from isc_video_record.utils.isc_client import HikVisionClient
+from ils_common_video.utils.isc_client import HikVisionClient
 
 config = settings.get('ISC')
 client = HikVisionClient(config.get('KEY'), config.get('SECRET'),

tests/test_events.py → tests/test_isc/test_events.py

@@ -3,8 +3,8 @@ import pytz
 from dynaconf import settings
 from datetime import datetime
 
-from isc_video_record.utils.isc_client import HikVisionClient
-from isc_video_record.utils.pre_event import PreEvent
+from ils_common_video.utils.isc_client import HikVisionClient
+from ils_common_video.utils.pre_event import PreEvent
 
 tz = pytz.timezone('Asia/Shanghai')
 

tests/test_playback.py → tests/test_isc/test_playback.py

@@ -4,10 +4,10 @@ from datetime import datetime
 from intelab_python_sdk.logger import log_init
 from dynaconf import settings
 
-from isc_video_record.utils.isc_client import HikVisionClient
-from isc_video_record.utils.record_utils import record_thread, get_video_duration
-from isc_video_record.utils.api_helper import PlaybackUrlException
-from isc_video_record.utils.pre_event import PreEvent
+from ils_common_video.utils.isc_client import HikVisionClient
+from ils_common_video.utils.record_utils import record_thread, get_video_duration
+from ils_common_video.utils.api_helper import PlaybackUrlException
+from ils_common_video.utils.pre_event import PreEvent
 
 
 tz = pytz.timezone('Asia/Shanghai')

tests/test_preview.py → tests/test_isc/test_preview.py

 from dynaconf import settings
 
-from isc_video_record.utils.isc_client import HikVisionClient
+from ils_common_video.utils.isc_client import HikVisionClient
 
 config = settings.get('ISC')
 client = HikVisionClient(config.get('KEY'), config.get('SECRET'),

tests/test_redis_setnx.py → tests/test_isc/test_redis_setnx.py

 import time
 import threading
-from isc_video_record.db.redis import redis_connect
+from ils_common_video.db.redis import redis_connect
 
 
 def test_setnx():

tests/test_retry_event.py → tests/test_isc/test_retry_event.py

 import json
-from isc_video_record.db import mysql
-from isc_video_record.db.rabbitmq import rabbitmq_connect
+from ils_common_video.db import mysql
+from ils_common_video.db.rabbitmq import rabbitmq_connect
 
 queue_name = 'ISC_RECORD_JOB'
 

tests/test_sub.py → tests/test_isc/test_sub.py

 from dynaconf import settings
 
-from isc_video_record.utils.isc_client import HikVisionClient
+from ils_common_video.utils.isc_client import HikVisionClient
 
 config = settings.get('ISC')