ff_plugins/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
flaskfarm
2022-10-11 16:46:05 +09:00
parent d84226eac2
commit 9aeae36964
20 changed files with 182 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/plugin/ffmpeg_queue.py
View File

@@ -1,14 +1,11 @@
# -*- coding: utf-8 -*-
#########################################################
# python
import os, sys, traceback
import threading, time
from datetime import datetime
import abc
import os
import queue
import threading
import time
import traceback
from datetime import datetime
# third-party
# sjva 공용
#########################################################
class FfmpegQueueEntity(abc.ABCMeta('ABC', (object,), {'__slots__': ()})):
@@ -78,12 +75,6 @@ class FfmpegQueueEntity(abc.ABCMeta('ABC', (object,), {'__slots__': ()})):
class FfmpegQueue(object):
def __init__(self, P, max_ffmpeg_count):
self.P = P
self.static_index = 1
@@ -136,6 +127,7 @@ class FfmpegQueue(object):
continue
import ffmpeg
#max_pf_count = 0
#save_path = ModelSetting.get('download_path')
#if ModelSetting.get('auto_make_folder') == 'True':

2
lib/plugin/logic.py
View File

@@ -79,7 +79,7 @@ class Logic(object):
except Exception as e:
self.P.logger.error(f'Exception:{str(e)}')
self.P.logger.error(traceback.format_exc())
self.P.logger.debug('%s plugin_unload', self.P.package_name)
self.P.logger.debug(f'[{self.P.package_name}] plugin_unload end')
except Exception as e:
self.P.logger.error(f'Exception:{str(e)}')
self.P.logger.error(traceback.format_exc())

29
lib/plugin/model_base.py
View File

@@ -1,17 +1,10 @@
# -*- coding: utf-8 -*-
#########################################################
# python
import traceback
from datetime import datetime
# third-party
from framework import F
# sjva 공용
from framework import db
from framework.util import Util
#########################################################
class ModelBase(db.Model):
class ModelBase(F.db.Model):
__abstract__ = True
__table_args__ = {'mysql_collate': 'utf8_general_ci'}
model_setting = None
@@ -26,8 +19,8 @@ class ModelBase(db.Model):
def save(self):
try:
db.session.add(self)
db.session.commit()
F.db.session.add(self)
F.db.session.commit()
except Exception as e:
self.logger.error(f'Exception:{str(e)}')
self.logger.error(traceback.format_exc())
@@ -60,7 +53,7 @@ class ModelBase(db.Model):
@classmethod
def get_by_id(cls, id):
try:
return db.session.query(cls).filter_by(id=id).first()
return F.db.session.query(cls).filter_by(id=id).first()
except Exception as e:
cls.logger.error(f'Exception:{str(e)}')
cls.logger.error(traceback.format_exc())
@@ -69,7 +62,7 @@ class ModelBase(db.Model):
@classmethod
def get_list(cls, by_dict=False):
try:
tmp = db.session.query(cls).all()
tmp = F.db.session.query(cls).all()
if by_dict:
tmp = [x.as_dict() for x in tmp]
return tmp
@@ -82,8 +75,8 @@ class ModelBase(db.Model):
@classmethod
def delete_by_id(cls, id):
try:
db.session.query(cls).filter_by(id=id).delete()
db.session.commit()
F.db.session.query(cls).filter_by(id=id).delete()
F.db.session.commit()
return True
except Exception as e:
cls.logger.error(f'Exception:{str(e)}')
@@ -93,8 +86,8 @@ class ModelBase(db.Model):
@classmethod
def delete_all(cls):
try:
db.session.query(cls).delete()
db.session.commit()
F.db.session.query(cls).delete()
F.db.session.commit()
return True
except Exception as e:
cls.logger.error(f'Exception:{str(e)}')
@@ -140,6 +133,6 @@ class ModelBase(db.Model):
# 오버라이딩
@classmethod
def make_query(cls, order='desc', search='', option1='all', option2='all'):
query = db.session.query(cls)
query = F.db.session.query(cls)
return query

46
lib/plugin/model_setting.py
View File

@@ -1,25 +1,18 @@
# -*- coding: utf-8 -*-
#########################################################
# python
import os, traceback
import traceback
# third-party
from framework import F
# sjva 공용
from framework import frame, db
from framework.util import Util
#########################################################
def get_model_setting(package_name, logger, table_name=None):
class ModelSetting(db.Model):
class ModelSetting(F.db.Model):
__tablename__ = '%s_setting' % package_name if table_name is None else table_name
__table_args__ = {'mysql_collate': 'utf8_general_ci'}
__bind_key__ = package_name
id = db.Column(db.Integer, primary_key=True)
key = db.Column(db.String, unique=True, nullable=False)
value = db.Column(db.String, nullable=False)
id = F.db.Column(F.db.Integer, primary_key=True)
key = F.db.Column(F.db.String, unique=True, nullable=False)
value = F.db.Column(F.db.String, nullable=False)
def __init__(self, key, value):
self.key = key
@@ -34,7 +27,7 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def get(key):
try:
ret = db.session.query(ModelSetting).filter_by(key=key).first()
ret = F.db.session.query(ModelSetting).filter_by(key=key).first()
if ret is not None:
return ret.value.strip()
return None
@@ -44,7 +37,7 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def has_key(key):
return (db.session.query(ModelSetting).filter_by(key=key).first() is not None)
return (F.db.session.query(ModelSetting).filter_by(key=key).first() is not None)
@staticmethod
def get_int(key):
@@ -65,13 +58,13 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def set(key, value):
try:
item = db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
item = F.db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
if item is not None:
item.value = value.strip() if value is not None else value
db.session.commit()
F.db.session.commit()
else:
db.session.add(ModelSetting(key, value.strip()))
db.session.commit()
F.db.session.add(ModelSetting(key, value.strip()))
F.db.session.commit()
except Exception as exception:
logger.error('Exception:%s %s', exception, key)
logger.error(traceback.format_exc())
@@ -79,7 +72,7 @@ def get_model_setting(package_name, logger, table_name=None):
@staticmethod
def to_dict():
try:
ret = Util.db_list_to_dict(db.session.query(ModelSetting).all())
ret = ModelSetting.db_list_to_dict(F.db.session.query(ModelSetting).all())
ret['package_name'] = package_name
return ret
except Exception as exception:
@@ -99,9 +92,9 @@ def get_model_setting(package_name, logger, table_name=None):
#logger.debug('Key:%s Value:%s', key, value)
if ModelSetting.get(key) != value:
change_list.append(key)
entity = db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
entity = F.db.session.query(ModelSetting).filter_by(key=key).with_for_update().first()
entity.value = value
db.session.commit()
F.db.session.commit()
return True, change_list
except Exception as exception:
logger.error('Exception:%s', exception)
@@ -135,4 +128,11 @@ def get_model_setting(package_name, logger, table_name=None):
tmp.append(_.strip())
return tmp
return ModelSetting
@staticmethod
def db_list_to_dict(db_list):
ret = {}
for item in db_list:
ret[item.key] = item.value
return ret
return ModelSetting