diff --git a/facebook/__pycache__/arangodb.cpython-37.pyc b/facebook/__pycache__/arangodb.cpython-37.pyc new file mode 100644 index 0000000..42d42c2 Binary files /dev/null and b/facebook/__pycache__/arangodb.cpython-37.pyc differ diff --git a/facebook/__pycache__/classes.cpython-37.pyc b/facebook/__pycache__/classes.cpython-37.pyc new file mode 100644 index 0000000..a660a92 Binary files /dev/null and b/facebook/__pycache__/classes.cpython-37.pyc differ diff --git a/facebook/__pycache__/config.cpython-37.pyc b/facebook/__pycache__/config.cpython-37.pyc new file mode 100644 index 0000000..156df90 Binary files /dev/null and b/facebook/__pycache__/config.cpython-37.pyc differ diff --git a/facebook/__pycache__/helpers.cpython-37.pyc b/facebook/__pycache__/helpers.cpython-37.pyc new file mode 100644 index 0000000..e4d1ce9 Binary files /dev/null and b/facebook/__pycache__/helpers.cpython-37.pyc differ diff --git a/facebook/__pycache__/scrapers.cpython-37.pyc b/facebook/__pycache__/scrapers.cpython-37.pyc new file mode 100644 index 0000000..af60fd6 Binary files /dev/null and b/facebook/__pycache__/scrapers.cpython-37.pyc differ diff --git a/facebook/arangodb.py b/facebook/arangodb.py index ae5c009..59e72a2 100644 --- a/facebook/arangodb.py +++ b/facebook/arangodb.py @@ -1,12 +1,12 @@ -from time import sleep -from arango import ArangoClient -from getpass import getpass -from sys import argv -from config import * from datetime import datetime - +from getpass import getpass +from time import sleep + import nacl.secret import nacl.utils +from arango import ArangoClient + +from config import * def checked_members(): diff --git a/facebook/classes.py b/facebook/classes.py index 09f0e05..b04d1cb 100644 --- a/facebook/classes.py +++ b/facebook/classes.py @@ -1,17 +1,17 @@ -from datetime import datetime -import json import pickle -from bs4 import BeautifulSoup +import random +from datetime import datetime + import requests import werkzeug -import random +from bs4 import BeautifulSoup werkzeug.cached_property = werkzeug.utils.cached_property from robobrowser import RoboBrowser from arangodb import db -from helpers import sleep_, update_cookie from config import * +from helpers import sleep_, update_cookie class User: diff --git a/facebook/helpers.py b/facebook/helpers.py index 437ccb3..8d0af28 100644 --- a/facebook/helpers.py +++ b/facebook/helpers.py @@ -1,9 +1,11 @@ -from time import sleep -import random import pickle +import random from datetime import datetime +from time import sleep + from arangodb import db + def sleep_(t): """ Sover en tid nära den angivna (för att inte sökningarna ska bli för lika varandra) @@ -67,4 +69,4 @@ def write_error(nr, e="", traceback="", soup="", user="", url="", url_name=""): silent=True, ) except Exception as e: - print(e) \ No newline at end of file + print(e) diff --git a/scrapers.py b/facebook/scrapers.py similarity index 97% rename from scrapers.py rename to facebook/scrapers.py index 447ac77..da00317 100644 --- a/scrapers.py +++ b/facebook/scrapers.py @@ -1,9 +1,11 @@ -from classes import Picture, Friend, Reaction -from helpers import sleep_, write_error, update_cookie -from config import * -import traceback import re +import traceback + from arangodb import db +from classes import Friend, Picture, Reaction +from config import * +from helpers import sleep_, update_cookie, write_error + def profile_picture_reactions(profile, user, all_pictures, first=False, single = False): @@ -243,9 +245,9 @@ def profile_picture_reactions(profile, user, all_pictures, first=False, single = ) pass - if count == max_pic: - db.collection("picture_reactions").insert_many( - picture.reactions, silent=True, overwrite=True + + db.collection("picture_reactions").insert_many( + picture.reactions, silent=True, overwrite=True ) db.collection("picture_reactions").insert_many(picture.reactions, silent=True, overwrite=True) except Exception as e: # Fel2 diff --git a/workspace.code-workspace b/workspace.code-workspace index 8725783..ca8b5f6 100644 --- a/workspace.code-workspace +++ b/workspace.code-workspace @@ -2,9 +2,12 @@ "folders": [ { "path": "." + }, + { + "path": "facebook" } ], "settings": { - "python.pythonPath": ".venv/bin/python" + "python.pythonPath": "/Users/Lasse/.pyenv/shims/python" } } \ No newline at end of file