From 7f5980f70224308a7fc41967000ade6a4ebc3631 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <cpomeroy@localhost.localdomain>
Date: Sat, 02 Dec 2017 05:21:48 +0000
Subject: [PATCH] Fixed errant hex key generation. Added for loop to just grab the correct info not specific array parts.
---
aaxConvert.py | 73 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/aaxConvert.py b/aaxConvert.py
index 68df040..9a8a721 100755
--- a/aaxConvert.py
+++ b/aaxConvert.py
@@ -5,45 +5,39 @@
import subprocess
import shlex
import json
-import getaaxkey.getaaxkey
-
-act_byte = ""
-metadata = ""
-mode = "chapter"
-stats = ""
-path = ""
-args = ""
+from getaaxkey.getaaxkey import getcorrectkey
+from querysubsonic import findalbumbyname
# arguments
# activation_key, file name, codec(default to mp3)
-def processargs():
- parser = argparse.ArgumentParser()
- parser.add_argument("-s","--single", help="Use this option to create a single file. This is false by default", action="store_true")
- parser.add_argument("-d","--dpath", help="Use this to set the destination path. Otherwise I will use the current directory")
- parser.add_argument("-v", "--verbose", help="Send output to stdout", action="store_true")
- parser.add_argument("filename", help="Filename to convert, or directory to look in")
- args = parser.parse_args()
+parser = argparse.ArgumentParser()
+parser.add_argument("-s","--single", help="Use this option to create a single file. This is false by default", action="store_true")
+parser.add_argument("-d","--dpath", help="Use this to set the destination path. Otherwise I will use the current directory")
+parser.add_argument("-v", "--verbose", help="Send output to stdout", action="store_true")
+parser.add_argument("filename", help="Filename to convert, or directory to look in")
- act_byte = ""
- metadata = ""
- mode = ""
- stats = ""
+args = parser.parse_args()
- if args.dpath:
- path = args.dpath
- else:
- path = os.getcwd()
+act_byte = ""
+metadata = ""
+mode = ""
+stats = ""
- if args.single:
- mode = 'single'
- else:
- mode = 'chapter'
+if args.dpath:
+ path = args.dpath
+else:
+ path = os.getcwd()
- if args.verbose:
- stats = "-stats"
- else:
- stats = "-nostats"
+if args.single:
+ mode = 'single'
+else:
+ mode = 'chapter'
+
+if args.verbose:
+ stats = "-stats"
+else:
+ stats = "-nostats"
def getmetadata(aaxfile):
@@ -133,15 +127,15 @@
return
-if __name__ == "__main__":
- processargs()
- for rfile in glob.glob(args.filename):
- if rfile.find("aax") != -1 and os.path.isfile(rfile):
- act_byte = getaaxkey(rfile)
- metadata = getmetadata(rfile)
- album = getmetadatatags('album')
+for rfile in glob.glob(args.filename):
+ if rfile.find("aax") != -1 and os.path.isfile(rfile):
+ metadata = getmetadata(rfile)
+ album = getmetadatatags('album')
+ #See if we got it already
+ if (findalbumbyname(album) == False):
artist = getmetadatatags('artist')
title = getmetadatatags('title')
+ act_byte = getcorrectkey(rfile)
ddir = "%s/%s/%s" % (path, artist, title)
single_file_path = "%s/%s.mp3" % (ddir, title)
if not os.path.exists(ddir):
@@ -159,4 +153,5 @@
schap = str(chapter).zfill(2)
movetochapters(single_file_path, ddir, schap, title, cstart,cend)
os.remove(single_file_path)
- getcoverart(rfile, ddir)
\ No newline at end of file
+ getcoverart(rfile, ddir)
+ updatelibrary('testuser','testpass')
\ No newline at end of file
--
Gitblit v1.10.0