Browse Source

Исправлено определение размеров изображений

master
Maxim Likhachev 4 years ago
parent
commit
03794addaf
  1. 22
      vkdumper.py

22
vkdumper.py

@ -20,6 +20,7 @@
import io import io
import os import os
import re import re
import time
import click import click
import vk_api import vk_api
import datetime import datetime
@ -30,7 +31,6 @@ from progressbar import *
############################################################################ ############################################################################
class Color: class Color:
GRAY = '\033[1;47m' GRAY = '\033[1;47m'
GREEN = '\033[1;32m' GREEN = '\033[1;32m'
@ -240,8 +240,8 @@ class Album(object):
@staticmethod @staticmethod
def _largest_photo(photo): def _largest_photo(photo):
max_size = sorted([p['type'] for p in photo['sizes']])[-1] max_size = sorted([p['width'] for p in photo['sizes']])[-1]
return list(filter(lambda p: p['type'] == max_size, photo['sizes']))[0]['url'] return list(filter(lambda p: p['width'] == max_size, photo['sizes']))[0]['url']
def archive(self, directory): def archive(self, directory):
img_directory = os.path.join(directory, self.title) img_directory = os.path.join(directory, self.title)
@ -305,13 +305,13 @@ class Photo(object):
@staticmethod @staticmethod
def _get_thumbnail(photo): def _get_thumbnail(photo):
min_size = sorted([p['type'] for p in photo['sizes']])[0] min_size = sorted([p['width'] for p in photo['sizes']])[0]
return list(filter(lambda p: p['type'] == min_size, photo['sizes']))[0]['url'] return list(filter(lambda p: p['width'] == min_size, photo['sizes']))[0]['url']
@staticmethod @staticmethod
def _largest_photo(photo): def _largest_photo(photo):
max_size = sorted([p['type'] for p in photo['sizes']])[-1] max_size = sorted([p['width'] for p in photo['sizes']])[-1]
return list(filter(lambda p: p['type'] == max_size, photo['sizes']))[0]['url'] return list(filter(lambda p: p['width'] == max_size, photo['sizes']))[0]['url']
def archive(self, directory, date, num): def archive(self, directory, date, num):
img_directory = os.path.join(directory, date + " - Фотографии") img_directory = os.path.join(directory, date + " - Фотографии")
@ -341,8 +341,8 @@ class Link(object):
@staticmethod @staticmethod
def _get_thumbnail(photo): def _get_thumbnail(photo):
min_size = sorted([p['type'] for p in photo['sizes']])[0] min_size = sorted([p['width'] for p in photo['sizes']])[0]
return list(filter(lambda p: p['type'] == min_size, photo['sizes']))[0]['url'] return list(filter(lambda p: p['width'] == min_size, photo['sizes']))[0]['url']
class Post(object): class Post(object):
@ -538,4 +538,8 @@ def dump(user, password, group_url, directory):
if __name__ == '__main__': if __name__ == '__main__':
# Dump vk data with Moscow timestamps
os.environ['TZ'] = 'Europe/Moscow'
time.tzset()
dump() dump()

Loading…
Cancel
Save