github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 12:59:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix DB import (#1779)

Browse source 
* Sqlite3.row handling fix
* Fix import error in Python3
This commit is contained in:
Clinton Hall 2020-09-19 21:53:01 +12:00 • committed by GitHub
commit beecb1b1a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TorrentToMedia.py
View file

@ -333,9 +333,9 @@ def main(args):
(os.path.basename(dir_name))) (os.path.basename(dir_name)))
core.DOWNLOAD_INFO = core.get_download_info(os.path.basename(dir_name), 0) core.DOWNLOAD_INFO = core.get_download_info(os.path.basename(dir_name), 0)
if core.DOWNLOAD_INFO: if core.DOWNLOAD_INFO:
client_agent = text_type(core.DOWNLOAD_INFO[0].get('client_agent', 'manual')) client_agent = text_type(core.DOWNLOAD_INFO[0]['client_agent']) or 'manual'
input_hash = text_type(core.DOWNLOAD_INFO[0].get('input_hash', '')) input_hash = text_type(core.DOWNLOAD_INFO[0]['input_hash']) or ''
input_id = text_type(core.DOWNLOAD_INFO[0].get('input_id', '')) input_id = text_type(core.DOWNLOAD_INFO[0]['input_id']) or ''
logger.info('Found download info for {0}, ' logger.info('Found download info for {0}, '
'setting variables now ...'.format(os.path.basename(dir_name))) 'setting variables now ...'.format(os.path.basename(dir_name)))
else: else:

6
libs/custom/syno/auth.py
View file

@ -97,7 +97,7 @@ class Authentication:
req_param['_sid'] = self._sid req_param['_sid'] = self._sid
if method is 'get': if method == 'get':
url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name
response = requests.get(url, req_param) response = requests.get(url, req_param)
@ -106,7 +106,7 @@ class Authentication:
else: else:
return response return response
elif method is 'post': elif method == 'post':
url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name url = ('%s%s' % (self._base_url, api_path)) + '?api=' + api_name
response = requests.post(url, req_param) response = requests.post(url, req_param)
@ -121,4 +121,4 @@ class Authentication:
@property @property
def base_url(self): def base_url(self):
return self._base_url return self._base_url

4
nzbToMedia.py
View file

@ -1016,8 +1016,8 @@ def main(args, section=None):
logger.info('Found download info for {0}, ' logger.info('Found download info for {0}, '
'setting variables now ...'.format 'setting variables now ...'.format
(os.path.basename(dir_name))) (os.path.basename(dir_name)))
client_agent = text_type(core.DOWNLOAD_INFO[0].get('client_agent', 'manual')) client_agent = text_type(core.DOWNLOAD_INFO[0]['client_agent']) or 'manual'
download_id = text_type(core.DOWNLOAD_INFO[0].get('input_id', '')) download_id = text_type(core.DOWNLOAD_INFO[0]['input_id']) or ''
else: else:
logger.info('Unable to locate download info for {0}, ' logger.info('Unable to locate download info for {0}, '
'continuing to try and process this release ...'.format 'continuing to try and process this release ...'.format