David %!s(int64=10) %!d(string=hai) anos
pai
achega
c1d9dae5b9
Modificáronse 6 ficheiros con 35 adicións e 46 borrados
  1. 3 3
      back/constants.py
  2. 3 2
      back/db.py
  3. 25 20
      back/mover.py
  4. 1 1
      back/watch.py
  5. 3 2
      back/youtube_upload/main.py
  6. 0 18
      daemon/watch.py

+ 3 - 3
back/constants.py

@@ -1,6 +1,6 @@
 PORT = 8981
 BASE_PATH="/back" #changes based on webserver
 
-RAW_PATH='/home/david/git/youtube-uploader/web/front/raw/'
-CUT_OUTPUT_PATH='/home/david/git/youtube-uploader/web/front/videos/'
-INCOMING_PATH='/home/david/git/youtube-uploader/watched/'
+RAW_PATH='/home/nginx/especificos-videos/front/raw/'
+CUT_OUTPUT_PATH='/home/nginx/especificos-videos/front/videos/'
+DB_IP='192.168.1.123'

+ 3 - 2
back/db.py

@@ -4,14 +4,14 @@ import os
 import subprocess
 
 from bson.objectid import ObjectId
-from constants import RAW_PATH
+from constants import RAW_PATH, DB_IP
 from pymongo import MongoClient, errors, DESCENDING, ASCENDING
 
 class db():
     DB = "videos"
 
     def __init__(self):
-        self.client = MongoClient('localhost', 27017)
+        self.client = MongoClient(DB_IP, 27017)
         self.raw_files = self.client[self.DB]["raw"]
         self.cut_files = self.client[self.DB]["cut"]
         self.ul_files  = self.client[self.DB]["ul"]
@@ -56,6 +56,7 @@ class db():
         
     def insert_raw(self, rawfile):
         try:
+            print(rawfile)
             self.raw_files.insert_one(rawfile)
             return True
         except errors.DuplicateKeyError:

+ 25 - 20
back/mover.py

@@ -1,28 +1,33 @@
 #!/usr/bin/env python3
 
 import os
+import sys
 from db import db,file_info
 from subprocess import Popen,PIPE
-from constants import RAW_PATH,INCOMING_PATH
+from constants import RAW_PATH
 
 d=db()
-for fname in os.listdir(INCOMING_PATH):
-    if fname.endswith("flv"):
-        out_fname=os.path.join(RAW_PATH, os.path.basename(fname).replace('flv','mp4'))
-        in_fname=os.path.join(INCOMING_PATH, fname)
-        if os.path.isfile(out_fname):
-            #exists
-            continue
-        process=[ 'ffmpeg',
-                '-loglevel', 'error',
-                '-i', in_fname,
-                '-c', 'copy',
-                '-movflags', '+faststart',
-                '-f','mp4',
-                out_fname
-              ]
+if len(sys.argv) != 2:
+    print("Arg: file")
+    sys.exit()
 
-        print(" ".join(process))
-        proc=Popen(process, universal_newlines=True)
-        proc.wait()
-        d.insert_raw(file_info(out_fname))
+fname=sys.argv[1]
+if fname.endswith("flv"):
+    out_fname=os.path.join(RAW_PATH, os.path.basename(fname).replace('flv','mp4'))
+    in_fname=fname
+    if os.path.isfile(out_fname):
+        print("file out exists")
+        sys.exit()
+    process=[ 'ffmpeg',
+            '-loglevel', 'error',
+            '-i', in_fname,
+            '-c', 'copy',
+            '-movflags', '+faststart',
+            '-f','mp4',
+            out_fname
+          ]
+
+    print(" ".join(process))
+    proc=Popen(process, universal_newlines=True)
+    proc.wait()
+    d.insert_raw(file_info(out_fname))

+ 1 - 1
back/watch.py

@@ -13,7 +13,7 @@ import os
 import pyinotify
 
 from db import db,file_info
-from constants  import RAW_PATH,INCOMING_PATH
+from constants  import RAW_PATH
 from subprocess import Popen,PIPE
 
 class OnWriteHandler(pyinotify.ProcessEvent):

+ 3 - 2
back/youtube_upload/main.py

@@ -140,8 +140,9 @@ def run_main(title,thumb,path,output=sys.stdout):
                     'default_audio_language': None, 'publish_at': None, 'auth_browser': None
                     })
 
-    JOB.meta["type"]="Youtube"
-    JOB.meta["target"]=title
+    if JOB is not None:
+        JOB.meta["type"]="Youtube"
+        JOB.meta["target"]=title
     youtube = get_youtube_handler(options)
     video_path = path
     video_id=None

+ 0 - 18
daemon/watch.py

@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-import inotify.adapters
-i = inotify.adapters.Inotify()
-
-_dir=b'/tmp'
-i.add_watch(_dir)
-try:
-    for event in i.event_gen():
-        if event is not None:
-            (header, type_names, watch_path, filename) = event
-            if type_names[0] == "IN_CLOSE_WRITE":
-                print("Closed %s" % filename)
-
-            #print("WD=(%d) MASK=(%d) COOKIE=(%d) LEN=(%d) MASK->NAMES=%s WATCH-PATH=[%s] FILENAME=[%s]" %
-#			( header.wd, header.mask, header.cookie, header.len, type_names,
- #                        watch_path.decode('utf-8'), filename))
-finally:
-    i.remove_watch(_dir)