Userbot: Update Latest from Official Repos

MoveAngel · MoveAngel · commit a8d14b5a00a7 · 2020-02-08T13:58:57.000+07:00
diff --git a/app.json b/app.json
@@ -173,7 +173,7 @@
     {
       "plan": "heroku-postgresql",
       "options": {
-        "version": "9.5"
+        "version": "9.9.9"
       }
     }
   ]
diff --git a/requirements.txt b/requirements.txt
@@ -15,6 +15,8 @@ google_images_download>=2.7.1
 gTTS>=2.0.1
 gTTS-token>=1.1.3
 hachoir
+heroku
+heroku3
 httplib2==0.15.0
 humanize
 lxml
diff --git a/userbot/modules/changelog.py b/userbot/modules/changelog.py
@@ -0,0 +1,121 @@
+# Copyright (C) 2019 The Raphielscape Company LLC.
+#
+# Licensed under the Raphielscape Public License, Version 1.c (the "License");
+# you may not use this file except in compliance with the License.
+#
+"""
+This module updates the userbot based on chtream revision
+"""
+
+from os import remove, execl
+import sys
+
+from git import Repo
+from git.exc import GitCommandError, InvalidGitRepositoryError, NoSuchPathError
+
+from userbot import CMD_HELP, bot, HEROKU_MEMEZ, HEROKU_APIKEY, HEROKU_APPNAME
+from userbot.events import register
+
+
+async def gen_chlog(repo, diff):
+    ch_log = ''
+    d_form = "%d/%m/%y"
+    for c in repo.iter_commits(diff):
+        ch_log += f'•[{c.committed_datetime.strftime(d_form)}]: {c.summary} <{c.author}>\n'
+    return ch_log
+
+
+async def is_off_br(br):
+    off_br = ['sql-extended']
+    for k in off_br:
+        if k == br:
+            return 1
+    return
+
+
+@register(outgoing=True, pattern="^.chl(?: |$)(.*)")
+async def chtream(ch):
+    "For .update command, check if the bot is up to date, update if specified"
+    await ch.edit("`Checking for updates, please wait....`")
+    conf = ch.pattern_match.group(1).lower()
+    off_repo = 'https://github.com/MoveAngel/One4uBot.git'
+
+    try:
+        txt = "`Oops.. Updater cannot continue due to some problems occured`\n\n**LOGTRACE:**\n"
+        repo = Repo()
+    except NoSuchPathError as error:
+        await ch.edit(f'{txt}\n`directory {error} is not found`')
+        return
+    except GitCommandError as error:
+        await ch.edit(f'{txt}\n`Early failure! {error}`')
+        return
+    except InvalidGitRepositoryError:
+        repo = Repo.init()
+        await ch.edit(
+            "`Warning: Force-Syncing to the latest stable code from repo.`\
+            \nI may lose my downloaded files during this update."
+        )
+        origin = repo.create_remote('chtream', off_repo)
+        origin.fetch()
+        repo.create_head('sql-extended', origin.refs.master)
+        repo.heads.master.checkout(True)
+
+    ac_br = repo.active_branch.name
+    if not await is_off_br(ac_br):
+        await ch.edit(
+            f'**[UPDATER]:**` Looks like you are using your own custom branch ({ac_br}). \
+            in that case, Updater is unable to identify which branch is to be merged. \
+            please checkout to any official branch`')
+        return
+
+    try:
+        repo.create_remote('chtream', off_repo)
+    except BaseException:
+        pass
+
+    ch_rem = repo.remote('chtream')
+    ch_rem.fetch(ac_br)
+    changelog = await gen_chlog(repo, f'HEAD..chtream/{ac_br}')
+
+    if not changelog:
+        await ch.edit(f'\n`Your BOT is` **up-to-date** `with` **{ac_br}**\n')
+        return
+
+    if conf != "w":
+        changelog_str = f'**New UPDATE available for [{ac_br}]:\n\nCHANGELOG:**\n`{changelog}`'
+        if len(changelog_str) > 4096:
+            await ch.edit("`Changelog is too big, sending it as a file.`")
+            file = open("output.txt", "w+")
+            file.write(changelog_str)
+            file.close()
+            await ch.client.send_file(
+                ch.chat_id,
+                "output.txt",
+                reply_to=ch.id,
+            )
+            remove("output.txt")
+        else:
+            await ch.edit(changelog_str)
+        await ch.respond(
+            "`do \".update \" to update\nif using Heroku`")
+        return
+
+    await ch.edit('`New update found, updating...`')
+    ch_rem.fetch(ac_br)
+    await ch.edit('`Successfully Updated!\n'
+                   'Bot is restarting... Wait for a second!`')
+    await install_requirements()
+    await bot.disconnect()
+    # Spin a new instance of bot
+    execl(sys.executable, sys.executable, *sys.argv)
+    # Shut the existing one down
+    exit()
+
+
+CMD_HELP.update({
+    'update':
+    ".chl\
+\nUsage: Checks if the main userbot repository has any updates and shows a changelog if so.\
+\n\n.update\
+\nUsage: Updates your userbot, if there are any updates in the main userbot repository."
+})
diff --git a/userbot/modules/updater.py b/userbot/modules/updater.py
@@ -2,20 +2,26 @@
 #
 # Licensed under the Raphielscape Public License, Version 1.c (the "License");
 # you may not use this file except in compliance with the License.
