Remove auto update

Author: nbr23

config.yml

@@ -4,7 +4,6 @@ ydl_server:   # youtube-dl-server specific settings
   debug: False    # Enable/Disable debug mode
   metadata_db_path: '/youtube-dl/.ydl-metadata.db' # Path to metadata DB
   output_playlist: '/youtube-dl/%(title)s [%(id)s].%(ext)s' # Playlist output directory template
-  update_poll_delay_min: 1440 # Automatically check for updates every 24h
   max_log_entries: 100 # Maximum number of job log history to keep
   forwarded_allow_ips: None # uvicorn Comma seperated list of IPs to trust with proxy headers.
   proxy_headers: True # uvicorn flag Enable/Disable X-Forwarded-Proto, X-Forwarded-For, X-Forwarded-Port to populate remote address info.

ydl_server/routes.py

@@ -16,7 +16,6 @@
     Route("/logs", views.front_logs, name="logs"),
     Route("/finished", views.front_finished, name="finished"),
     Route("/api/extractors", views.api_list_extractors, name="api_list_extractors"),
-    Route("/api/youtube-dl/update", views.ydl_update, name="api_update"),
     Route("/api/downloads/stats", views.api_queue_size, name="api_queue_size"),
     Route("/api/downloads", views.api_logs, name="api_logs"),
     Route("/api/downloads/clean", views.api_logs_clean, name="api_logs_clean"),

ydl_server/static/js/youtubedl.js

@@ -170,10 +170,6 @@ function get_download_logs(){
   });
 }
 
-function ydl_update(){
-  $.get("api/youtube-dl/update");
-}
-
 function hide_logs_detail(){
   $('td:nth-child(5),th:nth-child(5)').hide();
 }

ydl_server/templates/footer.html

@@ -2,7 +2,7 @@
       <p class="text-muted">
       Drag and Drop the Bookmarklet to your bookmark bar for easy access: <a id="bookmarklet" class="btn-sm btn-dark" href="">Youtube-DL</a>
       <br/>
-      Powered by <a target="_blank" rel="noopener noreferrer" class="text-light" href="{{ ydl_website }}">{{ ydl_name }}</a> version <a href="#" onclick="ydl_update()" data-toggle="tooltip" data-placement="top" title="Update {{ ydl_name }}" class="text-light">{{ ydl_version }}</a>.
+      Powered by <a target="_blank" rel="noopener noreferrer" class="text-light" href="{{ ydl_website }}">{{ ydl_name }}</a> version {{ ydl_version }}.
       Code &amp; issues on <a target="_blank" rel="noopener noreferrer" class="text-light" href="https://github.com/nbr23/youtube-dl-server">GitHub</a>.
       </p>
     </footer>

ydl_server/views.py

@@ -126,14 +126,14 @@ async def api_logs_clean(request):
     return JSONResponse({"success": True})
 
 
+# TODO
+async def api_jobs_stop(request):
+    request.app.state.jobshandler.put((Actions.CLEAN_LOGS, None))
+    return JSONResponse({"success": True})
+
+
 async def api_queue_download(request):
     data = await request.form()
-    if (app_config['ydl_server'].get('update_poll_delay_min') and
-            (datetime.now() - app_config['ydl_last_update']).total_seconds() >
-            app_config['ydl_server'].get('update_poll_delay_min') * 60):
-        job = Job("Youtube-dl Auto-Update", Job.PENDING, "", JobType.YDL_UPDATE, None, None)
-        request.app.state.jobshandler.put((Actions.INSERT, job))
-
     url = data.get("url")
     options = {"format": data.get("format")}
 
@@ -153,13 +153,3 @@ async def api_metadata_fetch(request):
     if rc == 0:
         return JSONResponse(stdout)
     return JSONResponse({}, status_code=404)
-
-
-async def ydl_update(request):
-    job = Job("Youtube-dl Manual Update", Job.PENDING, "", JobType.YDL_UPDATE, None, None)
-    request.app.state.jobshandler.put((Actions.INSERT, job))
-    return JSONResponse(
-        {
-            "success": True,
-        }
-    )

ydl_server/ydlhandler.py

@@ -97,37 +97,9 @@ def worker(self):
                     job.status = Job.FAILED
                     job.log = "Error during download task:\n{}:\n\t{}".format(type(e).__name__, str(e))
                     print("Error during download task:\n{}:\n\t{}".format(type(e).__name__, str(e)))
-            elif job.type == JobType.YDL_UPDATE:
-                rc, log = self.update()
-                job.log = Job.clean_logs(log)
-                job.status = Job.COMPLETED if rc == 0 else Job.FAILED
             self.jobshandler.put((Actions.UPDATE, job))
             self.queue.task_done()
 
-    def update(self):
-        if self.app_config["ydl_server"].get("no_updates", False):
-            return 0, ""
-        print(f"Updating: Current {self.ydl_module_name} version: {self.ydl_version}")
-        if os.environ.get("YDL_PYTHONPATH"):
-            command = [
-                "pip",
-                "install",
-                "--no-cache-dir",
-                "-t",
-                os.environ.get("YDL_PYTHONPATH"),
-                "--upgrade",
-                self.ydl_module_name,
-            ]
-        else:
-            command = ["pip", "install", "--no-cache-dir", "--upgrade", self.ydl_module_name]
-        proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        out, err = proc.communicate()
-        if proc.wait() == 0:
-            self.app_config["ydl_last_update"] = datetime.now()
-            self.import_ydl_module()
-        print(f"Updating: New {self.ydl_module_name} version: {self.ydl_version}")
-        return proc.returncode, str(out.decode("utf-8"))
-
     def get_ydl_options(self, ydl_config, request_options):
         ydl_config = ydl_config.copy()
         req_format = request_options.get("format")
@@ -212,19 +184,16 @@ def resume_pending(self):
         jobs = db.get_all(self.app_config["ydl_server"].get("max_log_entries", 100))
         not_endeds = [job for job in jobs if job["status"] == "Pending" or job["status"] == "Running"]
         for pending in not_endeds:
-            if int(pending["type"]) == JobType.YDL_UPDATE:
-                self.jobshandler.put((Actions.SET_STATUS, (pending["id"], Job.FAILED)))
-            else:
-                job = Job(
-                    pending["name"],
-                    Job.PENDING,
-                    "Queue stopped",
-                    int(pending["type"]),
-                    pending["format"],
-                    pending["url"],
-                )
-                job.id = pending["id"]
-                self.jobshandler.put((Actions.RESUME, job))
+            job = Job(
+                pending["name"],
+                Job.PENDING,
+                "Queue stopped",
+                int(pending["type"]),
+                pending["format"],
+                pending["url"],
+            )
+            job.id = pending["id"]
+            self.jobshandler.put((Actions.RESUME, job))
 
     def join(self):
         if self.thread is not None:

youtube-dl-server.py

@@ -15,7 +15,6 @@
 
 from ydl_server.routes import routes
 
-
 if __name__ == "__main__":
 
     JobsDB.check_db_latest()
@@ -33,10 +32,6 @@
     app.state.jobshandler.start(app.state.ydlhandler.queue)
     print("Started jobs manager thread")
 
-    print("Updating %s to the newest version" % app.state.ydlhandler.ydl_module_name)
-    job = Job("Youtube-dl at Boot Update", Job.PENDING, "", JobType.YDL_UPDATE, None, None)
-    app.state.jobshandler.put((Actions.INSERT, job))
-
     app.state.ydlhandler.resume_pending()
 
     uvicorn.run(