Skip to content

Commit

Permalink
ready for pypi 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AsaadMe committed Mar 12, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 44a13f8 commit 045ecef
Showing 3 changed files with 4 additions and 9 deletions.
8 changes: 1 addition & 7 deletions moviecolor/__main__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#from moviecolor import *
#from moviecolor import movcolor
from moviecolor.moviecolor import movcolor
from pathlib import Path
import tkinter as tk
import argparse
import threading
#import multiprocessing
import time

parser = argparse.ArgumentParser()
@@ -48,15 +47,10 @@ def main():
refresh_image = obj1.refresh_image_normal
draw_func = obj1.draw_normal

obj2 = movcolor(2,input_file_path, output_file_path.parent / "res2")
th = threading.Thread(target=obj1, args=(video_length ,process_func, draw_func, 0))
#th2 = threading.Thread(target=obj2, args=(10 ,process_func, obj2.draw_normal, 5))

#th = multiprocessing.Process(target=obj1, args=(video_length ,process_func, draw_func, 0))
#th2 = multiprocessing.Process(target=obj2, args=(10 ,process_func, obj2.draw_normal, 5))
th.daemon = True # terminates whenever main thread does
th.start()
#th2.start()

while len(obj1.rgb_list) == 0: # rgb_list in refresh_image shouldnt be empty
time.sleep(.1)
1 change: 1 addition & 0 deletions moviecolor/moviecolor.py
Original file line number Diff line number Diff line change
@@ -166,6 +166,7 @@ def refresh_image_alt(self, canvas, x_pixel, number_of_frames, *param):
canvas.after(100, self.refresh_image_alt, canvas, x_pixel, number_of_frames, dst)

def refresh_image_normal(self, canvas, x_pixel, number_of_frames):

image_height = 720
step = 1500 / number_of_frames
for rgb_tuple in self.rgb_list[int((x_pixel-1)*(1/step)):]:
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@

setuptools.setup(
name="moviecolor",
version="1.0.4",
version="1.1.0",
author="Mehran Asaad",
author_email = 'mehran.asaad@gmail.com',
license='MIT',
url = 'https://github.com/AsaadMe/MovieColor',
download_url = 'https://github.com/AsaadMe/MovieColor/releases/tag/v1.0.4',
download_url = 'https://github.com/AsaadMe/MovieColor/releases/tag/v1.1.0',
keywords = ['moviebarcode'],
description="Fast program to generate a 'Moviebarcode' of a video from average color of its frames with embedded ffmpeg and real-time progress interface.",
long_description=long_description,

0 comments on commit 045ecef

Please sign in to comment.