Skip to content

Add zip support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MateuszKukiela wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add zip support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d918e9
Add zip support
MateuszKukiela Dec 3, 2020
105baa2
Add thumbnails to library
MateuszKukiela Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions comicapi/comicarchive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ def __init__(self, path, rar_exe_path=None, default_image_path=None):
self.archive_type = self.ArchiveType.Unknown
self.archiver = UnknownArchiver(self.path)

if ext == ".cbr" or ext == ".rar":
if ext == ".cbr" or ext == ".rar" or ext == ".zip":
if self.rarTest():
self.archive_type = self.ArchiveType.Rar
self.archiver = RarArchiver(self.path, rar_exe_path=self.rar_exe_path)
Expand Down Expand Up @@ -747,7 +747,7 @@ def seemsToBeAComicArchive(self):
try:
# Do we even care about extensions??
ext = os.path.splitext(self.path)[1].lower()
if ext == ".cbr" or ext == ".cbz":
if ext == ".cbr" or ext == ".cbz" or ext == ".zip":
# or self.isPdf()
if (self.isZip() or self.isRar()) and (self.getNumberOfPages() > 0):
return True
Expand Down
22 changes: 13 additions & 9 deletions comicstreamerlib/templates/comic_results2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
month_names = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
str = month_names[comic.month-1] + " " + str;
}

str = '(' + str + ')'
$(cd).find(".cd_date").text(str);
}
Expand All @@ -60,6 +60,11 @@
str = '"' + comic.title + '"';
$(cd).find(".cd_title").text(str);
}
if (comic.language !== "") {
str = '"' + comic.language + '"';

$(cd).find(".cd_language").text(str);
}

if (comic.volume !== "") {
str = "vol. " + comic.volume.toString() + ", ";
Expand Down Expand Up @@ -102,6 +107,11 @@
function myAttributeWriter(record)
{
var val = record[this.id];
if (this.id == 'thumb_url')
{
val = '<img src="{{handler.webroot}}/comic/'+ record.id +'/thumbnail?api_key={{api_key}}" />';

}
if (this.id == 'datex')
{
if (record['day'] != "" && record['month'] != "" && record['year'] != "")
Expand Down Expand Up @@ -261,13 +271,8 @@
<table id="resultset" >
<thead>
<tr>
<th data-dynatable-column="series">Series</th>
<th>Volume</th>
<th >Issue</th>
<th data-dynatable-sorts="date" data-dynatable-column="datex">Date</th>
<th>Title</th>
<th>Publisher</th>
<th data-dynatable-column="path">Server Path</th>
<th data-dynatable-column="thumb_url"></th>
<th data-dynatable-column="series">Title</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -328,4 +333,3 @@

</body>
</html>