1- example `updated` timestamp replaced to epoch

2- __init__ or another file shouldn't be used as a main entry point. __main__ is the correct way. python3 -m pfxposter will work this way.
3- renamed pfxposter to poster, easier to import, easier to understand.
4- moved all stuff into functions, this is cleaner, hope for the cleanest code for all.
5- pip3 is not the best way, python3 -m pip is better due to pip3 may be in a different PATH than your virtual environment.
6- requests must be in requirements for development and setup.py for installation. Excluding it to not break the OS is just a bad workaround.
7- textwrap.dedent and triple quotes helps with readability
8- when using regular expressions, you should use raw strings (strings that ignores escape sequences like `\s`)
9- os._exit(0) is an immediate exit, sys.exit(0) will also exit the software but after flushing any open buffers and running any atexit callbacks.
10- breaking long chain calls is more readable
This commit is contained in:
Umut Karcı 2020-08-24 14:10:20 +03:00
parent 069ea45fce
commit e01b61143d
No known key found for this signature in database
GPG Key ID: 194216FB7E04E90C
8 changed files with 93 additions and 65 deletions

View File

@ -13,10 +13,10 @@ A PixelFed to Mastodon and Twitter crossposter that is not written as intended.
In order to post PixelFed entries to Twitter, you will need a Mastodon-Twitter crossposter, you may find them on web.
## Installation
```
pip3 install pfxposter
python3 -m pip instal pfxposter
```
Use of virtual enviroments is strongly recommended, requests package may override your OS vendored version.
## Usage

View File

@ -1,4 +1,4 @@
updated = 2020-08-24 00:00:00+00:00
updated = 1970-01-01T00:00:00+00:00
[mastodon]
mastodon_url = "https://oyd.social"

View File

@ -1,7 +1,3 @@
#!/usr/bin/env python3
from .pfxposter import *
from .poster import *
__version__ = '0.1.2'

5
pfxposter/__main__.py Normal file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env python3
from . import poster
if __name__ == "__main__":
poster.main()

View File

@ -1,55 +0,0 @@
#!/usr/bin/env python3
from mastodon import Mastodon
import requests
import atoma
import re
import tempfile
import toml
import os
homedir = os.getenv("HOME")
config_file = "{}/.pfxposter".format(homedir)
if os.path.exists(config_file) == False:
conf_includes = 'updated = 2020-08-24 00:00:00+00:00\n\n[mastodon]\nmastodon_url = "https://oyd.social"\naccess_token = "your_access_token_here"\n\n[pixelfed]\npixelfed_url = "https://pixelfed.social"\nusername = "username"'
with open(config_file, "w") as f:
f.write(conf_includes)
print("Configuration file created please edit")
os._exit(0)
config = toml.load(config_file)
username = config['pixelfed']['username']
last_updated = config['updated']
mastodon = Mastodon(
access_token = config['mastodon']['access_token'],
api_base_url = config['mastodon']['mastodon_url']
)
def main():
pixelfeed_get = requests.get('https://pixelfed.social/users/{}.atom'.format(username))
pixelfeed = atoma.parse_atom_bytes(pixelfeed_get.content)
latest_post = pixelfeed.entries[0]
last_updated_atom = latest_post.updated
if last_updated == last_updated_atom:
print("Up-to-date")
os._exit(0)
config['updated'] = last_updated_atom
with open(config_file, "w") as f:
toml.dump(config, f)
print("Config file updated")
image_name = latest_post.title.value
image_url = re.search("(?P<url>https?://[^\s]+)", latest_post.summary.value).group("url").rstrip('">').replace("_thumb", "")
tmp = tempfile.NamedTemporaryFile(suffix=".jpg")
get_image = requests.get(image_url)
tmp.write(get_image.content)
mastodon_media = mastodon.media_post(tmp.name)
mastodon.status_post(image_name, media_ids=mastodon_media['id'])
print("Status posted: ", image_name)
tmp.close()
if __name__ == "__main__":
main()

81
pfxposter/poster.py Normal file
View File

@ -0,0 +1,81 @@
import os
import re
import sys
import tempfile
import textwrap
import atoma
import requests
import toml
from mastodon import Mastodon
def create_config(config_file):
conf_includes = textwrap.dedent("""
updated = 2020-08-24 00:00:00+00:00
[mastodon]
mastodon_url = "https://oyd.social"
access_token = "your_access_token_here"
[pixelfed]
pixelfed_url = "https://pixelfed.social"
username = "username"
""")
with open(config_file, "w") as f:
f.write(conf_includes)
print("Configuration file created please edit")
sys.exit(0)
def syncronize(config_file, config, username, last_updated, mastodon):
pixelfeed_get = requests.get('https://pixelfed.social/users/{}.atom'.format(username))
pixelfeed = atoma.parse_atom_bytes(pixelfeed_get.content)
latest_post = pixelfeed.entries[0]
last_updated_atom = latest_post.updated
if last_updated == last_updated_atom:
print("Up-to-date")
sys.exit(0)
config['updated'] = last_updated_atom
with open(config_file, "w") as f:
toml.dump(config, f)
print("Config file updated")
image_name = latest_post.title.value
image_url = re.search(r"(?P<url>https?://[^\s]+)", latest_post.summary.value) \
.group("url") \
.rstrip('">') \
.replace("_thumb", "")
tmp = tempfile.NamedTemporaryFile(suffix=".jpg")
get_image = requests.get(image_url)
tmp.write(get_image.content)
mastodon_media = mastodon.media_post(tmp.name)
mastodon.status_post(image_name, media_ids=mastodon_media['id'])
print("Status posted: ", image_name)
tmp.close()
def main():
homedir = os.getenv("HOME")
config_file = "{}/.pfxposter".format(homedir)
if not os.path.exists(config_file):
create_config(config_file)
config = toml.load(config_file)
username = config['pixelfed']['username']
last_updated = config['updated']
mastodon = Mastodon(
access_token=config['mastodon']['access_token'],
api_base_url=config['mastodon']['mastodon_url']
)
syncronize(config_file, config, username, last_updated, mastodon)

View File

@ -3,3 +3,4 @@ Mastodon.py>=1.5.1
atoma>=0.0.17
toml>=0.10.1
python-crontab>=2.5.1
requests

View File

@ -45,10 +45,10 @@ setup(
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Internet",
],
entry_points={"console_scripts": ["pfxposter = pfxposter.pfxposter:main"]},
entry_points={"console_scripts": ["pfxposter = pfxposter.poster:main"]},
data_files=[('/home/{}/.pfxposter'.format(os.getenv("USER")), ['data/config.toml'])],
python_requires=">=3.6",
install_requires=['Mastodon.py>=1.5.1', 'atoma>=0.0.17', 'toml>=0.10.1', 'python-crontab>=2.5.1']
install_requires=['Mastodon.py>=1.5.1', 'atoma>=0.0.17', 'toml>=0.10.1', 'python-crontab>=2.5.1', 'requests']
)
_post_install()