Reformatting.

This commit is contained in:
Achim D. Brucker 2017-11-04 19:27:27 +00:00
parent 0db22c3217
commit 62bb639d67
1 changed files with 13 additions and 12 deletions

View File

@ -15,7 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
"""Tool for extracting crx file from a tar archive."""
import os
@ -26,8 +25,7 @@ import datetime
import dateutil
import dateutil.parser
from ExtensionCrawler.archive import last_crx, get_local_archive_dir
from ExtensionCrawler.config import const_basedir
from ExtensionCrawler.config import const_basedir
def helpmsg():
@ -42,20 +40,19 @@ def helpmsg():
print(" -a=<DIR> archive directory")
def get_tarinfo(members, name, winfs = False, etag = None):
def get_tarinfo(members, name, winfs=False, etag=None):
"""Select tarinfo object with a specified path/name."""
for tarinfo in members:
if tarinfo.name == name:
if winfs:
tarinfo.name = name.replace(":","-")
tarinfo.name = name.replace(":", "-")
if etag is not None:
(path, crx) = os.path.split(tarinfo.name)
(path, _) = os.path.split(path)
tarinfo.name = os.path.join(path,etag,crx)
tarinfo.name = os.path.join(path, etag, crx)
yield tarinfo
def main(argv):
"""Main function of the extension crawler."""
basedir = const_basedir()
@ -66,7 +63,8 @@ def main(argv):
output = ""
winfs = False
try:
opts, args = getopt.getopt(argv, "hsed:a:o:w", ["date=", "archive=", "output="])
opts, args = getopt.getopt(argv, "hsed:a:o:w",
["date=", "archive=", "output="])
except getopt.GetoptError:
helpmsg()
sys.exit(2)
@ -102,15 +100,17 @@ def main(argv):
last, etag = last_crx(os.path.join(basedir, "data"), extid)
if not useetag:
etag = None
etag = None
tar = os.path.join(basedir, "data",
get_local_archive_dir(extid), extid + ".tar")
get_local_archive_dir(extid), extid + ".tar")
if last != "":
if os.path.exists(tar):
if verbose:
print("Extracting "+os.path.join(output, last))
print("Extracting " + os.path.join(output, last))
with tarfile.open(tar, 'r') as archive:
archive.extractall(path=output, members=get_tarinfo(archive, last, winfs, etag))
archive.extractall(
path=output,
members=get_tarinfo(archive, last, winfs, etag))
elif verbose:
print("Cannot find archive " + tar)
elif verbose:
@ -119,5 +119,6 @@ def main(argv):
else:
print("CRX does not exist: cannot find archive " + tar)
if __name__ == "__main__":
main(sys.argv[1:])