refactor setup and install

README.md

@@ -5,11 +5,7 @@ This script is meant to be used with a cron-job to automate the synchronisation.
 
 ## Installation
 
-Use the package manager [pip](https://pip.pypa.io/en/stable/) to install feedly2instapaper.
-I suggest installing it in an easily accessible location to be able to edit the settings file and point your cron-job to the script.
-```bash
-pip3 install feedly2instapaper --target ./your-dir
-```
+`python3 -m pip install feedly2instapaper`
 
 ## Usage
 1. Prerequisites:
@@ -22,9 +18,9 @@ pip3 install feedly2instapaper --target ./your-dir
       * token
       * token secret
 
-2. Fill in those credentials in `settings.yaml`
-3. Perform a manual test by executing feedly2instapaper.py`
-4. Create a new cron-job that executes `feedly2instapaper.py`
+2. Fill in those credentials in `.env-example`
+3. Rename `.env-example` to `.env`
+4. Create a new cron-job that executes `python3 -m feedly2instapaper`
 5. Sit back, relax and share a [coffee](https://ko-fi.com/barabazs) with me.
 
 

feedly2instapaper/__main__.py

@@ -0,0 +1,3 @@
+from feedly2instapaper.feedly2instapaper import main
+
+main()

feedly2instapaper/feedly2instapaper.py

@@ -85,24 +85,27 @@ def establish_instapaper_session() -> instapaper.Instapaper:
     return instapaper_session_
 
 
-with FeedlySession(
-    auth=config.get("feedly-access_token"),
-    user_id=config.get("feedly-client_id"),
-    api_host=config.get("feedly-url"),
-) as feedly_session:
-    feedly_session.user.get_tag("global.saved")
-    entries = feedly_session.user.get_tag("global.saved").stream_contents(
-        options=StreamOptions(max_count=sys.maxsize)
-    )
-    entries = list(entries)
-    if len(entries) > 0:
-        instapaper_session = establish_instapaper_session()
-        instapaper_response = add_to_instapaper(instapaper_session, entries)
-        if instapaper_response:
-            mark_as_read(feedly_session, entries)
-            mark_as_unsaved(feedly_session, entries)
-        else:
-            for _entry in instapaper_response:
-                entries.remove(_entry)
-            mark_as_read(feedly_session, entries)
-            mark_as_unsaved(feedly_session, entries)
+
+
+def main():
+    with FeedlySession(
+        auth=config.get("feedly-access_token"),
+        user_id=config.get("feedly-client_id"),
+        api_host=config.get("feedly-url"),
+    ) as feedly_session:
+        feedly_session.user.get_tag("global.saved")
+        entries = feedly_session.user.get_tag("global.saved").stream_contents(
+            options=StreamOptions(max_count=sys.maxsize)
+        )
+        entries = list(entries)
+        if len(entries) > 0:
+            instapaper_session = establish_instapaper_session()
+            instapaper_response = add_to_instapaper(instapaper_session, entries)
+            if instapaper_response:
+                mark_as_read(feedly_session, entries)
+                mark_as_unsaved(feedly_session, entries)
+            else:
+                for _entry in instapaper_response:
+                    entries.remove(_entry)
+                mark_as_read(feedly_session, entries)
+                mark_as_unsaved(feedly_session, entries)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="Feedly2Instapaper",
-    version="0.1.4",
+    version="0.1.5",
     data_files=[".env-example"],
     packages=find_packages(exclude=["tests", "tests.*"]),
     url="https://github.com/Barabazs/Feedly2Instapaper",