More reordering

.gitignore

@@ -0,0 +1,141 @@
+config.py
+
+# ---> Python
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

README.md

@@ -1,3 +1,4 @@
-# video_bot
+# Matrix youtube bot
 
-Matrix bot that dowloads youtube links and puts them on my website so that they can be watched without proprietary software.
+A simple matrix bot that downloads youtube links and puts them on webserver so that they can be watched directly without proprietary software.
+I have it running as [@video_bot:trygve.me](https://matrix.to/#/@video_bot:trygve.me) if you want to use it. The bot does not support encrypted rooms.

config.py

@@ -0,0 +1,7 @@
+config = {
+        'url': 'https://example.com',
+        'username': '',
+        'password': '',
+        'yt_dlp_format': 'bestvideo[ext=webm]+bestaudio[ext=webm]/best[ext=mp4]/best',
+        'download_dir': './videos',
+}

main.py

@@ -1,22 +1,11 @@
-from __future__ import unicode_literals
 import simplematrixbotlib as botlib
 from re import search
-import urllib.parse
-import youtube_dl
-import os
+from urllib.parse import quote as sanitize_url
+import yt_dlp
 
-try:
-    passfile = open("pass.txt", "r")
-    passw = passfile.read().translate({ord(c): None for c in '\n'})
-except:
-    print("Put the password in pass.txt in this directory")
+from config import config
 
-creds = botlib.Creds("https://chat.trygve.me", "video_bot", passw)
-bot = botlib.Bot(creds)
-
-prefix = 'https://'
-
-class MyLogger(object):
+class Logger(object):
     def debug(self, msg):
         pass
 
@@ -26,41 +15,45 @@ class MyLogger(object):
     def error(self, msg):
         print(msg)
 
-
-def my_hook(d):
-    if d['status'] == 'finished':
+def progress_hook(d):
+    if d['status'] == 'started':
+        print('Started downloading')
+    elif d['status'] == 'finished':
         print('Done downloading')
 
-
-ydl_opts = {
-    'format': 'bestvideo[ext=webm]+bestaudio[ext=webm]/best[ext=mp4]/best',
-    'outtmpl': '/var/www/html/video_bot/%(title)s.%(ext)s',
-    'restrictfilenames': False,
-    'logger': MyLogger(),
-    'progress_hooks': [my_hook],
-}
-
-def filterfunc(variable):
-    if search('www.youtube.com/watch', variable):
-        return True
+def get_yt_vid_id(word):
+    if search('www.youtube.com/watch', word):
+        return word
+    elif search('youtu.be', word):
+        return word.replace('https://youtu.be/', 'https://www.youtube.com/watch?v=')
     else:
         return False
 
+creds = botlib.Creds(config['url'], config['username'], config['password'])
+bot = botlib.Bot(creds)
+ydl_opts = {
+    'format': config['yt_dlp_format'],
+    'outtmpl': config['download_dir'] + '/%(title)s.%(ext)s',
+    'restrictfilenames': True,
+    'logger': Logger(),
+    'progress_hooks': [progress_hook],
+}
+
+@bot.listener.on_message_event
 async def youtube(room, message):
     match = botlib.MessageMatch(room, message, bot)
     pieces = str(message).split()
-    links = filter(filterfunc, pieces)
     try:
-        for i in links:
-            with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-                info_dict = ydl.extract_info(i, download=False)
-                fname = urllib.parse.quote(info_dict.get('title', None).replace('|', '_'))
+        for i in pieces:
+            yt_url = get_yt_vid_id(i)
+            if yt_url:
+                with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+                    info_dict = ydl.extract_info(yt_url, download=False)
+                    fname = sanitize_url(yt_dlp.utils.sanitize_filename(info_dict.get('title', None), restricted=True))
                     url = 'https://trygve.me/video_bot/' + fname + '.webm'
-                ydl.download([i])
+                    ydl.download([yt_url])
                     await bot.api.send_text_message(room.room_id, url)
     except Exception as e:
         await bot.api.send_text_message(room.room_id, str(e))
 
-bot.add_message_listener(youtube)
-
 bot.run()