diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-06 23:05:10 +01:00
Code Issues Releases Wiki Activity

Fixed favicon type sniffing and writing to file in Python 3

Browse Source
This commit is contained in:
Michiel Scholten
2017-12-20 21:01:53 +01:00
parent 7b2a861652
commit 67635c199a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
digimarks.py
View File

@@ -199,15 +199,15 @@ def clean_tags(tags_list):
magic_dict = { magic_dict = {
"\x1f\x8b\x08": "gz", b"\x1f\x8b\x08": "gz",
"\x42\x5a\x68": "bz2", b"\x42\x5a\x68": "bz2",
"\x50\x4b\x03\x04": "zip" b"\x50\x4b\x03\x04": "zip"
} }
max_len = max(len(x) for x in magic_dict) max_len = max(len(x) for x in magic_dict)
def file_type(filename): def file_type(filename):
with open(filename) as f: with open(filename, "rb") as f:
file_start = f.read(max_len) file_start = f.read(max_len)
for magic, filetype in magic_dict.items(): for magic, filetype in magic_dict.items():
if file_start.startswith(magic): if file_start.startswith(magic):
@@ -330,9 +330,8 @@ class Bookmark(db.Model):
origcontent = orig.read() origcontent = orig.read()
orig.close() orig.close()
os.remove(filename) os.remove(filename)
new = file(filename, 'wb') with open(filename, 'wb') as new:
new.write(origcontent) new.write(origcontent)
new.close()
self.favicon = domain + fileextension self.favicon = domain + fileextension
def set_tags(self, tags): def set_tags(self, tags):
@@ -347,8 +346,8 @@ class Bookmark(db.Model):
if self.http_status == 301 or self.http_status == 302: if self.http_status == 301 or self.http_status == 302:
result = requests.head(self.url, allow_redirects=True) result = requests.head(self.url, allow_redirects=True)
self.http_status = result.status_code self.http_status = result.status_code
self.redirect_uri = result.url.encode('utf-8') self.redirect_uri = result.url
return result.url.encode('utf-8') return result.url
else: else:
return None return None