linkkf 로직수정중

This commit is contained in:
2025-12-25 19:42:32 +09:00
parent 695d26767e
commit af9a38a973
128 changed files with 8711 additions and 1484 deletions

View File

@@ -1,13 +1,15 @@
# -*- coding: utf-8 -*-
#########################################################
# python
import os, re
import traceback
import time
import threading
import os
import re
import shutil
import threading
import time
import traceback
from framework import app
from . import logger
EXTENSION = 'mp4|avi|mkv|ts|wmv|m2ts|smi|srt|ass|m4v|flv|asf|mpg|ogm'
@@ -85,11 +87,11 @@ class ToolExpandFileProcess(object):
except UnicodeDecodeError:
pass
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -120,9 +122,9 @@ class ToolExpandFileProcess(object):
elif len(tmp2) == 2:
tmp = '%s-%scd%s%s' % (tmps[0], str(int(tmp2[0])).zfill(3), tmp2[1], ext)
return tmp
except Exception as exception:
except Exception as e:
logger.debug('filename : %s', filename)
logger.error('Exception:%s', exception)
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
return filename

View File

@@ -1,16 +1,16 @@
import os
import traceback
import json
import datetime
import json
import os
import time
from telepot2 import Bot, glance
from telepot2.loop import MessageLoop
import traceback
from framework import app
from telepot2 import Bot, glance
from telepot2.loop import MessageLoop
from tool_base import ToolAESCipher
from . import logger
from tool_base import ToolAESCipher
class ToolTelegram(object):
SUPER_BOT = None
@@ -30,13 +30,13 @@ class ToolTelegram(object):
for c_id in cls.SJVA_BOT_CHANNEL_CHAT_ID:
try:
cls.SUPER_BOT.sendMessage(c_id, text)
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error('Chat ID : %s', c_id)
logger.error(traceback.format_exc())
return True
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
return False

View File

@@ -1,19 +1,19 @@
# -*- coding: utf-8 -*-
import requests, re, json, time
import traceback, unicodedata
from datetime import datetime
import traceback
import os
import json
import time
import copy
import json
import os
import re
import time
import traceback
import unicodedata
from datetime import datetime
from framework import app, SystemModelSetting, py_urllib
import requests
from framework import SystemModelSetting, app, py_urllib
from framework.util import Util
from tool_expand import ToolExpandFileProcess
logger = get_logger('torrent_process')
class TorrentProcess(object):
@@ -36,20 +36,21 @@ class TorrentProcess(object):
elif package_name == 'bot_downloader_av':
cls.append('av', entity)
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@classmethod
def append(cls, type, data):
try:
import requests
import json
import requests
response = requests.post(f"{app.config['DEFINE']['WEB_DIRECT_URL']}/sjva/torrent_%s.php" % type, data={'data':json.dumps(data.as_dict())})
#logger.debug(response.text)
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -129,14 +130,15 @@ class TorrentProcess(object):
telegram['data'] = ret
text = json.dumps(telegram, indent=2)
from framework.common.telegram_bot import TelegramBot
from framework.common.telegram_bot import \
TelegramBot
TelegramBot.super_send_message(text)
time.sleep(0.5)
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -213,8 +215,8 @@ class TorrentProcess(object):
TelegramBot.super_send_message(text)
time.sleep(0.5)
#return lists
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
return lists
@@ -334,8 +336,8 @@ class TorrentProcess(object):
time.sleep(0.5)
#return lists
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -360,8 +362,8 @@ class TorrentProcess(object):
else:
file_info['type'] = None
return file_info
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -385,8 +387,8 @@ class TorrentProcess(object):
ret['dirname'] = max_filename.replace('/%s' % ret['filename'], '')
ret['max_size'] = max_size
return ret
except Exception as exception:
logger.error('Exception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())
@@ -420,8 +422,8 @@ class TorrentProcess(object):
else:
ret = {'type':av_type}
return ret
except Exception as exception:
logger.error('Exxception:%s', exception)
except Exception as e:
logger.error(f"Exception:{str(e)}")
logger.error(traceback.format_exc())