+# credits to @AvinashReddy3108
 #
 """
 This module updates the userbot based on Upstream revision
 """
 
-from os import remove, execl
+from os import remove, execle, path, makedirs, getenv, environ
+from shutil import rmtree
+import asyncio
 import sys
 
 from git import Repo
 from git.exc import GitCommandError, InvalidGitRepositoryError, NoSuchPathError
 
-from userbot import CMD_HELP, bot, HEROKU_MEMEZ, HEROKU_APIKEY, HEROKU_APPNAME
+from userbot import CMD_HELP, bot, HEROKU_APIKEY, HEROKU_APPNAME, UPSTREAM_REPO_URL
 from userbot.events import register
 
+requirements_path = path.join(
+    path.dirname(path.dirname(path.dirname(__file__))), 'requirements.txt')
+
 
 async def gen_chlog(repo, diff):
     ch_log = ''
@@ -25,47 +31,62 @@ async def gen_chlog(repo, diff):
     return ch_log
 
 
-async def is_off_br(br):
-    off_br = ['sql-extended']
-    for k in off_br:
-        if k == br:
-            return 1
-    return
+async def update_requirements():
+    reqs = str(requirements_path)
+    try:
+        process = await asyncio.create_subprocess_shell(
+            ' '.join([sys.executable, "-m", "pip", "install", "-r", reqs]),
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE)
+        await process.communicate()
+        return process.returncode
+    except Exception as e:
+        return repr(e)
 
 
-@register(outgoing=True, pattern="^.update(?: |$)(.*)")
+@register(outgoing=True, pattern="^\.update(?: |$)(.*)")
 async def upstream(ups):
     "For .update command, check if the bot is up to date, update if specified"
     await ups.edit("`Checking for updates, please wait....`")
-    conf = ups.pattern_match.group(1).lower()
-    off_repo = 'https://github.com/MoveAngel/One4uBot.git'
+    conf = ups.pattern_match.group(1)
+    off_repo = UPSTREAM_REPO_URL
+    force_update = False
 
     try:
-        txt = "`Oops.. Updater cannot continue due to some problems occured`\n\n**LOGTRACE:**\n"
+        txt = "`Oops.. Updater cannot continue due to "
+        txt += "some problems occured`\n\n**LOGTRACE:**\n"
         repo = Repo()
     except NoSuchPathError as error:
         await ups.edit(f'{txt}\n`directory {error} is not found`')
+        repo.__del__()
         return
     except GitCommandError as error:
         await ups.edit(f'{txt}\n`Early failure! {error}`')
+        repo.__del__()
         return
-    except InvalidGitRepositoryError:
+    except InvalidGitRepositoryError as error:
+        if conf != "now":
+            await ups.edit(
+                f"`Unfortunately, the directory {error} does not seem to be a git repository.\
+            \nBut we can fix that by force updating the userbot using .update now.`"
+            )
+            return
         repo = Repo.init()
-        await ups.edit(
-            "`Warning: Force-Syncing to the latest stable code from repo.`\
-            \nI may lose my downloaded files during this update."
-        )
         origin = repo.create_remote('upstream', off_repo)
         origin.fetch()
-        repo.create_head('sql-extended', origin.refs.master)
-        repo.heads.master.checkout(True)
+        force_update = True
+        repo.create_head('sql-extended', origin.refs.sql-extended)
+        repo.heads.sql-extended.set_tracking_branch(origin.refs.sql-extended)
+        repo.heads.sql-extended.checkout(True)
 
     ac_br = repo.active_branch.name
-    if not await is_off_br(ac_br):
+    if ac_br != 'sql-extended':
         await ups.edit(
-            f'**[UPDATER]:**` Looks like you are using your own custom branch ({ac_br}). \
-            in that case, Updater is unable to identify which branch is to be merged. \
-            please checkout to any official branch`')
+            f'**[UPDATER]:**` Looks like you are using your own custom branch ({ac_br}). '
+            'in that case, Updater is unable to identify '
+            'which branch is to be merged. '
+            'please checkout to any official branch`')
+        repo.__del__()
         return
 
     try:
