mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-07-16 02:02:53 -07:00
more encoding tests. #424
This commit is contained in:
parent
c65e860502
commit
c26ffe58f1
11 changed files with 11 additions and 26 deletions
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
#-*- coding: iso-8859-15 -*-
|
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
### NZBGET POST-PROCESSING SCRIPT ###
|
### NZBGET POST-PROCESSING SCRIPT ###
|
||||||
|
|
|
@ -316,40 +316,35 @@ def CharReplace(fileDirName):
|
||||||
# The function will detect if fileDirName contains a special character
|
# The function will detect if fileDirName contains a special character
|
||||||
# If there is special character, detects if it is a UTF-8, CP850 or ISO-8859-15 encoding
|
# If there is special character, detects if it is a UTF-8, CP850 or ISO-8859-15 encoding
|
||||||
encodingDetected = False
|
encodingDetected = False
|
||||||
# parsing all files/directories in odrer to detect if CP850 is used
|
if isinstance(fileDirName, unicode)
|
||||||
|
return encodingDetected fileDirName.encode('utf-8')
|
||||||
for Idx in range(len(fileDirName)):
|
for Idx in range(len(fileDirName)):
|
||||||
encodingDetected = False
|
|
||||||
# /!\ detection is done 2char by 2char for UTF-8 special character
|
# /!\ detection is done 2char by 2char for UTF-8 special character
|
||||||
if (len(fileDirName) != 1) & (Idx < (len(fileDirName) - 1)):
|
if (len(fileDirName) != 1) & (Idx < (len(fileDirName) - 1)):
|
||||||
# Detect UTF-8
|
# Detect UTF-8
|
||||||
if ((fileDirName[Idx] == '\xC2') | (fileDirName[Idx] == '\xC3')) & ((fileDirName[Idx+1] >= '\xA0') & (fileDirName[Idx+1] <= '\xFF')):
|
if ((fileDirName[Idx] == '\xC2') | (fileDirName[Idx] == '\xC3')) & ((fileDirName[Idx+1] >= '\xA0') & (fileDirName[Idx+1] <= '\xFF')):
|
||||||
utf8Name = fileDirName
|
break
|
||||||
break;
|
|
||||||
# Detect CP850
|
# Detect CP850
|
||||||
elif ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
|
elif ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
|
||||||
utf8Name = fileDirName.decode('cp850')
|
utf8Name = fileDirName.decode('cp850').encode('utf-8')
|
||||||
utf8Name = utf8Name.encode('utf-8')
|
|
||||||
encodingDetected = True
|
encodingDetected = True
|
||||||
break;
|
break
|
||||||
# Detect ISO-8859-15
|
# Detect ISO-8859-15
|
||||||
elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
|
elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
|
||||||
utf8Name = fileDirName.decode('iso-8859-15')
|
utf8Name = fileDirName.decode('iso-8859-15').encode('utf-8')
|
||||||
utf8Name = utf8Name.encode('utf-8')
|
|
||||||
encodingDetected = True
|
encodingDetected = True
|
||||||
break;
|
break
|
||||||
else:
|
else:
|
||||||
# Detect CP850
|
# Detect CP850
|
||||||
if ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
|
if ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
|
||||||
utf8Name = fileDirName.decode('cp850')
|
utf8Name = fileDirName.decode('cp850').encode('utf-8')
|
||||||
utf8Name = utf8Name.encode('utf-8')
|
|
||||||
encodingDetected = True
|
encodingDetected = True
|
||||||
break;
|
break
|
||||||
# Detect ISO-8859-15
|
# Detect ISO-8859-15
|
||||||
elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
|
elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
|
||||||
utf8Name = fileDirName.decode('iso-8859-15')
|
utf8Name = fileDirName.decode('iso-8859-15').encode('utf-8')
|
||||||
utf8Name = utf8Name.encode('utf-8')
|
|
||||||
encodingDetected = True
|
encodingDetected = True
|
||||||
break;
|
break
|
||||||
if encodingDetected == False:
|
if encodingDetected == False:
|
||||||
utf8Name = fileDirName
|
utf8Name = fileDirName
|
||||||
return encodingDetected, utf8Name
|
return encodingDetected, utf8Name
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue