Merge pull request #36

merge refactor-7bf4ef45 with master

.dockerignore

@@ -1,4 +1,6 @@
 .git
-.gitignore
 .github
+.gitignore
+.gitmodules
+.run
 deploy

.run/Dockerfile.run.xml → .run/BuildAndRun.run.xml

@@ -1,8 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="BuildAndRun" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ghcr.io/ksssomesh12/tgmb-beta:app" />
+        <option name="imageTag" value="tgmb:app" />
+        <option name="buildKitEnabled" value="true" />
         <option name="containerName" value="tgmb-app" />
         <option name="sourceFilePath" value="Dockerfile" />
       </settings>

Dockerfile

@@ -46,7 +46,8 @@ RUN locale-gen en_US.UTF-8
 RUN pip3 install --no-cache-dir /root/sdk/bindings/python/dist/megasdk-*.whl
 WORKDIR /usr/src/app
 RUN chmod 777 /usr/src/app
-COPY requirements.txt .
-RUN pip3 install --no-cache-dir -r requirements.txt
+COPY Pipfile .
+COPY grt.py .
+RUN python3 grt.py && pip3 install --no-cache-dir -r requirements.txt
 COPY tgmb tgmb
 CMD ["python3", "-m", "tgmb"]

Pipfile

@@ -4,16 +4,16 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aria2p = "==0.10.4"
-google-api-python-client = "==2.7.0"
+aria2p = "==0.11.2"
+google-api-python-client = "==2.65.0"
 google-auth-httplib2 = "==0.1.0"
-google-auth-oauthlib = "==0.4.4"
-psutil = "==5.8.0"
-python-magic = "==0.4.24"
-python-telegram-bot = "==13.5"
-qbittorrent-api = "==2021.8.23"
+google-auth-oauthlib = "==0.7.1"
+psutil = "==5.9.4"
+python-magic = "==0.4.27"
+python-telegram-bot = "==13.14"
+qbittorrent-api = "==2022.10.39"
 torrentool = "==1.1.1"
-youtube_dl = "==2021.6.6"
+youtube_dl = "==2021.12.17"
 
 [dev-packages]
 build = "*"

grt.py

@@ -0,0 +1,12 @@
+import re
+
+if __name__ == '__main__':
+    fPipfile = 'Pipfile'
+    fRequirements = 'requirements.txt'
+    with open(fPipfile, 'rt') as fP:
+        pipfileContents = fP.read()
+    rSearch = r"\[packages\]\n[a-zA-Z0-9 =._\-\"\n]*"
+    sSearch: list[str] = re.findall(rSearch, pipfileContents)
+    requirementsContents = sSearch[0].replace(' = "', '').replace('"\n', '\n').replace('[packages]\n', '')
+    with open(fRequirements, 'wt') as fR:
+        fR.write(requirementsContents)