@@ -75,16 +96,19 @@ async def upstream(ups):
 
     ups_rem = repo.remote('upstream')
     ups_rem.fetch(ac_br)
+
     changelog = await gen_chlog(repo, f'HEAD..upstream/{ac_br}')
 
-    if not changelog:
-        await ups.edit(f'\n`Your BOT is` **up-to-date** `with` **{ac_br}**\n')
+    if not changelog and not force_update:
+        await ups.edit(
+            f'\n`Your BOT is`  **up-to-date**  `with`  **{ac_br}**\n')
+        repo.__del__()
         return
 
-    if conf != "now":
+    if conf != "now" and not force_update:
         changelog_str = f'**New UPDATE available for [{ac_br}]:\n\nCHANGELOG:**\n`{changelog}`'
         if len(changelog_str) > 4096:
-            await ups.edit("`Changelog is too big, sending it as a file.`")
+            await ups.edit("`Changelog is too big, view the file to see it.`")
             file = open("output.txt", "w+")
             file.write(changelog_str)
             file.close()
@@ -96,20 +120,69 @@ async def upstream(ups):
             remove("output.txt")
         else:
             await ups.edit(changelog_str)
-        await ups.respond(
-            "`do \".update now\" to update\nDon't if using Heroku`")
+        await ups.respond('`do \".update now\" to update`')
         return
 
-    await ups.edit('`New update found, updating...`')
-    ups_rem.fetch(ac_br)
-    await ups.edit('`Successfully Updated!\n'
-                   'Bot is restarting... Wait for a second!`')
-    await install_requirements()
-    await bot.disconnect()
-    # Spin a new instance of bot
-    execl(sys.executable, sys.executable, *sys.argv)
-    # Shut the existing one down
-    exit()
+    if force_update:
+        await ups.edit(
+            '`Force-Syncing to latest stable userbot code, please wait...`')
+    else:
+        await ups.edit('`Updating userbot, please wait....`')
+    # We're in a Heroku Dyno, handle it's memez.
+    if HEROKU_APIKEY is not None:
+        import heroku3
+        heroku = heroku3.from_key(HEROKU_APIKEY)
+        heroku_app = None
+        heroku_applications = heroku.apps()
+        if not HEROKU_APPNAME:
+            await ups.edit(
+                '`[HEROKU MEMEZ] Please set up the HEROKU_APPNAME variable to be able to update userbot.`'
+            )
+            repo.__del__()
+            return
+        for app in heroku_applications:
+            if app.name == HEROKU_APPNAME:
+                heroku_app = app
+                break
+        if heroku_app is None:
+            await ups.edit(
+                f'{txt}\n`Invalid Heroku credentials for updating userbot dyno.`'
+            )
+            repo.__del__()
+            return
+        await ups.edit('`[HEROKU MEMEZ]\
+                        \nUserbot dyno build in progress, please wait for it to complete.`'
+                       )
+        ups_rem.fetch(ac_br)
+        repo.git.reset("--hard", "FETCH_HEAD")
+        heroku_git_url = heroku_app.git_url.replace(
+            "https://", "https://api:" + HEROKU_APIKEY + "@")
+        if "heroku" in repo.remotes:
+            remote = repo.remote("heroku")
+            remote.set_url(heroku_git_url)
+        else:
+            remote = repo.create_remote("heroku", heroku_git_url)
+        try:
+            remote.push(refspec="HEAD:refs/heads/sql-extended", force=True)
+        except GitCommandError as error:
+            await ups.edit(f'{txt}\n`Here is the error log:\n{error}`')
+            repo.__del__()
+            return
+        await ups.edit('`Successfully Updated!\n'
+                       'Restarting, please wait...`')
+    else:
+        # Classic Updater, pretty straightforward.
+        try:
+            ups_rem.pull(ac_br)
+        except GitCommandError:
+            repo.git.reset("--hard", "FETCH_HEAD")
+        reqs_upgrade = await update_requirements()
+        await ups.edit('`Successfully Updated!\n'
+                       'Bot is restarting... Wait for a second!`')
+        # Spin a new instance of bot
+        args = [sys.executable, "-m", "userbot"]
+        execle(sys.executable, *args, environ)
+        return
 
 
 CMD_HELP.update({
@@ -118,4 +191,4 @@ async def upstream(ups):
 \nUsage: Checks if the main userbot repository has any updates and shows a changelog if so.\
 \n\n.update now\
 \nUsage: Updates your userbot, if there are any updates in the main userbot repository."
-})
+})

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@`
`173`	`173`	`{`
`174`	`174`	`"plan": "heroku-postgresql",`
`175`	`175`	`"options": {`
`176`		`- "version": "9.5"`
	`176`	`+ "version": "9.9.9"`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`]`